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 | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/src/network.h b/src/network.h
index c655c91..eeaef41 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,6 +2,7 @@
#ifndef NETWORK_H
#define NETWORK_H
+#include "opencl.h"
#include "image.h"
#include "data.h"
@@ -9,30 +10,70 @@
CONVOLUTIONAL,
CONNECTED,
MAXPOOL,
- SOFTMAX
+ SOFTMAX,
+ NORMALIZATION,
+ DROPOUT,
+ FREEWEIGHT,
+ CROP,
+ COST
} LAYER_TYPE;
typedef struct {
int n;
+ int batch;
+ float learning_rate;
+ float momentum;
+ float decay;
void **layers;
LAYER_TYPE *types;
+ int outputs;
+ float *output;
+
+ #ifdef GPU
+ cl_mem *input_cl;
+ cl_mem *truth_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);
+#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 *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, 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);
+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);
+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