From cd8d53df21f3ad2810add2a8cff766c745f55a17 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 09 May 2014 22:14:52 +0000
Subject: [PATCH] So there WAS this huge bug. Gone now

---
 src/network.h |   41 +++++++++++++++++++++++++++++++----------
 1 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/network.h b/src/network.h
index 10fa6c5..35a58ca 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,34 +2,55 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
+#include "opencl.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;
+
+    #ifdef GPU
+    cl_mem input_cl;
+    cl_mem output_cl;
+    #endif
 } 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, int train);
+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);
+int get_network_input_size(network net);
 
 #endif
 

--
Gitblit v1.10.0