From 351996d9f0390ef44412fa678bc7a073a94e23e5 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 16 Mar 2017 18:49:36 +0000
Subject: [PATCH] Fixed memory leak in DLL, added load_image() & free_image(), added read_names_from_file()
---
src/network.c | 135 +++++++++------------------------------------
1 files changed, 27 insertions(+), 108 deletions(-)
diff --git a/src/network.c b/src/network.c
index 72c8943..0914e37 100644
--- a/src/network.c
+++ b/src/network.c
@@ -15,7 +15,6 @@
#include "local_layer.h"
#include "convolutional_layer.h"
#include "activation_layer.h"
-#include "deconvolutional_layer.h"
#include "detection_layer.h"
#include "region_layer.h"
#include "normalization_layer.h"
@@ -42,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
}
@@ -61,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:
@@ -153,49 +152,7 @@
if(l.delta){
scal_cpu(l.outputs * l.batch, 0, l.delta, 1);
}
- if(l.type == CONVOLUTIONAL){
- forward_convolutional_layer(l, state);
- } else if(l.type == DECONVOLUTIONAL){
- forward_deconvolutional_layer(l, state);
- } else if(l.type == ACTIVE){
- forward_activation_layer(l, state);
- } else if(l.type == LOCAL){
- forward_local_layer(l, state);
- } else if(l.type == NORMALIZATION){
- forward_normalization_layer(l, state);
- } else if(l.type == BATCHNORM){
- forward_batchnorm_layer(l, state);
- } else if(l.type == DETECTION){
- forward_detection_layer(l, state);
- } else if(l.type == REGION){
- forward_region_layer(l, state);
- } else if(l.type == CONNECTED){
- forward_connected_layer(l, state);
- } else if(l.type == RNN){
- forward_rnn_layer(l, state);
- } else if(l.type == GRU){
- forward_gru_layer(l, state);
- } else if(l.type == CRNN){
- forward_crnn_layer(l, state);
- } else if(l.type == CROP){
- forward_crop_layer(l, state);
- } else if(l.type == COST){
- forward_cost_layer(l, state);
- } else if(l.type == SOFTMAX){
- forward_softmax_layer(l, state);
- } else if(l.type == MAXPOOL){
- forward_maxpool_layer(l, state);
- } else if(l.type == REORG){
- forward_reorg_layer(l, state);
- } else if(l.type == AVGPOOL){
- forward_avgpool_layer(l, state);
- } else if(l.type == DROPOUT){
- forward_dropout_layer(l, state);
- } else if(l.type == ROUTE){
- forward_route_layer(l, net);
- } else if(l.type == SHORTCUT){
- forward_shortcut_layer(l, state);
- }
+ l.forward(l, state);
state.input = l.output;
}
}
@@ -207,29 +164,17 @@
float rate = get_current_rate(net);
for(i = 0; i < net.n; ++i){
layer l = net.layers[i];
- if(l.type == CONVOLUTIONAL){
- update_convolutional_layer(l, update_batch, rate, net.momentum, net.decay);
- } else if(l.type == DECONVOLUTIONAL){
- update_deconvolutional_layer(l, rate, net.momentum, net.decay);
- } else if(l.type == CONNECTED){
- update_connected_layer(l, update_batch, rate, net.momentum, net.decay);
- } else if(l.type == RNN){
- update_rnn_layer(l, update_batch, rate, net.momentum, net.decay);
- } else if(l.type == GRU){
- update_gru_layer(l, update_batch, rate, net.momentum, net.decay);
- } else if(l.type == CRNN){
- update_crnn_layer(l, update_batch, rate, net.momentum, net.decay);
- } else if(l.type == LOCAL){
- update_local_layer(l, update_batch, rate, net.momentum, net.decay);
+ if(l.update){
+ l.update(l, update_batch, rate, net.momentum, net.decay);
}
}
}
float *get_network_output(network net)
{
- #ifdef GPU
- if (gpu_index >= 0) return get_network_output_gpu(net);
- #endif
+#ifdef GPU
+ if (gpu_index >= 0) return get_network_output_gpu(net);
+#endif
int i;
for(i = net.n-1; i > 0; --i) if(net.layers[i].type != COST) break;
return net.layers[i].output;
@@ -273,47 +218,7 @@
state.delta = prev.delta;
}
layer l = net.layers[i];
- if(l.type == CONVOLUTIONAL){
- backward_convolutional_layer(l, state);
- } else if(l.type == DECONVOLUTIONAL){
- backward_deconvolutional_layer(l, state);
- } else if(l.type == ACTIVE){
- backward_activation_layer(l, state);
- } else if(l.type == NORMALIZATION){
- backward_normalization_layer(l, state);
- } else if(l.type == BATCHNORM){
- backward_batchnorm_layer(l, state);
- } else if(l.type == MAXPOOL){
- if(i != 0) backward_maxpool_layer(l, state);
- } else if(l.type == REORG){
- backward_reorg_layer(l, state);
- } else if(l.type == AVGPOOL){
- backward_avgpool_layer(l, state);
- } else if(l.type == DROPOUT){
- backward_dropout_layer(l, state);
- } else if(l.type == DETECTION){
- backward_detection_layer(l, state);
- } else if(l.type == REGION){
- backward_region_layer(l, state);
- } else if(l.type == SOFTMAX){
- if(i != 0) backward_softmax_layer(l, state);
- } else if(l.type == CONNECTED){
- backward_connected_layer(l, state);
- } else if(l.type == RNN){
- backward_rnn_layer(l, state);
- } else if(l.type == GRU){
- backward_gru_layer(l, state);
- } else if(l.type == CRNN){
- backward_crnn_layer(l, state);
- } else if(l.type == LOCAL){
- backward_local_layer(l, state);
- } else if(l.type == COST){
- backward_cost_layer(l, state);
- } else if(l.type == ROUTE){
- backward_route_layer(l, net);
- } else if(l.type == SHORTCUT){
- backward_shortcut_layer(l, state);
- }
+ l.backward(l, state);
}
}
@@ -406,16 +311,22 @@
int i;
for(i = 0; i < net->n; ++i){
net->layers[i].batch = b;
- #ifdef CUDNN
+#ifdef CUDNN
if(net->layers[i].type == CONVOLUTIONAL){
cudnn_convolutional_setup(net->layers + i);
}
- #endif
+#endif
}
}
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;
@@ -432,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){
@@ -452,7 +367,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);
@@ -660,7 +580,6 @@
return acc;
}
-
float network_accuracy_multi(network net, data d, int n)
{
matrix guess = network_predict_data_multi(net, d, n);
--
Gitblit v1.10.0