From 68213b835b9f15cb449ad2037a8b51c17a3de07b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Mar 2016 22:10:14 +0000
Subject: [PATCH] Makefile
---
src/network.h | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/network.h b/src/network.h
index 78ad0fe..f4f8b5c 100644
--- a/src/network.h
+++ b/src/network.h
@@ -3,7 +3,6 @@
#define NETWORK_H
#include "image.h"
-#include "detection_layer.h"
#include "layer.h"
#include "data.h"
@@ -11,10 +10,11 @@
CONSTANT, STEP, EXP, POLY, STEPS, SIG
} learning_rate_policy;
-typedef struct {
+typedef struct network{
int n;
int batch;
int *seen;
+ float epoch;
int subdivisions;
float momentum;
float decay;
@@ -27,6 +27,7 @@
float gamma;
float scale;
float power;
+ int time_steps;
int step;
int max_batches;
float *scales;
@@ -35,6 +36,7 @@
int inputs;
int h, w, c;
+ int max_crop;
#ifdef GPU
float **input_gpu;
@@ -42,6 +44,15 @@
#endif
} network;
+typedef struct network_state {
+ float *truth;
+ float *input;
+ float *delta;
+ int train;
+ int index;
+ network net;
+} network_state;
+
#ifdef GPU
float train_network_datum_gpu(network net, float *x, float *y);
float *network_predict_gpu(network net, float *input);
@@ -50,6 +61,7 @@
float *get_network_output_gpu(network net);
void forward_network_gpu(network net, network_state state);
void backward_network_gpu(network net, network_state state);
+void update_network_gpu(network net);
#endif
float get_current_rate(network net);
@@ -66,6 +78,7 @@
float train_network(network net, data d);
float train_network_batch(network net, data d, int n);
float train_network_sgd(network net, data d, int n);
+float train_network_datum(network net, float *x, float *y);
matrix network_predict_data(network net, data test);
float *network_predict(network net, float *input);
@@ -88,7 +101,6 @@
void set_batch_network(network *net, int b);
int get_network_input_size(network net);
float get_network_cost(network net);
-detection_layer get_network_detection_layer(network net);
int get_network_nuisance(network net);
int get_network_background(network net);
--
Gitblit v1.10.0