From 7add11150954879dae4daad4e4da549b4b13bca6 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sat, 09 Aug 2014 15:16:37 +0000
Subject: [PATCH] maxpool fixed, good on mnist
---
src/im2col.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/im2col.c b/src/im2col.c
index 304bee7..6ed9d89 100644
--- a/src/im2col.c
+++ b/src/im2col.c
@@ -14,7 +14,7 @@
//From Berkeley Vision's Caffe!
//https://github.com/BVLC/caffe/blob/master/LICENSE
-void im2col_cpu(float* data_im,
+void im2col_cpu_batch(float* data_im,
const int batch, const int channels, const int height, const int width,
const int ksize, const int stride, int pad, float* data_col)
{
@@ -49,6 +49,43 @@
}
}
+//From Berkeley Vision's Caffe!
+//https://github.com/BVLC/caffe/blob/master/LICENSE
+void im2col_cpu(float* data_im, const int batch,
+ const int channels, const int height, const int width,
+ const int ksize, const int stride, int pad, float* data_col)
+{
+ int c,h,w,b;
+ 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 channels_col = channels * ksize * ksize;
+ int im_size = height*width*channels;
+ int col_size = height_col*width_col*channels_col;
+ for (b = 0; b < batch; ++b) {
+ for (c = 0; c < channels_col; ++c) {
+ int w_offset = c % ksize;
+ int h_offset = (c / ksize) % ksize;
+ int c_im = c / ksize / ksize;
+ for (h = 0; h < height_col; ++h) {
+ for (w = 0; w < width_col; ++w) {
+ int im_row = h_offset + h * stride;
+ int im_col = w_offset + w * stride;
+ int col_index = (c * height_col + h) * width_col + w;
+ data_col[col_index] = im2col_get_pixel(data_im, height, width, channels,
+ im_row, im_col, c_im, pad);
+ }
+ }
+ }
+ data_im += im_size;
+ data_col += col_size;
+ }
+}
+
#ifdef GPU
--
Gitblit v1.10.0