From 1d264dcb2bc25ad78f4331b2e9f642569ba1fa8f Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Thu, 28 Dec 2017 12:55:05 +0000
Subject: [PATCH] Merge pull request #328 from Adesun/EOL
---
src/col2im.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/col2im.c b/src/col2im.c
index fd7de4f..5c4605e 100644
--- a/src/col2im.c
+++ b/src/col2im.c
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <math.h>
-inline void col2im_add_pixel(float *im, int height, int width, int channels,
+void col2im_add_pixel(float *im, int height, int width, int channels,
int row, int col, int channel, int pad, float val)
{
row -= pad;
@@ -8,21 +8,17 @@
if (row < 0 || col < 0 ||
row >= height || col >= width) return;
- im[col + width*(row + channel*height)] += val;
+ im[col + width*(row + height*channel)] += val;
}
//This one might be too, can't remember.
void col2im_cpu(float* data_col,
- const int channels, const int height, const int width,
- const int ksize, const int stride, int pad, float* data_im)
+ int channels, int height, int width,
+ int ksize, int stride, int pad, float* data_im)
{
int c,h,w;
- int height_col = (height - ksize) / stride + 1;
- int width_col = (width - ksize) / stride + 1;
- if (pad){
- height_col = 1 + (height-1) / stride;
- width_col = 1 + (width-1) / stride;
- pad = ksize/2;
- }
+ int height_col = (height + 2*pad - ksize) / stride + 1;
+ int width_col = (width + 2*pad - ksize) / stride + 1;
+
int channels_col = channels * ksize * ksize;
for (c = 0; c < channels_col; ++c) {
int w_offset = c % ksize;
@@ -32,7 +28,8 @@
for (w = 0; w < width_col; ++w) {
int im_row = h_offset + h * stride;
int im_col = w_offset + w * stride;
- double val = data_col[(c * height_col + h) * width_col + w];
+ int col_index = (c * height_col + h) * width_col + w;
+ double val = data_col[col_index];
col2im_add_pixel(data_im, height, width, channels,
im_row, im_col, c_im, pad, val);
}
@@ -40,4 +37,3 @@
}
}
-
--
Gitblit v1.10.0