From d0b9326a352ed2fbc3ae66fdef40b4533a2f211d Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 11 Aug 2015 06:22:27 +0000
Subject: [PATCH] Hacks to get nightmare to not break gridsizing
---
src/connected_layer.h | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index e9e461c..cea5a02 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,40 +2,24 @@
#define CONNECTED_LAYER_H
#include "activations.h"
+#include "params.h"
+#include "layer.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);
- 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);
- 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