From 1edcf73a73d2007afc61289245763f5cf0c29e10 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 04 Dec 2014 07:20:29 +0000
Subject: [PATCH] Detection good, split up col images
---
src/col2im.cl | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/col2im.cl b/src/col2im.cl
index 2ccf89e..617e818 100644
--- a/src/col2im.cl
+++ b/src/col2im.cl
@@ -1,4 +1,4 @@
-__kernel void col2im(__global float *data_col, int batch,
+__kernel void col2im(__global float *data_col, int offset,
int channels, int height, int width,
int ksize, int stride, int pad, __global float *data_im)
{
@@ -18,33 +18,26 @@
int h = id%height + pad;
id /= height;
int c = id%channels;
- id /= channels;
- int b = id%batch;
- //int w_start = (w<ksize)?0:(w-ksize)/stride + 1;
int w_start = (w-ksize+stride)/stride;
int w_end = w/stride + 1;
- //w_end = (width_col < w_end) ? width_col : w_end;
int h_start = (h-ksize+stride)/stride;
- //int h_start = (h-ksize)/stride+1;
int h_end = h/stride + 1;
- //h_end = (height_col < h_end) ? height_col : h_end;
int rows = channels * ksize * ksize;
int cols = height_col*width_col;
- int offset = (c*ksize*ksize + h * ksize + w)*height_col*width_col;
- offset += b*cols*rows;
+ int col_offset = (c*ksize*ksize + h * ksize + w)*height_col*width_col;
int h_coeff = (1-stride*ksize*height_col)*width_col;
int w_coeff = 1-stride*height_col*width_col;
float val = 0;
int h_col, w_col;
for(h_col = h_start; h_col < h_end; ++h_col){
for(w_col = w_start; w_col < w_end; ++w_col){
- int col_index = offset +h_col*h_coeff + w_col*w_coeff;
+ int col_index = col_offset +h_col*h_coeff + w_col*w_coeff;
float part = (w_col < 0 || h_col < 0 || h_col >= height_col || w_col >= width_col) ? 0 : data_col[col_index];
val += part;
}
}
- data_im[index] = val;
+ data_im[index+offset] = val;
}
--
Gitblit v1.10.0