mirror of
https://github.com/pjreddie/darknet.git
synced 2023-08-10 21:13:14 +03:00
Added batch to col2im, padding option
This commit is contained in:
@ -19,7 +19,6 @@ image get_maxpool_delta(maxpool_layer layer)
|
||||
|
||||
maxpool_layer *make_maxpool_layer(int batch, int h, int w, int c, int stride)
|
||||
{
|
||||
c = c*batch;
|
||||
fprintf(stderr, "Maxpool Layer: %d x %d x %d image, %d stride\n", h,w,c,stride);
|
||||
maxpool_layer *layer = calloc(1, sizeof(maxpool_layer));
|
||||
layer->batch = batch;
|
||||
@ -27,8 +26,8 @@ maxpool_layer *make_maxpool_layer(int batch, int h, int w, int c, int stride)
|
||||
layer->w = w;
|
||||
layer->c = c;
|
||||
layer->stride = stride;
|
||||
layer->output = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c, sizeof(float));
|
||||
layer->delta = calloc(((h-1)/stride+1) * ((w-1)/stride+1) * c, sizeof(float));
|
||||
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;
|
||||
}
|
||||
|
||||
@ -37,22 +36,30 @@ void resize_maxpool_layer(maxpool_layer *layer, int h, int w, int c)
|
||||
layer->h = h;
|
||||
layer->w = w;
|
||||
layer->c = c;
|
||||
layer->output = realloc(layer->output, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * sizeof(float));
|
||||
layer->delta = realloc(layer->delta, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * sizeof(float));
|
||||
layer->output = realloc(layer->output, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * layer->batch* sizeof(float));
|
||||
layer->delta = realloc(layer->delta, ((h-1)/layer->stride+1) * ((w-1)/layer->stride+1) * c * layer->batch*sizeof(float));
|
||||
}
|
||||
|
||||
void forward_maxpool_layer(const maxpool_layer layer, float *in)
|
||||
{
|
||||
image input = float_to_image(layer.h, layer.w, layer.c, in);
|
||||
image output = get_maxpool_image(layer);
|
||||
int i,j,k;
|
||||
for(i = 0; i < output.h*output.w*output.c; ++i) output.data[i] = -DBL_MAX;
|
||||
for(k = 0; k < input.c; ++k){
|
||||
for(i = 0; i < input.h; ++i){
|
||||
for(j = 0; j < input.w; ++j){
|
||||
float val = get_pixel(input, i, j, k);
|
||||
float cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
|
||||
if(val > cur) set_pixel(output, i/layer.stride, j/layer.stride, k, val);
|
||||
int b;
|
||||
for(b = 0; b < layer.batch; ++b){
|
||||
image input = float_to_image(layer.h, layer.w, layer.c, in+b*layer.h*layer.w*layer.c);
|
||||
|
||||
int h = (layer.h-1)/layer.stride + 1;
|
||||
int w = (layer.w-1)/layer.stride + 1;
|
||||
int c = layer.c;
|
||||
image output = float_to_image(h,w,c,layer.output+b*h*w*c);
|
||||
|
||||
int i,j,k;
|
||||
for(i = 0; i < output.h*output.w*output.c; ++i) output.data[i] = -DBL_MAX;
|
||||
for(k = 0; k < input.c; ++k){
|
||||
for(i = 0; i < input.h; ++i){
|
||||
for(j = 0; j < input.w; ++j){
|
||||
float val = get_pixel(input, i, j, k);
|
||||
float cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
|
||||
if(val > cur) set_pixel(output, i/layer.stride, j/layer.stride, k, val);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -60,21 +67,28 @@ void forward_maxpool_layer(const maxpool_layer layer, float *in)
|
||||
|
||||
void backward_maxpool_layer(const maxpool_layer layer, float *in, float *delta)
|
||||
{
|
||||
image input = float_to_image(layer.h, layer.w, layer.c, in);
|
||||
image input_delta = float_to_image(layer.h, layer.w, layer.c, delta);
|
||||
image output_delta = get_maxpool_delta(layer);
|
||||
image output = get_maxpool_image(layer);
|
||||
int i,j,k;
|
||||
for(k = 0; k < input.c; ++k){
|
||||
for(i = 0; i < input.h; ++i){
|
||||
for(j = 0; j < input.w; ++j){
|
||||
float val = get_pixel(input, i, j, k);
|
||||
float cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
|
||||
float d = get_pixel(output_delta, i/layer.stride, j/layer.stride, k);
|
||||
if(val == cur) {
|
||||
set_pixel(input_delta, i, j, k, d);
|
||||
int b;
|
||||
for(b = 0; b < layer.batch; ++b){
|
||||
image input = float_to_image(layer.h, layer.w, layer.c, in+b*layer.h*layer.w*layer.c);
|
||||
image input_delta = float_to_image(layer.h, layer.w, layer.c, delta+b*layer.h*layer.w*layer.c);
|
||||
int h = (layer.h-1)/layer.stride + 1;
|
||||
int w = (layer.w-1)/layer.stride + 1;
|
||||
int c = layer.c;
|
||||
image output = float_to_image(h,w,c,layer.output+b*h*w*c);
|
||||
image output_delta = float_to_image(h,w,c,layer.delta+b*h*w*c);
|
||||
|
||||
int i,j,k;
|
||||
for(k = 0; k < input.c; ++k){
|
||||
for(i = 0; i < input.h; ++i){
|
||||
for(j = 0; j < input.w; ++j){
|
||||
float val = get_pixel(input, i, j, k);
|
||||
float cur = get_pixel(output, i/layer.stride, j/layer.stride, k);
|
||||
float d = get_pixel(output_delta, i/layer.stride, j/layer.stride, k);
|
||||
if(val == cur) {
|
||||
set_pixel(input_delta, i, j, k, d);
|
||||
}
|
||||
else set_pixel(input_delta, i, j, k, 0);
|
||||
}
|
||||
else set_pixel(input_delta, i, j, k, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user