From b4b729a15e577c68f64e0ac69fb299de6f5f706c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Apr 2014 16:58:24 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet

---
 src/network.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/network.h b/src/network.h
index c75804d..f6dac7e 100644
--- a/src/network.h
+++ b/src/network.h
@@ -9,18 +9,20 @@
     CONVOLUTIONAL,
     CONNECTED,
     MAXPOOL,
-    SOFTMAX
+    SOFTMAX,
+    NORMALIZATION
 } LAYER_TYPE;
 
 typedef struct {
     int n;
+    int batch;
     void **layers;
     LAYER_TYPE *types;
     int outputs;
     float *output;
 } network;
 
-network make_network(int n);
+network make_network(int n, int batch);
 void forward_network(network net, float *input);
 float backward_network(network net, float *input, float *truth);
 void update_network(network net, float step, float momentum, float decay);
@@ -41,7 +43,7 @@
 void print_network(network net);
 void visualize_network(network net);
 void save_network(network net, char *filename);
-int reset_network_size(network net, int h, int w, int c);
+int resize_network(network net, int h, int w, int c);
 
 #endif
 

--
Gitblit v1.10.0