From b32a287e38f4c6a41828f18b4669dec9f3af4943 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:17:52 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/connected_layer.h | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index eaea306..ff5a0ce 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -4,26 +4,36 @@
#include "activations.h"
typedef struct{
+ int batch;
int inputs;
int outputs;
- double *weights;
- double *biases;
- double *weight_updates;
- double *bias_updates;
- double *output;
+ float *weights;
+ float *biases;
- double (* activation)();
- double (* gradient)();
+ float *weight_updates;
+ float *bias_updates;
+
+ float *weight_adapt;
+ float *bias_adapt;
+
+ float *weight_momentum;
+ float *bias_momentum;
+
+ float *output;
+ float *delta;
+
+ float dropout;
+
+ ACTIVATION activation;
+
} connected_layer;
-connected_layer *make_connected_layer(int inputs, int outputs, ACTIVATION activator);
+connected_layer *make_connected_layer(int batch, int inputs, int outputs, float dropout, ACTIVATION activation);
-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 forward_connected_layer(connected_layer layer, float *input, int train);
+void backward_connected_layer(connected_layer layer, float *input, float *delta);
+void update_connected_layer(connected_layer layer, float step, float momentum, float decay);
-void backpropagate_connected_layer(double *input, connected_layer layer);
-void calculate_update_connected_layer(double *input, connected_layer layer);
#endif
--
Gitblit v1.10.0