From 08b757a0bf76efe8c76b453063a1bb19315bcaa6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 14 Jan 2015 20:18:57 +0000
Subject: [PATCH] Stable, needs to be way faster
---
src/convolutional_layer.h | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index cf897a7..c805aa2 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -1,10 +1,7 @@
#ifndef CONVOLUTIONAL_LAYER_H
#define CONVOLUTIONAL_LAYER_H
-#ifdef GPU
#include "opencl.h"
-#endif
-
#include "image.h"
#include "activations.h"
@@ -21,11 +18,9 @@
int pad;
float *filters;
float *filter_updates;
- float *filter_momentum;
float *biases;
float *bias_updates;
- float *bias_momentum;
float *col_image;
float *delta;
@@ -34,11 +29,9 @@
#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;
@@ -50,7 +43,10 @@
#ifdef GPU
void forward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in);
-void backward_convolutional_layer_gpu(convolutional_layer layer, cl_mem delta_cl);
+void backward_convolutional_layer_gpu(convolutional_layer layer, cl_mem in, cl_mem delta_cl);
+void update_convolutional_layer_gpu(convolutional_layer layer);
+void push_convolutional_layer(convolutional_layer layer);
+void pull_convolutional_layer(convolutional_layer layer);
#endif
convolutional_layer *make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation, float learning_rate, float momentum, float decay);
@@ -59,7 +55,7 @@
void update_convolutional_layer(convolutional_layer layer);
image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);
-void backward_convolutional_layer(convolutional_layer layer, float *delta);
+void backward_convolutional_layer(convolutional_layer layer, float *in, float *delta);
image get_convolutional_image(convolutional_layer layer);
image get_convolutional_delta(convolutional_layer layer);
--
Gitblit v1.10.0