From d9f1b0b16edeb59281355a855e18a8be343fc33c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 08 Aug 2014 19:04:15 +0000
Subject: [PATCH] probably how maxpool layers should be
---
src/network.h | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/network.h b/src/network.h
index 975c3dd..a9a6797 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,41 @@
CONVOLUTIONAL,
CONNECTED,
MAXPOOL,
- SOFTMAX
+ SOFTMAX,
+ NORMALIZATION,
+ DROPOUT
} LAYER_TYPE;
typedef struct {
int n;
+ int batch;
+ float learning_rate;
+ float momentum;
+ float decay;
void **layers;
LAYER_TYPE *types;
int outputs;
- double *output;
+ float *output;
+
+ #ifdef GPU
+ cl_mem input_cl;
+ cl_mem output_cl;
+ #endif
} network;
-network make_network(int n);
-void forward_network(network net, double *input);
-void backward_network(network net, double *input, double *truth);
-void update_network(network net, double step, double momentum, double decay);
-double train_network_sgd(network net, data d, int n, double step, double momentum,double decay);
-double train_network_batch(network net, data d, int n, double step, double momentum,double decay);
-void train_network(network net, data d, double step, double momentum, double decay);
+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 update_network(network net);
+float train_network_sgd(network net, data d, int n);
+float train_network_batch(network net, data d, int n);
+void train_network(network net, data d);
matrix network_predict_data(network net, data test);
-double network_accuracy(network net, data d);
-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);
+float network_accuracy(network net, data d);
+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);
@@ -40,6 +52,8 @@
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);
#endif
--
Gitblit v1.10.0