From 989ab8c38a02fa7ea9c25108151736c62e81c972 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 24 Apr 2015 17:27:50 +0000
Subject: [PATCH] IOU loss function

---
 src/connected_layer.h |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/connected_layer.h b/src/connected_layer.h
index e9e461c..33002d2 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,12 +2,9 @@
 #define CONNECTED_LAYER_H
 
 #include "activations.h"
+#include "params.h"
 
 typedef struct{
-    float learning_rate;
-    float momentum;
-    float decay;
-
     int batch;
     int inputs;
     int outputs;
@@ -17,25 +14,39 @@
     float *weight_updates;
     float *bias_updates;
 
-    float *weight_adapt;
-    float *bias_adapt;
-
-    float *weight_momentum;
-    float *bias_momentum;
+    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;
 
-connected_layer *make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation, float learning_rate, float momentum, float decay);
+connected_layer *make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation);
 
-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);
 
+#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