From fb9e0fe33681280112e4e33939c5844dba994dca Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 04 Mar 2015 22:56:38 +0000
Subject: [PATCH] Big changes to detection

---
 src/detection_layer.h |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/detection_layer.h b/src/detection_layer.h
index fad0281..e7e9e20 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -3,38 +3,26 @@
 
 typedef struct {
     int batch;
-    int h,w,c;
-    int n;
-    int size;
-    int stride;
-
-    float *filters;
-    float *filter_updates;
-    float *filter_momentum;
-
-    float *biases;
-    float *bias_updates;
-    float *bias_momentum;
-
-    float *col_image;
-    float *delta;
+    int inputs;
+    int classes;
+    int coords;
+    int rescore;
     float *output;
-
+    float *delta;
     #ifdef GPU
-    cl_mem filters_cl;
-    cl_mem filter_updates_cl;
-    cl_mem filter_momentum_cl;
-
-    cl_mem biases_cl;
-    cl_mem bias_updates_cl;
-    cl_mem bias_momentum_cl;
-
-    cl_mem col_image_cl;
-    cl_mem delta_cl;
-    cl_mem output_cl;
+    float * output_gpu;
+    float * delta_gpu;
     #endif
+} detection_layer;
 
-    ACTIVATION activation;
-} convolutional_layer;
+detection_layer *make_detection_layer(int batch, int inputs, int classes, int coords, int rescore);
+void forward_detection_layer(const detection_layer layer, float *in, float *truth);
+void backward_detection_layer(const detection_layer layer, float *in, float *delta);
+int get_detection_layer_output_size(detection_layer layer);
+
+#ifdef GPU
+void forward_detection_layer_gpu(const detection_layer layer, float *in, float *truth);
+void backward_detection_layer_gpu(detection_layer layer, float *in, float *delta);
+#endif
 
 #endif

--
Gitblit v1.10.0