From b32a287e38f4c6a41828f18b4669dec9f3af4943 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:17:52 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/network.h | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/network.h b/src/network.h
index c75804d..35a58ca 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,19 +10,26 @@
CONVOLUTIONAL,
CONNECTED,
MAXPOOL,
- SOFTMAX
+ SOFTMAX,
+ NORMALIZATION
} LAYER_TYPE;
typedef struct {
int n;
+ int batch;
void **layers;
LAYER_TYPE *types;
int outputs;
float *output;
+
+ #ifdef GPU
+ cl_mem input_cl;
+ cl_mem output_cl;
+ #endif
} network;
-network make_network(int n);
-void forward_network(network net, float *input);
+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 step, float momentum, float decay);
float train_network_sgd(network net, data d, int n, float step, float momentum,float decay);
@@ -41,7 +49,8 @@
void print_network(network net);
void visualize_network(network net);
void save_network(network net, char *filename);
-int reset_network_size(network net, int h, int w, int c);
+int resize_network(network net, int h, int w, int c);
+int get_network_input_size(network net);
#endif
--
Gitblit v1.10.0