From a6c51e3b758aee7fd3a6f1d37daa8dcad4891e52 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 08 Mar 2018 22:42:58 +0000
Subject: [PATCH] Fixes for small objects. And fixes of densenet201_yolo.cfg, resnet50_yolo.cfg, resnet152_yolo.cfg
---
src/network.h | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/network.h b/src/network.h
index 4c108df..6f4123a 100644
--- a/src/network.h
+++ b/src/network.h
@@ -2,19 +2,26 @@
#ifndef NETWORK_H
#define NETWORK_H
-#include "image.h"
+#include <stdint.h>
#include "layer.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "image.h"
#include "data.h"
-#include "params.h"
+#include "tree.h"
typedef enum {
- CONSTANT, STEP, EXP, POLY, STEPS, SIG
+ CONSTANT, STEP, EXP, POLY, STEPS, SIG, RANDOM
} learning_rate_policy;
typedef struct network{
+ float *workspace;
int n;
int batch;
- int *seen;
+ int *seen;
float epoch;
int subdivisions;
float momentum;
@@ -28,18 +35,36 @@
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 adam;
+ float B1;
+ float B2;
+ float eps;
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;
+ tree *hierarchy;
#ifdef GPU
float **input_gpu;
float **truth_gpu;
+ int wait_stream;
#endif
} network;
@@ -47,12 +72,15 @@
float *truth;
float *input;
float *delta;
+ float *workspace;
int train;
int index;
network net;
} network_state;
#ifdef GPU
+float train_networks(network *nets, int n, data d, int interval);
+void sync_nets(network *nets, int n, int interval);
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);
@@ -77,6 +105,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);
@@ -103,5 +132,9 @@
int get_network_nuisance(network net);
int get_network_background(network net);
+#ifdef __cplusplus
+}
+#endif
+
#endif
--
Gitblit v1.10.0