From e36182cd8c5dd5c6d0aa1f77cf5cdca87e8bb1f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 21 Nov 2014 23:35:19 +0000
Subject: [PATCH] cleaned up data parsing a lot. probably nothing broken?
---
src/connected_layer.h | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index e403b0f..1e5b4a7 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -1,21 +1,55 @@
#ifndef CONNECTED_LAYER_H
#define CONNECTED_LAYER_H
+#include "activations.h"
+#include "opencl.h"
+
typedef struct{
+ float learning_rate;
+ float momentum;
+ float decay;
+
+ int batch;
int inputs;
int outputs;
- double *weights;
- double *biases;
- double *weight_updates;
- double *bias_updates;
- double *output;
+ float *weights;
+ float *biases;
+
+ float *weight_updates;
+ float *bias_updates;
+
+ float *weight_adapt;
+ float *bias_adapt;
+
+ float *output;
+ float *delta;
+
+ #ifdef GPU
+ cl_mem weights_cl;
+ cl_mem biases_cl;
+
+ cl_mem weight_updates_cl;
+ cl_mem bias_updates_cl;
+
+ cl_mem output_cl;
+ cl_mem delta_cl;
+ #endif
+ ACTIVATION activation;
+
} connected_layer;
-connected_layer make_connected_layer(int inputs, int outputs);
-void run_connected_layer(double *input, connected_layer layer);
-void backpropagate_connected_layer(double *input, connected_layer layer);
-void calculate_updates_connected_layer(double *input, connected_layer layer);
-void update_connected_layer(connected_layer layer, double step);
+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, cl_mem input);
+void backward_connected_layer_gpu(connected_layer layer, cl_mem input, cl_mem delta);
+void update_connected_layer_gpu(connected_layer layer);
+void push_connected_layer(connected_layer layer);
+#endif
#endif
--
Gitblit v1.10.0