From bb48b9c992e2f48bff2432a0387681cad0c98dec Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 23 Aug 2018 00:00:48 +0000
Subject: [PATCH] Merge branch 'master' of github.com:AlexeyAB/darknet
---
src/maxpool_layer.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/maxpool_layer.c b/src/maxpool_layer.c
index 928102f..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)
@@ -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 / l.stride;
- int h_offset = -l.pad / l.stride;
+ 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