From 5ef74c2031a040f30a670dc7d60790fc6a9ec720 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 May 2014 22:20:34 +0000
Subject: [PATCH] Slowly refactoring and pushing to GPU

---
 src/network.h |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/network.h b/src/network.h
index ad2b1dc..f6dac7e 100644
--- a/src/network.h
+++ b/src/network.h
@@ -3,28 +3,47 @@
 #define NETWORK_H
 
 #include "image.h"
+#include "data.h"
 
 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 run_network(image input, network net);
-void learn_network(image input, network net);
-void update_network(network net, double step);
-double *get_network_output(network net);
-double *get_network_output_layer(network net, int i);
+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