From 8a504c737d2bc3b9b37cb79cb50fbf7eecda07df Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Wed, 27 Jun 2018 21:56:47 +0000
Subject: [PATCH] repair tabs spaces
---
src/maxpool_layer.c | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 159bd0a..41f7a79 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -4,53 +4,66 @@
image get_maxpool_image(maxpool_layer l)
{
- int h = (l.h-1)/l.stride + 1;
- int w = (l.w-1)/l.stride + 1;
+ int h = l.out_h;
+ int w = l.out_w;
int c = l.c;
return float_to_image(w,h,c,l.output);
}
image get_maxpool_delta(maxpool_layer l)
{
- int h = (l.h-1)/l.stride + 1;
- int w = (l.w-1)/l.stride + 1;
+ int h = l.out_h;
+ int w = l.out_w;
int c = l.c;
return float_to_image(w,h,c,l.delta);
}
-maxpool_layer make_maxpool_layer(int batch, int h, int w, int c, int size, int stride)
+maxpool_layer make_maxpool_layer(int batch, int h, int w, int c, int size, int stride, int padding)
{
- fprintf(stderr, "Maxpool Layer: %d x %d x %d image, %d size, %d stride\n", h,w,c,size,stride);
maxpool_layer l = {0};
l.type = MAXPOOL;
l.batch = batch;
l.h = h;
l.w = w;
l.c = c;
- l.out_h = (h-1)/stride + 1;
- l.out_w = (w-1)/stride + 1;
+ l.pad = padding;
+ l.out_w = (w + 2*padding)/stride;
+ l.out_h = (h + 2*padding)/stride;
l.out_c = c;
l.outputs = l.out_h * l.out_w * l.out_c;
- l.inputs = l.outputs;
+ l.inputs = h*w*c;
l.size = size;
l.stride = stride;
int output_size = l.out_h * l.out_w * l.out_c * batch;
l.indexes = calloc(output_size, sizeof(int));
l.output = calloc(output_size, sizeof(float));
l.delta = calloc(output_size, sizeof(float));
+ l.forward = forward_maxpool_layer;
+ l.backward = backward_maxpool_layer;
#ifdef GPU
+ l.forward_gpu = forward_maxpool_layer_gpu;
+ l.backward_gpu = backward_maxpool_layer_gpu;
l.indexes_gpu = cuda_make_int_array(output_size);
l.output_gpu = cuda_make_array(l.output, output_size);
l.delta_gpu = cuda_make_array(l.delta, output_size);
#endif
+ l.bflops = (l.size*l.size*l.c * l.out_h*l.out_w) / 1000000000.;
+ fprintf(stderr, "max %d x %d / %d %4d x%4d x%4d -> %4d x%4d x%4d %5.3f BF\n", size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c, l.bflops);
return l;
}
-void resize_maxpool_layer(maxpool_layer *l, int h, int w)
+void resize_maxpool_layer(maxpool_layer *l, int w, int h)
{
l->h = h;
l->w = w;
- int output_size = ((h-1)/l->stride+1) * ((w-1)/l->stride+1) * l->c * l->batch;
+ l->inputs = h*w*l->c;
+
+ l->out_w = (w + 2*l->pad)/l->stride;
+ l->out_h = (h + 2*l->pad)/l->stride;
+ l->outputs = l->out_w * l->out_h * l->c;
+ int output_size = l->outputs * l->batch;
+
+ l->indexes = realloc(l->indexes, output_size * sizeof(int));
l->output = realloc(l->output, output_size * sizeof(float));
l->delta = realloc(l->delta, output_size * sizeof(float));
@@ -60,18 +73,18 @@
cuda_free(l->delta_gpu);
l->indexes_gpu = cuda_make_int_array(output_size);
l->output_gpu = cuda_make_array(l->output, output_size);
- l->delta_gpu = cuda_make_array(l->delta, output_size);
+ l->delta_gpu = cuda_make_array(l->delta, output_size);
#endif
}
void forward_maxpool_layer(const maxpool_layer l, network_state state)
{
int b,i,j,k,m,n;
- int w_offset = (-l.size-1)/2 + 1;
- int h_offset = (-l.size-1)/2 + 1;
+ int w_offset = -l.pad;
+ int h_offset = -l.pad;
- int h = (l.h-1)/l.stride + 1;
- int w = (l.w-1)/l.stride + 1;
+ int h = l.out_h;
+ int w = l.out_w;
int c = l.c;
for(b = 0; b < l.batch; ++b){
@@ -104,10 +117,9 @@
void backward_maxpool_layer(const maxpool_layer l, network_state state)
{
int i;
- int h = (l.h-1)/l.stride + 1;
- int w = (l.w-1)/l.stride + 1;
+ int h = l.out_h;
+ int w = l.out_w;
int c = l.c;
- memset(state.delta, 0, l.batch*l.h*l.w*l.c*sizeof(float));
for(i = 0; i < h*w*c*l.batch; ++i){
int index = l.indexes[i];
state.delta[index] += l.delta[i];
--
Gitblit v1.10.0