From a4485b8a6656c2a2fa0b78ca7c035523c8149b8c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 10 Jun 2015 15:49:25 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet

---
 src/network_kernels.cu |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/network_kernels.cu b/src/network_kernels.cu
index 2ca2e2d..5e353ae 100644
--- a/src/network_kernels.cu
+++ b/src/network_kernels.cu
@@ -133,20 +133,18 @@
 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 == CONVOLUTIONAL){
         return l.output;
     } else if(l.type == DECONVOLUTIONAL){
         return l.output;
     } else if(l.type == CONNECTED){
-        cuda_pull_array(l.output_gpu, l.output, l.outputs*l.batch);
         return l.output;
     } else if(l.type == DETECTION){
-        cuda_pull_array(l.output_gpu, l.output, l.outputs*l.batch);
         return l.output;
     } else if(l.type == MAXPOOL){
         return l.output;
     } else if(l.type == SOFTMAX){
-        pull_softmax_layer_output(l);
         return l.output;
     }
     return 0;

--
Gitblit v1.10.0