From b714004546b97e9a43fae3e385dbefb56cecafb6 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 26 Oct 2017 15:04:26 +0000
Subject: [PATCH] Fixed bug with: net->seen
---
src/network.c | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/network.c b/src/network.c
index 8d46c55..2d755ae 100644
--- a/src/network.c
+++ b/src/network.c
@@ -41,7 +41,7 @@
net.momentum = 0;
net.decay = 0;
#ifdef GPU
- if(gpu_index >= 0) update_network_gpu(net);
+ //if(net.gpu_index >= 0) update_network_gpu(net);
#endif
}
@@ -60,7 +60,7 @@
for(i = 0; i < net.num_steps; ++i){
if(net.steps[i] > batch_num) return rate;
rate *= net.scales[i];
- if(net.steps[i] > batch_num - 1) reset_momentum(net);
+ //if(net.steps[i] > batch_num - 1 && net.scales[i] > 1) reset_momentum(net);
}
return rate;
case EXP:
@@ -321,6 +321,12 @@
int resize_network(network *net, int w, int h)
{
+#ifdef GPU
+ cuda_set_device(net->gpu_index);
+ if(gpu_index >= 0){
+ cuda_free(net->workspace);
+ }
+#endif
int i;
//if(w == net->w && h == net->h) return 0;
net->w = w;
@@ -337,6 +343,10 @@
resize_crop_layer(&l, w, h);
}else if(l.type == MAXPOOL){
resize_maxpool_layer(&l, w, h);
+ }else if(l.type == REGION){
+ resize_region_layer(&l, w, h);
+ }else if(l.type == ROUTE){
+ resize_route_layer(&l, net);
}else if(l.type == REORG){
resize_reorg_layer(&l, w, h);
}else if(l.type == AVGPOOL){
@@ -346,6 +356,7 @@
}else if(l.type == COST){
resize_cost_layer(&l, inputs);
}else{
+ fprintf(stderr, "Resizing type %d \n", (int)l.type);
error("Cannot resize this type of layer");
}
if(l.workspace_size > workspace_size) workspace_size = l.workspace_size;
@@ -357,7 +368,12 @@
}
#ifdef GPU
if(gpu_index >= 0){
- cuda_free(net->workspace);
+ if(net->input_gpu) {
+ cuda_free(*net->input_gpu);
+ *net->input_gpu = 0;
+ cuda_free(*net->truth_gpu);
+ *net->truth_gpu = 0;
+ }
net->workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1);
}else {
free(net->workspace);
@@ -575,15 +591,19 @@
void free_network(network net)
{
- int i;
- for(i = 0; i < net.n; ++i){
- free_layer(net.layers[i]);
- }
- free(net.layers);
+ int i;
+ for (i = 0; i < net.n; ++i) {
+ free_layer(net.layers[i]);
+ }
+ free(net.layers);
#ifdef GPU
- if(*net.input_gpu) cuda_free(*net.input_gpu);
- if(*net.truth_gpu) cuda_free(*net.truth_gpu);
- if(net.input_gpu) free(net.input_gpu);
- if(net.truth_gpu) free(net.truth_gpu);
+ if (gpu_index >= 0) cuda_free(net.workspace);
+ else free(net.workspace);
+ if (*net.input_gpu) cuda_free(*net.input_gpu);
+ if (*net.truth_gpu) cuda_free(*net.truth_gpu);
+ if (net.input_gpu) free(net.input_gpu);
+ if (net.truth_gpu) free(net.truth_gpu);
+#else
+ free(net.workspace);
#endif
}
--
Gitblit v1.10.0