From b2b7137b6f185ce2f01664d782a09b08d50d5a07 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 28 Jan 2014 07:16:56 +0000
Subject: [PATCH] About to do something stupid...

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

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index b42f5e9..e2e6cdc 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -2,20 +2,44 @@
 #define CONVOLUTIONAL_LAYER_H
 
 #include "image.h"
+#include "activations.h"
 
 typedef struct {
+    int h,w,c;
+    int out_h, out_w, out_c;
     int n;
+    int size;
     int stride;
-    image *kernels;
-    image *kernel_updates;
-    image upsampled;
-    image output;
+    double *filters;
+    double *filter_updates;
+    double *filter_momentum;
+
+    double *biases;
+    double *bias_updates;
+    double *bias_momentum;
+
+    double *col_image;
+    double *delta;
+    double *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 h, int w, int c, int n, int size, int stride, ACTIVATION activation);
+void forward_convolutional_layer(const convolutional_layer layer, double *in);
+void learn_convolutional_layer(convolutional_layer layer);
+void update_convolutional_layer(convolutional_layer layer, double step, double momentum, double decay);
+void visualize_convolutional_layer(convolutional_layer layer, char *window);
+
+//void backward_convolutional_layer(convolutional_layer layer, double *input, double *delta);
+
+//void backpropagate_convolutional_layer_convolve(image input, convolutional_layer layer);
+//void visualize_convolutional_filters(convolutional_layer layer, char *window);
+//void visualize_convolutional_layer(convolutional_layer layer);
+
+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