Fixing up maxpool layer

This commit is contained in:
Joseph Redmon
2014-10-16 15:17:23 -07:00
parent 7756cccb79
commit 9b3c7136f3
8 changed files with 173 additions and 71 deletions

View File

@ -27,7 +27,7 @@ maxpool_layer *make_maxpool_layer(int batch, int h, int w, int c, int size, int
layer->c = c;
layer->size = size;
layer->stride = stride;
layer->max_indexes = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(int));
layer->indexes = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(int));
layer->output = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(float));
layer->delta = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c*batch, sizeof(float));
return layer;
@ -44,36 +44,35 @@ void resize_maxpool_layer(maxpool_layer *layer, int h, int w, int c)
void forward_maxpool_layer(const maxpool_layer layer, float *input)
{
int b;
int b,i,j,k,l,m;
int w_offset = (-layer.size-1)/2 + 1;
int h_offset = (-layer.size-1)/2 + 1;
int h = (layer.h-1)/layer.stride + 1;
int w = (layer.w-1)/layer.stride + 1;
int c = layer.c;
for(b = 0; b < layer.batch; ++b){
int h = (layer.h-1)/layer.stride + 1;
int w = (layer.w-1)/layer.stride + 1;
int c = layer.c;
int i,j,k,l,m;
for(k = 0; k < layer.c; ++k){
for(i = 0; i < layer.h; i += layer.stride){
for(j = 0; j < layer.w; j += layer.stride){
int out_index = j/layer.stride + w*(i/layer.stride + h*(k + c*b));
layer.output[out_index] = -FLT_MAX;
int lower = (-layer.size-1)/2 + 1;
int upper = layer.size/2 + 1;
int lh = (i+lower < 0) ? 0 : i+lower;
int uh = (i+upper > layer.h) ? layer.h : i+upper;
int lw = (j+lower < 0) ? 0 : j+lower;
int uw = (j+upper > layer.w) ? layer.w : j+upper;
for(l = lh; l < uh; ++l){
for(m = lw; m < uw; ++m){
//printf("%d %d\n", l, m);
int index = m + layer.w*(l + layer.h*(k + b*layer.c));
if(input[index] > layer.output[out_index]){
layer.output[out_index] = input[index];
layer.max_indexes[out_index] = index;
}
for(k = 0; k < c; ++k){
for(i = 0; i < h; ++i){
for(j = 0; j < w; ++j){
int out_index = j + w*(i + h*(k + c*b));
float max = -FLT_MAX;
int max_i = -1;
for(l = 0; l < layer.size; ++l){
for(m = 0; m < layer.size; ++m){
int cur_h = h_offset + i*layer.stride + l;
int cur_w = w_offset + j*layer.stride + m;
int index = cur_w + layer.w*(cur_h + layer.h*(k + b*layer.c));
int valid = (cur_h >= 0 && cur_h < layer.h &&
cur_w >= 0 && cur_w < layer.w);
float val = (valid != 0) ? input[index] : -INFINITY;
max_i = (val > max) ? index : max_i;
max = (val > max) ? val : max;
}
}
layer.output[out_index] = max;
layer.indexes[out_index] = max_i;
}
}
}
@ -88,7 +87,7 @@ void backward_maxpool_layer(const maxpool_layer layer, float *input, float *delt
int c = layer.c;
memset(delta, 0, layer.batch*layer.h*layer.w*layer.c*sizeof(float));
for(i = 0; i < h*w*c*layer.batch; ++i){
int index = layer.max_indexes[i];
int index = layer.indexes[i];
delta[index] += layer.delta[i];
}
}