From f047cfff99e00e28c02eb59b6d32386c122f9af6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 08 Mar 2015 18:31:12 +0000
Subject: [PATCH] renamed sigmoid to logistic

---
 src/convolutional_layer.h |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index cf897a7..72f3f72 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,10 +1,7 @@
 #ifndef CONVOLUTIONAL_LAYER_H
 #define CONVOLUTIONAL_LAYER_H
 
-#ifdef GPU
-#include "opencl.h"
-#endif
-
+#include "cuda.h"
 #include "image.h"
 #include "activations.h"
 
@@ -21,49 +18,58 @@
     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;
+    float * filters_gpu;
+    float * filter_updates_gpu;
 
-    cl_mem biases_cl;
-    cl_mem bias_updates_cl;
-    cl_mem bias_momentum_cl;
+    float * biases_gpu;
+    float * bias_updates_gpu;
 
-    cl_mem col_image_cl;
-    cl_mem delta_cl;
-    cl_mem output_cl;
+    float * col_image_gpu;
+    float * delta_gpu;
+    float * output_gpu;
     #endif
 
     ACTIVATION activation;
 } 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, float * in);
+void backward_convolutional_layer_gpu(convolutional_layer layer, float * in, float * delta_gpu);
+void update_convolutional_layer_gpu(convolutional_layer layer);
+
+void push_convolutional_layer(convolutional_layer layer);
+void pull_convolutional_layer(convolutional_layer layer);
+
+void bias_output_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);
 #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 resize_convolutional_layer(convolutional_layer *layer, int h, int w);
 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);
 
-void backward_convolutional_layer(convolutional_layer layer, float *delta);
+void backward_convolutional_layer(convolutional_layer layer, float *in, float *delta);
+
+void bias_output(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);
 
+int convolutional_out_height(convolutional_layer layer);
+int convolutional_out_width(convolutional_layer layer);
+
 #endif
 

--
Gitblit v1.10.0