From db0397cfaaf488364e3d2e1669dfefae2ee6ea73 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Dec 2015 19:57:10 +0000
Subject: [PATCH] shortcut layers, msr networks
---
src/connected_layer.h | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index 86815cb..2bf53b2 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,33 +2,24 @@
#define CONNECTED_LAYER_H
#include "activations.h"
+#include "layer.h"
+#include "network.h"
-typedef struct{
- int inputs;
- int outputs;
- double *weights;
- double *biases;
+typedef layer connected_layer;
- double *weight_updates;
- double *bias_updates;
+connected_layer make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation);
- double *weight_momentum;
- double *bias_momentum;
+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);
- double *output;
- double *delta;
-
- double (* activation)();
- double (* gradient)();
-} connected_layer;
-
-connected_layer *make_connected_layer(int inputs, int outputs, ACTIVATION activator);
-
-void forward_connected_layer(connected_layer layer, double *input);
-void backward_connected_layer(connected_layer layer, double *input, double *delta);
-void learn_connected_layer(connected_layer layer, double *input);
-void update_connected_layer(connected_layer layer, double step, double momentum, double 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