From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server

---
 src/convolutional_layer.h |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 465d309..28819bb 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -18,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;
@@ -31,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;
@@ -47,8 +43,9 @@
 
 #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);
 #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);
@@ -57,7 +54,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