From 0f645836f193e75c4c3b718369e6fab15b5d19c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 11 Feb 2015 03:41:03 +0000
Subject: [PATCH] Detection is back, baby\!
---
src/network.h | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/network.h b/src/network.h
index e2102a8..66873d2 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,12 +2,12 @@
#ifndef NETWORK_H
#define NETWORK_H
-#include "opencl.h"
#include "image.h"
#include "data.h"
typedef enum {
CONVOLUTIONAL,
+ DECONVOLUTIONAL,
CONNECTED,
MAXPOOL,
SOFTMAX,
@@ -21,6 +21,7 @@
typedef struct {
int n;
int batch;
+ int seen;
float learning_rate;
float momentum;
float decay;
@@ -30,39 +31,34 @@
float *output;
#ifdef GPU
- cl_mem *input_cl;
- cl_mem *truth_cl;
+ float **input_gpu;
+ float **truth_gpu;
#endif
} network;
-#ifndef GPU
-typedef int cl_mem;
+#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);
#endif
-cl_mem get_network_output_cl_layer(network net, int i);
-cl_mem get_network_delta_cl_layer(network net, int i);
-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);
-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);
-float *network_accuracies_gpu(network net, data d);
-
-float *network_accuracies(network net, data d);
+void compare_networks(network n1, network n2, data d);
+char *get_layer_string(LAYER_TYPE a);
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(network net, data d);
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);
+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);
--
Gitblit v1.10.0