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/convolutional_layer.h |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 2deea62..1ceca16 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,19 +1,21 @@
 #ifndef CONVOLUTIONAL_LAYER_H
 #define CONVOLUTIONAL_LAYER_H
 
-#ifdef GPU
 #include "opencl.h"
-#endif
-
 #include "image.h"
 #include "activations.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;
@@ -45,15 +47,18 @@
 
 #ifdef GPU
 void forward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in);
+void backward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in, cl_mem delta_cl);
+void update_convolutional_layer_gpu(convolutional_layer layer);
+void push_convolutional_layer(convolutional_layer layer);
 #endif
 
-convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, ACTIVATION activation);
+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, float step, float momentum, float decay);
+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);
 
 image get_convolutional_image(convolutional_layer layer);
 image get_convolutional_delta(convolutional_layer layer);

--
Gitblit v1.10.0