From cdd1cb0e8c4fda3671714bb5ad6ba1825cff16d1 Mon Sep 17 00:00:00 2001
From: Puneet Kohli <punkohl@gmail.com>
Date: Sun, 06 May 2018 21:45:26 +0000
Subject: [PATCH] Change matplotlib backend to 'agg' when 'show_plot' is false. This allows the script to be run from command line without any errors (for ex, on a remote machine)
---
src/connected_layer.h | 55 +++++++++++++------------------------------------------
1 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index 0895728..23797b1 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,54 +2,25 @@
#define CONNECTED_LAYER_H
#include "activations.h"
-#include "opencl.h"
+#include "layer.h"
+#include "network.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, int batch_normalize);
- float *weight_updates;
- float *bias_updates;
-
- float *weight_prev;
- float *bias_prev;
-
- 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;
-
-void secret_update_connected_layer(connected_layer *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);
+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);
+void denormalize_connected_layer(layer l);
+void statistics_connected_layer(layer l);
#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 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