From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi
---
src/connected_layer.h | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/src/connected_layer.h b/src/connected_layer.h
index 2642599..affcaaf 100644
--- a/src/connected_layer.h
+++ b/src/connected_layer.h
@@ -2,48 +2,22 @@
#define CONNECTED_LAYER_H
#include "activations.h"
-#include "params.h"
+#include "layer.h"
+#include "network.h"
-typedef struct{
- int batch;
- int inputs;
- int outputs;
- float *weights;
- float *biases;
+typedef layer connected_layer;
- float *weight_updates;
- float *bias_updates;
-
- float *weight_prev;
- float *bias_prev;
-
- float *output;
- float *delta;
-
- #ifdef GPU
- float * weights_gpu;
- float * biases_gpu;
-
- float * weight_updates_gpu;
- float * bias_updates_gpu;
-
- float * output_gpu;
- float * delta_gpu;
- #endif
- ACTIVATION activation;
-
-} connected_layer;
-
-connected_layer *make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation);
+connected_layer make_connected_layer(int batch, int inputs, int outputs, ACTIVATION activation, int batch_normalize);
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, float learning_rate, float momentum, float decay);
+void update_connected_layer(connected_layer layer, int batch, float learning_rate, float momentum, float decay);
+void denormalize_connected_layer(layer l);
#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, float learning_rate, float momentum, float decay);
+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
--
Gitblit v1.10.0