From cb1f33c6ae840e8dc0f43518daf76e6ed01034f0 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Mon, 08 Dec 2014 19:48:57 +0000
Subject: [PATCH] Fixed race condition in server
---
src/im2col.cl | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/im2col.cl b/src/im2col.cl
index e00e8f5..31f7db6 100644
--- a/src/im2col.cl
+++ b/src/im2col.cl
@@ -1,9 +1,9 @@
-__kernel void im2col_pad(__global float *im, int batch,
+__kernel void im2col_pad(__global float *im, int offset,
int channels, int height, int width,
int ksize, int stride, __global float *data_col)
{
- int c,h,w,b;
+ int c,h,w;
int height_col = 1 + (height-1) / stride;
int width_col = 1 + (width-1) / stride;
int channels_col = channels * ksize * ksize;
@@ -18,8 +18,6 @@
id /= height_col;
c = id % channels_col;
id /= channels_col;
- b = id % batch;
- id /= batch;
int col_size = height_col*width_col*channels_col;
int w_offset = c % ksize;
@@ -28,17 +26,17 @@
int im_row = h_offset + h * stride - pad;
int im_col = w_offset + w * stride - pad;
- int im_index = im_col + width*(im_row + height*(im_channel+batch*channels));
+ int im_index = offset + im_col + width*(im_row + height*im_channel);
float val = (im_row < 0 || im_col < 0 || im_row >= height || im_col >= width) ? 0 : im[im_index];
data_col[col_index] = val;
}
-__kernel void im2col_nopad(__global float *im, int batch,
+__kernel void im2col_nopad(__global float *im, int offset,
int channels, int height, int width,
int ksize, int stride, __global float *data_col)
{
- int c,h,w,b;
+ int c,h,w;
int height_col = (height - ksize) / stride + 1;
int width_col = (width - ksize) / stride + 1;
int channels_col = channels * ksize * ksize;
@@ -51,8 +49,6 @@
id /= height_col;
c = id % channels_col;
id /= channels_col;
- b = id % batch;
- id /= batch;
int col_size = height_col*width_col*channels_col;
int w_offset = c % ksize;
@@ -61,7 +57,7 @@
int im_row = h_offset + h * stride;
int im_col = w_offset + w * stride;
- int im_index = im_col + width*(im_row + height*(im_channel+batch*channels));
+ int im_index = offset + im_col + width*(im_row + height*im_channel);
float val = (im_row < 0 || im_col < 0 || im_row >= height || im_col >= width) ? 0 : im[im_index];
data_col[col_index] = val;
--
Gitblit v1.10.0