From 08d6910521d9aa05a11d0db154ae70874e47d0e1 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 09 Aug 2017 21:06:24 +0000
Subject: [PATCH] Update Readme.md

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

diff --git a/src/network.h b/src/network.h
index 78ad0fe..bb65eac 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,19 +2,26 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "image.h"
-#include "detection_layer.h"
 #include "layer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "image.h"
 #include "data.h"
+#include "tree.h"
 
 typedef enum {
-    CONSTANT, STEP, EXP, POLY, STEPS, SIG
+    CONSTANT, STEP, EXP, POLY, STEPS, SIG, RANDOM
 } learning_rate_policy;
 
-typedef struct {
+typedef struct network{
+    float *workspace;
     int n;
     int batch;
     int *seen;
+    float epoch;
     int subdivisions;
     float momentum;
     float decay;
@@ -27,14 +34,31 @@
     float gamma;
     float scale;
     float power;
+    int time_steps;
     int step;
     int max_batches;
     float *scales;
     int   *steps;
     int num_steps;
+    int burn_in;
+
+    int adam;
+    float B1;
+    float B2;
+    float eps;
 
     int inputs;
     int h, w, c;
+    int max_crop;
+    int min_crop;
+    float angle;
+    float aspect;
+    float exposure;
+    float saturation;
+    float hue;
+
+    int gpu_index;
+    tree *hierarchy;
 
     #ifdef GPU
     float **input_gpu;
@@ -42,7 +66,19 @@
     #endif
 } network;
 
+typedef struct network_state {
+    float *truth;
+    float *input;
+    float *delta;
+    float *workspace;
+    int train;
+    int index;
+    network net;
+} network_state;
+
 #ifdef GPU
+float train_networks(network *nets, int n, data d, int interval);
+void sync_nets(network *nets, int n, int interval);
 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);
@@ -50,6 +86,7 @@
 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);
+void update_network_gpu(network net);
 #endif
 
 float get_current_rate(network net);
@@ -66,6 +103,7 @@
 float train_network(network net, data d);
 float train_network_batch(network net, data d, int n);
 float train_network_sgd(network net, data d, int n);
+float train_network_datum(network net, float *x, float *y);
 
 matrix network_predict_data(network net, data test);
 float *network_predict(network net, float *input);
@@ -88,10 +126,13 @@
 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);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 

--
Gitblit v1.10.0