From 5ef74c2031a040f30a670dc7d60790fc6a9ec720 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 May 2014 22:20:34 +0000
Subject: [PATCH] Slowly refactoring and pushing to GPU

---
 src/convolutional_layer.h |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index b42f5e9..ef08976 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -2,20 +2,41 @@
 #define CONVOLUTIONAL_LAYER_H
 
 #include "image.h"
+#include "activations.h"
 
 typedef struct {
+    int batch;
+    int h,w,c;
     int n;
+    int size;
     int stride;
-    image *kernels;
-    image *kernel_updates;
-    image upsampled;
-    image output;
+    float *filters;
+    float *filter_updates;
+    float *filter_momentum;
+
+    float *biases;
+    float *bias_updates;
+    float *bias_momentum;
+
+    float *col_image;
+    float *delta;
+    float *output;
+
+    ACTIVATION activation;
 } convolutional_layer;
 
-convolutional_layer make_convolutional_layer(int w, int h, int c, int n, int size, int stride);
-void run_convolutional_layer(const image input, const convolutional_layer layer);
-void backpropagate_layer(image input, convolutional_layer layer);
-void backpropagate_layer_convolve(image input, convolutional_layer layer);
+convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, ACTIVATION activation);
+void resize_convolutional_layer(convolutional_layer *layer, int h, int w, int c);
+void forward_convolutional_layer(const convolutional_layer layer, float *in);
+void learn_convolutional_layer(convolutional_layer layer);
+void update_convolutional_layer(convolutional_layer layer, float step, float momentum, float decay);
+image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);
+
+void backward_convolutional_layer(convolutional_layer layer, float *delta);
+
+image get_convolutional_image(convolutional_layer layer);
+image get_convolutional_delta(convolutional_layer layer);
+image get_convolutional_filter(convolutional_layer layer, int i);
 
 #endif
 

--
Gitblit v1.10.0