From 8436251a05ec0cfa906089ee022db17498e6f65f Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 21 Aug 2018 17:44:18 +0000
Subject: [PATCH] maxpool_layer on CPU uses AVX2 and OpenMP
---
src/maxpool_layer.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 0eeb467..5ff7e9d 100644
--- a/src/maxpool_layer.c
+++ b/src/maxpool_layer.c
@@ -1,5 +1,6 @@
#include "maxpool_layer.h"
#include "cuda.h"
+#include "gemm.h"
#include <stdio.h>
image get_maxpool_image(maxpool_layer l)
@@ -27,8 +28,8 @@
l.w = w;
l.c = c;
l.pad = padding;
- l.out_w = (w + 2 * padding - size) / stride + 1;
- l.out_h = (h + 2 * padding - size) / stride + 1;
+ 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;
@@ -58,8 +59,8 @@
l->w = w;
l->inputs = h*w*l->c;
- l->out_w = (w + 2 * l->pad - l->size) / l->stride + 1;
- l->out_h = (h + 2 * l->pad - l->size) / l->stride + 1;
+ 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,9 +80,14 @@
void forward_maxpool_layer(const maxpool_layer l, network_state state)
{
+ if (!state.train) {
+ forward_maxpool_layer_avx(state.input, l.output, l.indexes, l.size, l.w, l.h, l.out_w, l.out_h, l.c, l.pad, l.stride, l.batch);
+ return;
+ }
+
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