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 | 53 ++++++++++++-----------------------------------------
1 files changed, 12 insertions(+), 41 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index 921f06f..23797b1 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,52 +2,23 @@
#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;
-
- float *weight_prev;
- float *bias_prev;
-
- float *output;
- float *delta;
-
- #ifdef GPU
- float * weights_gpu;
- float * biases_gpu;
-
- float * weight_updates_gpu;
- float * bias_updates_gpu;
-
- float * output_gpu;
- float * delta_gpu;
- #endif
- ACTIVATION activation;
-
-} connected_layer;
-
-void secret_update_connected_layer(connected_layer *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);
+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);
#ifdef GPU
-void forward_connected_layer_gpu(connected_layer layer, float * input);
-void backward_connected_layer_gpu(connected_layer layer, float * input, float * delta);
-void update_connected_layer_gpu(connected_layer layer);
+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
--
Gitblit v1.10.0