From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server
---
src/network.h | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/network.h b/src/network.h
index 65ace57..eeaef41 100644
--- a/src/network.h
+++ b/src/network.h
@@ -13,7 +13,9 @@
SOFTMAX,
NORMALIZATION,
DROPOUT,
- CROP
+ FREEWEIGHT,
+ CROP,
+ COST
} LAYER_TYPE;
typedef struct {
@@ -28,25 +30,36 @@
float *output;
#ifdef GPU
- cl_mem input_cl;
- cl_mem output_cl;
+ cl_mem *input_cl;
+ cl_mem *truth_cl;
#endif
} network;
#ifdef GPU
-void forward_network_gpu(network net, cl_mem input, int train);
+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 *network_predict_gpu(network net, float *input);
+float network_accuracy_gpu(network net, data d);
#endif
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 forward_network(network net, float *input, float *truth, int train);
+void backward_network(network net, float *input);
void update_network(network net);
float train_network_sgd(network net, data d, int n);
float train_network_batch(network net, data d, int n);
+float train_network_data_cpu(network net, data d, int n);
void train_network(network net, data d);
matrix network_predict_data(network net, data test);
+float *network_predict(network net, float *input);
float network_accuracy(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);
@@ -60,6 +73,7 @@
void visualize_network(network net);
int resize_network(network net, int h, int w, int c);
int get_network_input_size(network net);
+float get_network_cost(network net);
#endif
--
Gitblit v1.10.0