From 37d7c1e79f65a75caf87e29a562d30c51cd654e5 Mon Sep 17 00:00:00 2001
From: Joe Redmon <pjreddie@gmail.com>
Date: Thu, 26 Nov 2015 21:52:56 +0000
Subject: [PATCH] fixed label linking
---
src/network.h | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/network.h b/src/network.h
index ed8872b..428ff52 100644
--- a/src/network.h
+++ b/src/network.h
@@ -4,34 +4,35 @@
#include "image.h"
#include "detection_layer.h"
-#include "params.h"
+#include "layer.h"
#include "data.h"
typedef enum {
- CONVOLUTIONAL,
- DECONVOLUTIONAL,
- CONNECTED,
- MAXPOOL,
- SOFTMAX,
- DETECTION,
- NORMALIZATION,
- DROPOUT,
- CROP,
- COST
-} LAYER_TYPE;
+ CONSTANT, STEP, EXP, POLY, STEPS, SIG
+} learning_rate_policy;
typedef struct {
int n;
int batch;
- int seen;
+ int *seen;
+ float epoch;
int subdivisions;
- float learning_rate;
float momentum;
float decay;
- void **layers;
- LAYER_TYPE *types;
+ layer *layers;
int outputs;
float *output;
+ learning_rate_policy policy;
+
+ 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;
@@ -47,8 +48,15 @@
float *network_predict_gpu(network net, float *input);
float * get_network_output_gpu_layer(network net, int i);
float * get_network_delta_gpu_layer(network net, int i);
+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);
+int get_current_batch(network net);
+void free_network(network net);
void compare_networks(network n1, network n2, data d);
char *get_layer_string(LAYER_TYPE a);
@@ -64,7 +72,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);
@@ -78,11 +86,10 @@
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 resize_network(network *net, int w, int h);
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