From e4ab47dfcedb4c87e5eddf484caa4ac0c020fc9b Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 21 Feb 2018 12:35:09 +0000
Subject: [PATCH] Optimized resizing of region_layer for random=1
---
src/network.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/network.c b/src/network.c
index 79940e6..f3185a3 100644
--- a/src/network.c
+++ b/src/network.c
@@ -50,6 +50,7 @@
int batch_num = get_current_batch(net);
int i;
float rate;
+ if (batch_num < net.burn_in) return net.learning_rate * pow((float)batch_num / net.burn_in, net.power);
switch (net.policy) {
case CONSTANT:
return net.learning_rate;
@@ -66,8 +67,9 @@
case EXP:
return net.learning_rate * pow(net.gamma, batch_num);
case POLY:
- if (batch_num < net.burn_in) return net.learning_rate * pow((float)batch_num / net.burn_in, net.power);
- return net.learning_rate * pow(1 - (float)batch_num / net.max_batches, net.power);
+ return net.learning_rate * pow(1 - (float)batch_num / net.max_batches, net.power);
+ //if (batch_num < net.burn_in) return net.learning_rate * pow((float)batch_num / net.burn_in, net.power);
+ //return net.learning_rate * pow(1 - (float)batch_num / net.max_batches, net.power);
case RANDOM:
return net.learning_rate * pow(rand_uniform(0,1), net.power);
case SIG:
@@ -218,6 +220,7 @@
state.delta = prev.delta;
}
layer l = net.layers[i];
+ if (l.stopbackward) break;
l.backward(l, state);
}
}
@@ -325,6 +328,12 @@
cuda_set_device(net->gpu_index);
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;
+ }
}
#endif
int i;
@@ -337,6 +346,7 @@
//fflush(stderr);
for (i = 0; i < net->n; ++i){
layer l = net->layers[i];
+ printf(" %d: layer = %d,", i, l.type);
if(l.type == CONVOLUTIONAL){
resize_convolutional_layer(&l, w, h);
}else if(l.type == CROP){
@@ -356,6 +366,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;
@@ -367,13 +378,9 @@
}
#ifdef GPU
if(gpu_index >= 0){
- if(net->input_gpu) {
- cuda_free(*net->input_gpu);
- *net->input_gpu = 0;
- cuda_free(*net->truth_gpu);
- *net->truth_gpu = 0;
- }
+ printf(" try to allocate workspace, ");
net->workspace = cuda_make_array(0, (workspace_size-1)/sizeof(float)+1);
+ printf(" CUDA allocate done! \n");
}else {
free(net->workspace);
net->workspace = calloc(1, workspace_size);
--
Gitblit v1.10.0