From e7688a05a194e3c8baf3c11fbf09b7f5e8640a77 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 06 May 2015 21:08:16 +0000
Subject: [PATCH] no idea

---
 src/network.h |   51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/src/network.h b/src/network.h
index a9a6797..d05f548 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,22 +2,29 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "opencl.h"
 #include "image.h"
+#include "detection_layer.h"
+#include "params.h"
 #include "data.h"
 
 typedef enum {
     CONVOLUTIONAL,
+    DECONVOLUTIONAL,
     CONNECTED,
     MAXPOOL,
     SOFTMAX,
+    DETECTION,
     NORMALIZATION,
-    DROPOUT
+    DROPOUT,
+    CROP,
+    COST
 } LAYER_TYPE;
 
 typedef struct {
     int n;
     int batch;
+    int seen;
+    int subdivisions;
     float learning_rate;
     float momentum;
     float decay;
@@ -26,21 +33,41 @@
     int outputs;
     float *output;
 
+    int inputs;
+    int h, w, c;
+
     #ifdef GPU
-    cl_mem input_cl;
-    cl_mem output_cl;
+    float **input_gpu;
+    float **truth_gpu;
     #endif
 } network;
 
-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);
+#ifdef GPU
+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);
+#endif
+
+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);
 float *get_network_output_layer(network net, int i);
 float *get_network_delta_layer(network net, int i);
@@ -53,7 +80,13 @@
 void print_network(network net);
 void visualize_network(network net);
 int resize_network(network net, int h, int w, int c);
+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