From 0e610b056dbcd85affa23f64f9f8da4d197f110a Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 08 Sep 2016 05:46:10 +0000
Subject: [PATCH] and again
---
src/network.h | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/network.h b/src/network.h
index 85e5dbc..d850af8 100644
--- a/src/network.h
+++ b/src/network.h
@@ -3,18 +3,19 @@
#define NETWORK_H
#include "image.h"
-#include "detection_layer.h"
#include "layer.h"
#include "data.h"
typedef enum {
- CONSTANT, STEP, EXP, POLY
+ CONSTANT, STEP, EXP, POLY, STEPS, SIG, RANDOM
} learning_rate_policy;
-typedef struct {
+typedef struct network{
+ float *workspace;
int n;
int batch;
int *seen;
+ float epoch;
int subdivisions;
float momentum;
float decay;
@@ -25,12 +26,27 @@
float learning_rate;
float gamma;
+ float scale;
float power;
+ int time_steps;
int step;
int max_batches;
+ float *scales;
+ int *steps;
+ int num_steps;
+ int burn_in;
int inputs;
int h, w, c;
+ int max_crop;
+ int min_crop;
+ float angle;
+ float aspect;
+ float exposure;
+ float saturation;
+ float hue;
+
+ int gpu_index;
#ifdef GPU
float **input_gpu;
@@ -38,6 +54,16 @@
#endif
} network;
+typedef struct network_state {
+ float *truth;
+ float *input;
+ float *delta;
+ float *workspace;
+ 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);
@@ -46,6 +72,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);
@@ -62,11 +89,12 @@
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);
float network_accuracy(network net, data d);
-float *network_accuracies(network net, data d);
+float *network_accuracies(network net, data d, int n);
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);
@@ -84,7 +112,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