From af4e4f92dc9e5da160eb6c6870a7b38b863f1c6c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 28 Oct 2014 02:45:06 +0000
Subject: [PATCH] getting rid of sub_arrays, nvidia driver memory leak

---
 src/network.c |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/network.c b/src/network.c
index 51b0700..69942e8 100644
--- a/src/network.c
+++ b/src/network.c
@@ -38,7 +38,7 @@
     //printf("start\n");
     int i;
     for(i = 0; i < net.n; ++i){
-        clock_t time = clock();
+        //clock_t time = clock();
         if(net.types[i] == CONVOLUTIONAL){
             convolutional_layer layer = *(convolutional_layer *)net.layers[i];
             forward_convolutional_layer_gpu(layer, input);
@@ -63,7 +63,7 @@
             forward_softmax_layer_gpu(layer, input);
             input = layer.output_cl;
         }
-        printf("%d %f\n", i, sec(clock()-time));
+        //printf("%d %f\n", i, sec(clock()-time));
         /*
            else if(net.types[i] == CROP){
            crop_layer layer = *(crop_layer *)net.layers[i];
@@ -386,6 +386,7 @@
 {
     int x_size = get_network_input_size(net)*net.batch;
     int y_size = get_network_output_size(net)*net.batch;
+    clock_t time = clock();
     if(!*net.input_cl){
         *net.input_cl = cl_make_array(x, x_size);
         *net.truth_cl = cl_make_array(y, y_size);
@@ -393,10 +394,18 @@
         cl_write_array(*net.input_cl, x, x_size);
         cl_write_array(*net.truth_cl, y, y_size);
     }
+    //printf("trans %f\n", sec(clock()-time));
+    time = clock();
     forward_network_gpu(net, *net.input_cl, *net.truth_cl, 1);
+    //printf("forw %f\n", sec(clock()-time));
+    time = clock();
     backward_network_gpu(net, *net.input_cl);
+    //printf("back %f\n", sec(clock()-time));
+    time = clock();
     float error = get_network_cost(net);
     update_network_gpu(net);
+    //printf("updt %f\n", sec(clock()-time));
+    time = clock();
     return error;
 }
 
@@ -409,7 +418,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;
     }
@@ -440,7 +467,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