From 54f83e153549dd1a63bcc8fa5e55fb171621a989 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Wed, 17 Jan 2018 18:05:07 +0000
Subject: [PATCH] Some fixes
---
src/network_kernels.cu | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/network_kernels.cu b/src/network_kernels.cu
index e319068..64f4f9b 100644
--- a/src/network_kernels.cu
+++ b/src/network_kernels.cu
@@ -51,6 +51,8 @@
fill_ongpu(l.outputs * l.batch, 0, l.delta_gpu, 1);
}
l.forward_gpu(l, state);
+ if(net.wait_stream)
+ cudaStreamSynchronize(get_cuda_stream());
state.input = l.output_gpu;
}
}
@@ -64,6 +66,7 @@
for(i = net.n-1; i >= 0; --i){
state.index = i;
layer l = net.layers[i];
+ if (l.stopbackward) break;
if(i == 0){
state.input = original_input;
state.delta = original_delta;
@@ -78,11 +81,13 @@
void update_network_gpu(network net)
{
+ cuda_set_device(net.gpu_index);
int i;
int update_batch = net.batch*net.subdivisions;
float rate = get_current_rate(net);
for(i = 0; i < net.n; ++i){
layer l = net.layers[i];
+ l.t = get_current_batch(net);
if(l.update_gpu){
l.update_gpu(l, update_batch, rate, net.momentum, net.decay);
}
@@ -109,6 +114,7 @@
state.truth = *net.truth_gpu;
state.train = 1;
forward_network_gpu(net, state);
+ cudaStreamSynchronize(get_cuda_stream());
backward_network_gpu(net, state);
}
@@ -176,6 +182,7 @@
{
int update_batch = net.batch*net.subdivisions;
float rate = get_current_rate(net);
+ l.t = get_current_batch(net);
if(l.update_gpu){
l.update_gpu(l, update_batch, rate, net.momentum, net.decay);
}
@@ -359,11 +366,14 @@
//printf("%f\n", errors[i]);
sum += errors[i];
}
+ //cudaDeviceSynchronize();
if (get_current_batch(nets[0]) % interval == 0) {
printf("Syncing... ");
+ fflush(stdout);
sync_nets(nets, n, interval);
printf("Done!\n");
}
+ //cudaDeviceSynchronize();
free(threads);
free(errors);
return (float)sum/(n);
@@ -372,7 +382,7 @@
float *get_network_output_layer_gpu(network net, int i)
{
layer l = net.layers[i];
- cuda_pull_array(l.output_gpu, l.output, l.outputs*l.batch);
+ if(l.type != REGION) cuda_pull_array(l.output_gpu, l.output, l.outputs*l.batch);
return l.output;
}
@@ -385,7 +395,8 @@
float *network_predict_gpu(network net, float *input)
{
- cuda_set_device(net.gpu_index);
+ if (net.gpu_index != cuda_get_device())
+ cuda_set_device(net.gpu_index);
int size = get_network_input_size(net) * net.batch;
network_state state;
state.index = 0;
--
Gitblit v1.10.0