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 | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/network.h b/src/network.h
index 10fa6c5..f6dac7e 100644
--- a/src/network.h
+++ b/src/network.h
@@ -8,28 +8,42 @@
typedef enum {
CONVOLUTIONAL,
CONNECTED,
- MAXPOOL
+ MAXPOOL,
+ 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);
-void forward_network(network net, double *input);
-void learn_network(network net, double *input);
-void update_network(network net, double step);
-void train_network_batch(network net, batch b);
-double *get_network_output(network net);
-double *get_network_output_layer(network net, int i);
-double *get_network_delta_layer(network net, int i);
-double *get_network_delta(network net);
+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);
+float train_network_sgd(network net, data d, int n, float step, float momentum,float decay);
+float train_network_batch(network net, data d, int n, float step, float momentum,float decay);
+void train_network(network net, data d, float step, float momentum, float decay);
+matrix network_predict_data(network net, data test);
+float network_accuracy(network net, data d);
+float *get_network_output(network net);
+float *get_network_output_layer(network net, int i);
+float *get_network_delta_layer(network net, int i);
+float *get_network_delta(network net);
int get_network_output_size_layer(network net, int i);
int get_network_output_size(network net);
image get_network_image(network net);
image get_network_image_layer(network net, int i);
+int get_predicted_class_network(network net);
+void print_network(network net);
+void visualize_network(network net);
+void save_network(network net, char *filename);
+int resize_network(network net, int h, int w, int c);
#endif
--
Gitblit v1.10.0