From 27d0c922eab34025327d885c2137f7168b6130b7 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 30 Oct 2014 06:47:50 +0000
Subject: [PATCH] im2col actually works now

---
 src/network.c |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/network.c b/src/network.c
index 8167d85..b30b5d1 100644
--- a/src/network.c
+++ b/src/network.c
@@ -85,6 +85,7 @@
     cl_mem prev_input;
     cl_mem prev_delta;
     for(i = net.n-1; i >= 0; --i){
+        //clock_t time = clock();
         if(i == 0){
             prev_input = input;
             prev_delta = 0;
@@ -112,6 +113,7 @@
             softmax_layer layer = *(softmax_layer *)net.layers[i];
             backward_softmax_layer_gpu(layer, prev_delta);
         }
+        //printf("back: %d %f\n", i, sec(clock()-time));
     }
 }
 
@@ -418,7 +420,25 @@
     int i;
     float sum = 0;
     for(i = 0; i < n; ++i){
-        get_batch(d, batch, X, y);
+        get_random_batch(d, batch, X, y);
+        float err = train_network_datum_gpu(net, X, y);
+        sum += err;
+    }
+    free(X);
+    free(y);
+    return (float)sum/(n*batch);
+}
+
+float train_network_data_gpu(network net, data d, int n)
+{
+    int batch = net.batch;
+    float *X = calloc(batch*d.X.cols, sizeof(float));
+    float *y = calloc(batch*d.y.cols, sizeof(float));
+
+    int i;
+    float sum = 0;
+    for(i = 0; i < n; ++i){
+        get_next_batch(d, batch, i*batch, X, y);
         float err = train_network_datum_gpu(net, X, y);
         sum += err;
     }
@@ -449,7 +469,7 @@
     int i;
     float sum = 0;
     for(i = 0; i < n; ++i){
-        get_batch(d, batch, X, y);
+        get_random_batch(d, batch, X, y);
         float err = train_network_datum(net, X, y);
         sum += err;
     }

--
Gitblit v1.10.0