From 1edcf73a73d2007afc61289245763f5cf0c29e10 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 04 Dec 2014 07:20:29 +0000
Subject: [PATCH] Detection good, split up col images

---
 src/connected_layer.h |   51 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/connected_layer.h b/src/connected_layer.h
index 86815cb..1e5b4a7 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,33 +2,54 @@
 #define CONNECTED_LAYER_H
 
 #include "activations.h"
+#include "opencl.h"
 
 typedef struct{
+    float learning_rate;
+    float momentum;
+    float decay;
+
+    int batch;
     int inputs;
     int outputs;
-    double *weights;
-    double *biases;
+    float *weights;
+    float *biases;
 
-    double *weight_updates;
-    double *bias_updates;
+    float *weight_updates;
+    float *bias_updates;
 
-    double *weight_momentum;
-    double *bias_momentum;
+    float *weight_adapt;
+    float *bias_adapt;
 
-    double *output;
-    double *delta;
+    float *output;
+    float *delta;
+    
+    #ifdef GPU
+    cl_mem weights_cl;
+    cl_mem biases_cl;
 
-    double (* activation)();
-    double (* gradient)();
+    cl_mem weight_updates_cl;
+    cl_mem bias_updates_cl;
+
+    cl_mem output_cl;
+    cl_mem delta_cl;
+    #endif
+    ACTIVATION activation;
+
 } connected_layer;
 
-connected_layer *make_connected_layer(int inputs, int outputs, ACTIVATION activator);
+connected_layer *make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation, float learning_rate, float momentum, float decay);
 
-void forward_connected_layer(connected_layer layer, double *input);
-void backward_connected_layer(connected_layer layer, double *input, double *delta);
-void learn_connected_layer(connected_layer layer, double *input);
-void update_connected_layer(connected_layer layer, double step, double momentum, double decay);
+void forward_connected_layer(connected_layer layer, float *input);
+void backward_connected_layer(connected_layer layer, float *input, float *delta);
+void update_connected_layer(connected_layer layer);
 
+#ifdef GPU
+void forward_connected_layer_gpu(connected_layer layer, cl_mem input);
+void backward_connected_layer_gpu(connected_layer layer, cl_mem input, cl_mem delta);
+void update_connected_layer_gpu(connected_layer layer);
+void push_connected_layer(connected_layer layer);
+#endif
 
 #endif
 

--
Gitblit v1.10.0