From ccde487525fc89a1d4bc3e1cf11a18971e8451c9 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@users.noreply.github.com>
Date: Sat, 11 Jul 2015 00:33:24 +0000
Subject: [PATCH] Create README.md

---
 src/network.h |   64 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/network.h b/src/network.h
index 7625904..b684d33 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,59 +2,58 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "opencl.h"
 #include "image.h"
+#include "detection_layer.h"
+#include "layer.h"
 #include "data.h"
 
-typedef enum {
-    CONVOLUTIONAL,
-    CONNECTED,
-    MAXPOOL,
-    SOFTMAX,
-    NORMALIZATION,
-    DROPOUT,
-    FREEWEIGHT,
-    CROP,
-    COST
-} LAYER_TYPE;
-
 typedef struct {
     int n;
     int batch;
+    int seen;
+    int subdivisions;
     float learning_rate;
     float momentum;
     float decay;
-    void **layers;
-    LAYER_TYPE *types;
+    layer *layers;
     int outputs;
     float *output;
 
+    int inputs;
+    int h, w, c;
+
     #ifdef GPU
-    cl_mem *input_cl;
-    cl_mem *truth_cl;
+    float **input_gpu;
+    float **truth_gpu;
     #endif
 } network;
 
 #ifdef GPU
-void forward_network_gpu(network net, cl_mem input, cl_mem truth, int train);
-void backward_network_gpu(network net, cl_mem input);
-void update_network_gpu(network net);
-cl_mem get_network_output_cl_layer(network net, int i);
-cl_mem get_network_delta_cl_layer(network net, int i);
-float train_network_sgd_gpu(network net, data d, int n);
-float train_network_data_gpu(network net, data d, int n);
+float train_network_datum_gpu(network net, float *x, float *y);
+float *network_predict_gpu(network net, float *input);
+float * get_network_output_gpu_layer(network net, int i);
+float * get_network_delta_gpu_layer(network net, int i);
+float *get_network_output_gpu(network net);
+void forward_network_gpu(network net, network_state state);
+void backward_network_gpu(network net, network_state state);
 #endif
 
-network make_network(int n, int batch);
-void forward_network(network net, float *input, float *truth, int train);
-void backward_network(network net, float *input);
+void compare_networks(network n1, network n2, data d);
+char *get_layer_string(LAYER_TYPE a);
+
+network make_network(int n);
+void forward_network(network net, network_state state);
+void backward_network(network net, network_state state);
 void update_network(network net);
-float train_network_sgd(network net, data d, int n);
+
+float train_network(network net, data d);
 float train_network_batch(network net, data d, int n);
-void train_network(network net, data d);
+float train_network_sgd(network net, data d, int n);
+
 matrix network_predict_data(network net, data test);
 float *network_predict(network net, float *input);
 float network_accuracy(network net, data d);
+float *network_accuracies(network net, data d);
 float network_accuracy_multi(network net, data d, int n);
 void top_predictions(network net, int n, int *index);
 float *get_network_output(network net);
@@ -68,9 +67,14 @@
 int get_predicted_class_network(network net);
 void print_network(network net);
 void visualize_network(network net);
-int resize_network(network net, int h, int w, int c);
+int resize_network(network *net, int w, int h);
+void set_batch_network(network *net, int b);
 int get_network_input_size(network net);
 float get_network_cost(network net);
+detection_layer get_network_detection_layer(network net);
+
+int get_network_nuisance(network net);
+int get_network_background(network net);
 
 #endif
 

--
Gitblit v1.10.0