From f7a17f82eb43de864a4f980f235055da9685eef8 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 29 Jan 2014 00:28:42 +0000
Subject: [PATCH] Convolutional layers working w/ matrices
---
src/convolutional_layer.h | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index ab414ec..c4de24e 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -6,32 +6,40 @@
typedef struct {
int h,w,c;
+ int out_h, out_w, out_c;
int n;
+ int size;
int stride;
- image *kernels;
- image *kernel_updates;
- double *biases;
- double *bias_updates;
- image upsampled;
- double *delta;
- double *output;
+ float *filters;
+ float *filter_updates;
+ float *filter_momentum;
- double (* activation)();
- double (* gradient)();
+ 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 h, int w, int c, int n, int size, int stride, ACTIVATION activator);
-void forward_convolutional_layer(const convolutional_layer layer, double *in);
-void backward_convolutional_layer(convolutional_layer layer, double *input, double *delta);
-void learn_convolutional_layer(convolutional_layer layer, double *input);
+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, float *in);
+void learn_convolutional_layer(convolutional_layer layer);
+void update_convolutional_layer(convolutional_layer layer, float step, float momentum, float decay);
+void visualize_convolutional_layer(convolutional_layer layer, char *window);
-void update_convolutional_layer(convolutional_layer layer, double step);
+void backward_convolutional_layer(convolutional_layer layer, float *delta);
-void backpropagate_convolutional_layer_convolve(image input, convolutional_layer layer);
-void visualize_convolutional_layer(convolutional_layer layer);
+//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