From 4528f9b4b49dc701d3de7b38fa59c17c41702679 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 08 Aug 2017 15:23:57 +0000
Subject: [PATCH] Fixed - use individual track_id for each class of object

---
 src/convolutional_layer.h |   87 +++++++++++++++++--------------------------
 1 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index cf897a7..970aa10 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,69 +1,52 @@
 #ifndef CONVOLUTIONAL_LAYER_H
 #define CONVOLUTIONAL_LAYER_H
 
-#ifdef GPU
-#include "opencl.h"
-#endif
-
+#include "cuda.h"
 #include "image.h"
 #include "activations.h"
+#include "layer.h"
+#include "network.h"
 
-typedef struct {
-    float learning_rate;
-    float momentum;
-    float decay;
-
-    int batch;
-    int h,w,c;
-    int n;
-    int size;
-    int stride;
-    int pad;
-    float *filters;
-    float *filter_updates;
-    float *filter_momentum;
-
-    float *biases;
-    float *bias_updates;
-    float *bias_momentum;
-
-    float *col_image;
-    float *delta;
-    float *output;
-
-    #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;
-    #endif
-
-    ACTIVATION activation;
-} convolutional_layer;
+typedef layer convolutional_layer;
 
 #ifdef GPU
-void forward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in);
-void backward_convolutional_layer_gpu(convolutional_layer layer, cl_mem delta_cl);
+void forward_convolutional_layer_gpu(convolutional_layer layer, network_state state);
+void backward_convolutional_layer_gpu(convolutional_layer layer, network_state state);
+void update_convolutional_layer_gpu(convolutional_layer layer, int batch, float learning_rate, float momentum, float decay);
+
+void push_convolutional_layer(convolutional_layer layer);
+void pull_convolutional_layer(convolutional_layer layer);
+
+void add_bias_gpu(float *output, float *biases, int batch, int n, int size);
+void backward_bias_gpu(float *bias_updates, float *delta, int batch, int n, int size);
+#ifdef CUDNN
+void cudnn_convolutional_setup(layer *l);
+#endif
 #endif
 
-convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation, float learning_rate, float momentum, float decay);
-void resize_convolutional_layer(convolutional_layer *layer, int h, int w, int c);
-void forward_convolutional_layer(const convolutional_layer layer, float *in);
-void update_convolutional_layer(convolutional_layer layer);
-image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);
+convolutional_layer make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int padding, ACTIVATION activation, int batch_normalize, int binary, int xnor, int adam);
+void denormalize_convolutional_layer(convolutional_layer l);
+void resize_convolutional_layer(convolutional_layer *layer, int w, int h);
+void forward_convolutional_layer(const convolutional_layer layer, network_state state);
+void update_convolutional_layer(convolutional_layer layer, int batch, float learning_rate, float momentum, float decay);
+image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_weights);
+void binarize_weights(float *weights, int n, int size, float *binary);
+void swap_binary(convolutional_layer *l);
+void binarize_weights2(float *weights, int n, int size, char *binary, float *scales);
 
-void backward_convolutional_layer(convolutional_layer layer, float *delta);
+void backward_convolutional_layer(convolutional_layer layer, network_state state);
+
+void add_bias(float *output, float *biases, int batch, int n, int size);
+void backward_bias(float *bias_updates, float *delta, int batch, int n, int size);
 
 image get_convolutional_image(convolutional_layer layer);
 image get_convolutional_delta(convolutional_layer layer);
-image get_convolutional_filter(convolutional_layer layer, int i);
+image get_convolutional_weight(convolutional_layer layer, int i);
+
+int convolutional_out_height(convolutional_layer layer);
+int convolutional_out_width(convolutional_layer layer);
+void rescale_weights(convolutional_layer l, float scale, float trans);
+void rgbgr_weights(convolutional_layer l);
 
 #endif
 

--
Gitblit v1.10.0