From cd8d53df21f3ad2810add2a8cff766c745f55a17 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:14:52 +0000
Subject: [PATCH] So there WAS this huge bug. Gone now
---
src/convolutional_layer.h | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 135d983..2deea62 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,41 +1,63 @@
#ifndef CONVOLUTIONAL_LAYER_H
#define CONVOLUTIONAL_LAYER_H
+#ifdef GPU
+#include "opencl.h"
+#endif
+
#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 *kernel_momentum;
- double *biases;
- double *bias_updates;
- double *bias_momentum;
- image upsampled;
- double *delta;
- double *output;
+ float *filters;
+ float *filter_updates;
+ float *filter_momentum;
+
+ float *biases;
+ float *bias_updates;
+ float *bias_momentum;
+
+ float *col_image;
+ float *delta;
+ float *output;
+
+ #ifdef GPU
+ cl_mem filters_cl;
+ cl_mem filter_updates_cl;
+ cl_mem filter_momentum_cl;
+
+ cl_mem biases_cl;
+ cl_mem bias_updates_cl;
+ cl_mem bias_momentum_cl;
+
+ cl_mem col_image_cl;
+ cl_mem delta_cl;
+ cl_mem output_cl;
+ #endif
ACTIVATION activation;
- int edge;
} 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);
-void backward_convolutional_layer(convolutional_layer layer, double *input, double *delta);
-void learn_convolutional_layer(convolutional_layer layer, double *input);
+#ifdef GPU
+void forward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in);
+#endif
-void update_convolutional_layer(convolutional_layer layer, double step, double momentum, double decay);
+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 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 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);
+image get_convolutional_filter(convolutional_layer layer, int i);
#endif
--
Gitblit v1.10.0