From 8e7a51a4925977acde34daffe9ea1fcffd8aae47 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 18 Oct 2017 23:56:38 +0000
Subject: [PATCH] circleci: opencv

---
 src/connected_layer.h |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/connected_layer.h b/src/connected_layer.h
index e9e461c..23797b1 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,40 +2,26 @@
 #define CONNECTED_LAYER_H
 
 #include "activations.h"
+#include "layer.h"
+#include "network.h"
 
-typedef struct{
-    float learning_rate;
-    float momentum;
-    float decay;
+typedef layer connected_layer;
 
-    int batch;
-    int inputs;
-    int outputs;
-    float *weights;
-    float *biases;
+connected_layer make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation, int batch_normalize);
 
-    float *weight_updates;
-    float *bias_updates;
+void forward_connected_layer(connected_layer layer, network_state state);
+void backward_connected_layer(connected_layer layer, network_state state);
+void update_connected_layer(connected_layer layer, int batch, float learning_rate, float momentum, float decay);
+void denormalize_connected_layer(layer l);
+void statistics_connected_layer(layer l);
 
-    float *weight_adapt;
-    float *bias_adapt;
-
-    float *weight_momentum;
-    float *bias_momentum;
-
-    float *output;
-    float *delta;
-    
-    ACTIVATION activation;
-
-} connected_layer;
-
-connected_layer *make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation, float learning_rate, float momentum, float decay);
-
-void forward_connected_layer(connected_layer layer, float *input);
-void backward_connected_layer(connected_layer layer, float *input, float *delta);
-void update_connected_layer(connected_layer layer);
-
+#ifdef GPU
+void forward_connected_layer_gpu(connected_layer layer, network_state state);
+void backward_connected_layer_gpu(connected_layer layer, network_state state);
+void update_connected_layer_gpu(connected_layer layer, int batch, float learning_rate, float momentum, float decay);
+void push_connected_layer(connected_layer layer);
+void pull_connected_layer(connected_layer layer);
+#endif
 
 #endif
 

--
Gitblit v1.10.0