From 1a35f49ab3ae9d74b636de8580e07ab072846ea9 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Thu, 31 May 2018 11:19:42 +0000
Subject: [PATCH] Merge pull request #950 from IlyaOvodov/Fix_size_PR
---
src/network.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/network.c b/src/network.c
index 03ad5eb..050d334 100644
--- a/src/network.c
+++ b/src/network.c
@@ -28,13 +28,14 @@
#include "route_layer.h"
#include "shortcut_layer.h"
#include "yolo_layer.h"
+#include "upsample_layer.h"
#include "parser.h"
-network *load_network(char *cfg, char *weights, int clear)
+network *load_network_custom(char *cfg, char *weights, int clear, int batch)
{
printf(" Try to load cfg: %s, weights: %s, clear = %d \n", cfg, weights, clear);
network *net = calloc(1, sizeof(network));
- *net = parse_network_cfg(cfg);
+ *net = parse_network_cfg_custom(cfg, batch);
if (weights && weights[0] != 0) {
load_weights(net, weights);
}
@@ -42,6 +43,11 @@
return net;
}
+network *load_network(char *cfg, char *weights, int clear)
+{
+ return load_network_custom(cfg, weights, clear, 0);
+}
+
int get_current_batch(network net)
{
int batch_num = (*net.seen)/(net.batch*net.subdivisions);
@@ -172,7 +178,7 @@
net.n = n;
net.layers = calloc(net.n, sizeof(layer));
net.seen = calloc(1, sizeof(int));
- #ifdef GPU
+#ifdef GPU
net.input_gpu = calloc(1, sizeof(float *));
net.truth_gpu = calloc(1, sizeof(float *));
@@ -180,7 +186,7 @@
net.output16_gpu = calloc(1, sizeof(float *));
net.max_input16_size = calloc(1, sizeof(size_t));
net.max_output16_size = calloc(1, sizeof(size_t));
- #endif
+#endif
return net;
}
@@ -576,7 +582,7 @@
box *boxes = calloc(l.w*l.h*l.n, sizeof(box));
float **probs = calloc(l.w*l.h*l.n, sizeof(float *));
int i, j;
- for (j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float *));
+ for (j = 0; j < l.w*l.h*l.n; ++j) probs[j] = calloc(l.classes, sizeof(float));
get_region_boxes(l, 1, 1, thresh, probs, boxes, 0, map);
for (j = 0; j < l.w*l.h*l.n; ++j) {
dets[j].classes = l.classes;
@@ -767,6 +773,11 @@
free_layer(net.layers[i]);
}
free(net.layers);
+
+ free(net.scales);
+ free(net.steps);
+ free(net.seen);
+
#ifdef GPU
if (gpu_index >= 0) cuda_free(net.workspace);
else free(net.workspace);
@@ -800,14 +811,14 @@
int f;
for (f = 0; f < l->n; ++f)
{
- l->biases[f] = l->biases[f] - l->scales[f] * l->rolling_mean[f] / (sqrtf(l->rolling_variance[f]) + .000001f);
+ l->biases[f] = l->biases[f] - (double)l->scales[f] * l->rolling_mean[f] / (sqrt((double)l->rolling_variance[f]) + .000001f);
const size_t filter_size = l->size*l->size*l->c;
int i;
for (i = 0; i < filter_size; ++i) {
int w_index = f*filter_size + i;
- l->weights[w_index] = l->weights[w_index] * l->scales[f] / (sqrtf(l->rolling_variance[f]) + .000001f);
+ l->weights[w_index] = (double)l->weights[w_index] * l->scales[f] / (sqrt((double)l->rolling_variance[f]) + .000001f);
}
}
--
Gitblit v1.10.0