From 076009ebe308fde0156304e701f36e8bb04e4d6b Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Jul 2014 17:14:59 +0000
Subject: [PATCH] Fixed batch stuff in conv layer
---
src/im2col.c | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/src/im2col.c b/src/im2col.c
index 899f73a..89748c9 100644
--- a/src/im2col.c
+++ b/src/im2col.c
@@ -1,32 +1,82 @@
#include "mini_blas.h"
+#include <stdio.h>
+
+inline float im2col_get_pixel(float *im, int height, int width, int channels,
+ int row, int col, int channel, int pad)
+{
+ row -= pad;
+ col -= pad;
+
+ if (row < 0 || col < 0 ||
+ row >= height || col >= width) return 0;
+ return im[col + width*(row + channel*height)];
+}
//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, float* data_col)
+ 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 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) {
- data_col[(c * height_col + h) * width_col + w] =
- data_im[(c_im * height + h * stride + h_offset) * width
- + w * stride + w_offset];
+ 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 + (batch-1) * c * height_col*width_col;
+ 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;
+ data_col+= channels_col;
+ }
+}
+
+//From Berkeley Vision's Caffe!
+//https://github.com/BVLC/caffe/blob/master/LICENSE
+void im2col_cpu(float* data_im,
+ const int channels, const int height, const int width,
+ const int ksize, const int stride, int pad, float* data_col)
+{
+ 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 channels_col = channels * ksize * ksize;
+ 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);
+ }
+ }
}
}
--
Gitblit v1.10.0