From a723e1c62a27aeb39aaf7fcdeb3beb4e89fba32d Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 15 Aug 2018 20:52:09 +0000
Subject: [PATCH] Merge pull request #766 from HotChick91/AlexeyAB-mask
---
src/maxpool_layer.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 031d116..c543b52 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -27,8 +27,8 @@
l.w = w;
l.c = c;
l.pad = padding;
- l.out_w = (w + 2*padding)/stride;
- l.out_h = (h + 2*padding)/stride;
+ l.out_w = (w + padding - size) / stride + 1;
+ l.out_h = (h + padding - size) / stride + 1;
l.out_c = c;
l.outputs = l.out_h * l.out_w * l.out_c;
l.inputs = h*w*c;
@@ -47,7 +47,8 @@
l.output_gpu = cuda_make_array(l.output, output_size);
l.delta_gpu = cuda_make_array(l.delta, output_size);
#endif
- fprintf(stderr, "max %d x %d / %d %4d x%4d x%4d -> %4d x%4d x%4d\n", size, size, stride, w, h, c, l.out_w, l.out_h, l.out_c);
+ 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;
}
@@ -57,8 +58,8 @@
l->w = w;
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->out_w = (w + l->pad - l->size) / l->stride + 1;
+ l->out_h = (h + l->pad - l->size) / l->stride + 1;
l->outputs = l->out_w * l->out_h * l->c;
int output_size = l->outputs * l->batch;
@@ -79,8 +80,8 @@
void forward_maxpool_layer(const maxpool_layer l, network_state state)
{
int b,i,j,k,m,n;
- int w_offset = -l.pad;
- int h_offset = -l.pad;
+ int w_offset = -l.pad / 2;
+ int h_offset = -l.pad / 2;
int h = l.out_h;
int w = l.out_w;
--
Gitblit v1.10.0