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/im2col.cl | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/im2col.cl b/src/im2col.cl
index 765a92d..8169e1a 100644
--- a/src/im2col.cl
+++ b/src/im2col.cl
@@ -1,26 +1,43 @@
-
-__kernel void im2col(__global float *data_im, const int im_offset,
- const int channels, const int height, const int width,
- const int ksize, const int stride, __global float *data_col, const int col_offset)
+float im2col_get_pixel(__global float *im, int height, int width, int channels,
+ int batch, int row, int col, int channel, int pad)
{
- int b = get_global_id(0);
- int c = get_global_id(1);
+ row -= pad;
+ col -= pad;
- int h = get_local_id(0);
- int w = get_local_id(1);
+ if (row < 0 || col < 0 || row >= height || col >= width) return 0;
+ int index = col + width*(row + height*(channel+batch*channels));
+ return im[index];
+}
+__kernel void im2col(__global float *data_im, int batch,
+ int channels, int height, int width,
+ int ksize, int stride, int pad, __global float *data_col)
+{
+ int c,h,w,b;
int height_col = (height - ksize) / stride + 1;
int width_col = (width - ksize) / stride + 1;
int channels_col = channels * ksize * ksize;
+ if (pad){
+ height_col = 1 + (height-1) / stride;
+ width_col = 1 + (width-1) / stride;
+ pad = ksize/2;
+ }
+ int id = get_global_id(0);
+ w = id % width_col;
+ id /= width_col;
+ h = id % height_col;
+ id /= height_col;
+ c = id % channels_col;
+ id /= channels_col;
+ b = id % batch;
+ id /= batch;
- int im_offset = height*width*channels*b;
- int col_offset = height_col*width_col*channels_col*b;
-
+ int col_size = height_col*width_col*channels_col;
int w_offset = c % ksize;
int h_offset = (c / ksize) % ksize;
int c_im = c / ksize / ksize;
-
- data_col[(c * height_col + h) * width_col + w + col_offset] =
- data_im[(c_im * height + h * stride + h_offset) * width
- + w * stride + w_offset + im_offset];
+ int im_row = h_offset + h * stride;
+ int im_col = w_offset + w * stride;
+ int col_index = (c * height_col + h) * width_col + w + b*col_size;
+ data_col[col_index] = im2col_get_pixel(data_im, height, width, channels, b, im_row, im_col, c_im, pad);
}
--
Gitblit v1.10.0