From 84d6533cb8112f23a34d3de76435a10f4620f4b8 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 23 Oct 2017 13:43:03 +0000
Subject: [PATCH] Fixed OpenCV usage in the yolo_console_dll.cpp

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

diff --git a/src/connected_layer.h b/src/connected_layer.h
index eaea306..23797b1 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,28 +2,26 @@
 #define CONNECTED_LAYER_H
 
 #include "activations.h"
+#include "layer.h"
+#include "network.h"
 
-typedef struct{
-    int inputs;
-    int outputs;
-    double *weights;
-    double *biases;
-    double *weight_updates;
-    double *bias_updates;
-    double *output;
+typedef layer connected_layer;
 
-    double (* activation)();
-    double (* gradient)();
-} connected_layer;
+connected_layer make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation, int batch_normalize);
 
-connected_layer *make_connected_layer(int inputs, int outputs, ACTIVATION activator);
+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);
 
-void run_connected_layer(double *input, connected_layer layer);
-void learn_connected_layer(double *input, connected_layer layer);
-void update_connected_layer(connected_layer layer, double step);
-
-void backpropagate_connected_layer(double *input, connected_layer layer);
-void calculate_update_connected_layer(double *input, 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