From db0397cfaaf488364e3d2e1669dfefae2ee6ea73 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 14 Dec 2015 19:57:10 +0000
Subject: [PATCH] shortcut layers, msr networks
---
src/network.h | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/network.h b/src/network.h
index 85e5dbc..4c108df 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"
+#include "params.h"
typedef enum {
- CONSTANT, STEP, EXP, POLY
+ 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;
@@ -25,9 +26,13 @@
float learning_rate;
float gamma;
+ float scale;
float power;
int step;
int max_batches;
+ float *scales;
+ int *steps;
+ int num_steps;
int inputs;
int h, w, c;
@@ -38,6 +43,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);
@@ -46,6 +60,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,7 +81,7 @@
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 +99,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