From 228d3663f871d0e4bdee468572eb80141cb4fe3f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 15 Feb 2014 00:09:07 +0000
Subject: [PATCH] Extracting features from VOC with temp filters
---
src/convolutional_layer.h | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index b42f5e9..8ca69b1 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -2,20 +2,43 @@
#define CONVOLUTIONAL_LAYER_H
#include "image.h"
+#include "activations.h"
typedef struct {
+ 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 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 backward_convolutional_layer(convolutional_layer layer, float *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