From 989ab8c38a02fa7ea9c25108151736c62e81c972 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 24 Apr 2015 17:27:50 +0000
Subject: [PATCH] IOU loss function
---
src/network.h | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/src/network.h b/src/network.h
index c75804d..ed8872b 100644
--- a/src/network.h
+++ b/src/network.h
@@ -3,32 +3,70 @@
#define NETWORK_H
#include "image.h"
+#include "detection_layer.h"
+#include "params.h"
#include "data.h"
typedef enum {
CONVOLUTIONAL,
+ DECONVOLUTIONAL,
CONNECTED,
MAXPOOL,
- SOFTMAX
+ SOFTMAX,
+ DETECTION,
+ NORMALIZATION,
+ DROPOUT,
+ CROP,
+ COST
} LAYER_TYPE;
typedef struct {
int n;
+ int batch;
+ int seen;
+ int subdivisions;
+ float learning_rate;
+ float momentum;
+ float decay;
void **layers;
LAYER_TYPE *types;
int outputs;
float *output;
+
+ int inputs;
+ int h, w, c;
+
+ #ifdef GPU
+ float **input_gpu;
+ float **truth_gpu;
+ #endif
} network;
+#ifdef GPU
+float train_network_datum_gpu(network net, float *x, float *y);
+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);
+#endif
+
+void compare_networks(network n1, network n2, data d);
+char *get_layer_string(LAYER_TYPE a);
+
network make_network(int n);
-void forward_network(network net, float *input);
-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);
-float train_network_batch(network net, data d, int n, float step, float momentum,float decay);
-void train_network(network net, data d, float step, float momentum, float decay);
+void forward_network(network net, network_state state);
+void backward_network(network net, network_state state);
+void update_network(network net);
+
+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);
+
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_accuracy_multi(network net, data d, int n);
+void top_predictions(network net, int n, int *index);
float *get_network_output(network net);
float *get_network_output_layer(network net, int i);
float *get_network_delta_layer(network net, int i);
@@ -40,8 +78,14 @@
int get_predicted_class_network(network net);
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);
+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);
#endif
--
Gitblit v1.10.0