From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi
---
src/col2im.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/col2im.c b/src/col2im.c
index bc15b7b..d63a1e0 100644
--- a/src/col2im.c
+++ b/src/col2im.c
@@ -1,4 +1,6 @@
-inline void col2im_set_pixel(float *im, int height, int width, int channels,
+#include <stdio.h>
+#include <math.h>
+void col2im_add_pixel(float *im, int height, int width, int channels,
int row, int col, int channel, int pad, float val)
{
row -= pad;
@@ -6,12 +8,12 @@
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;
@@ -30,12 +32,12 @@
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];
- col2im_set_pixel(data_im, height, width, channels,
+ 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);
}
}
}
}
-
--
Gitblit v1.10.0