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 |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index e2e6cdc..ef08976 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -5,37 +5,34 @@
 #include "activations.h"
 
 typedef struct {
+    int batch;
     int h,w,c;
-    int out_h, out_w, out_c;
     int n;
     int size;
     int stride;
-    double *filters;
-    double *filter_updates;
-    double *filter_momentum;
+    float *filters;
+    float *filter_updates;
+    float *filter_momentum;
 
-    double *biases;
-    double *bias_updates;
-    double *bias_momentum;
+    float *biases;
+    float *bias_updates;
+    float *bias_momentum;
 
-    double *col_image;
-    double *delta;
-    double *output;
+    float *col_image;
+    float *delta;
+    float *output;
 
     ACTIVATION activation;
 } convolutional_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);
+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, double step, double momentum, double decay);
-void visualize_convolutional_layer(convolutional_layer layer, char *window);
+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, 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);
+void backward_convolutional_layer(convolutional_layer layer, float *delta);
 
 image get_convolutional_image(convolutional_layer layer);
 image get_convolutional_delta(convolutional_layer layer);

--
Gitblit v1.10.0