From 65e430588d76adbcf435db6b2e3aec791de651d0 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Sat, 26 May 2018 13:36:30 +0000
Subject: [PATCH] Merge pull request #909 from jing-vision/master
---
src/maxpool_layer.h | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/maxpool_layer.h b/src/maxpool_layer.h
index 04fb4b4..ce56dd8 100644
--- a/src/maxpool_layer.h
+++ b/src/maxpool_layer.h
@@ -2,17 +2,22 @@
#define MAXPOOL_LAYER_H
#include "image.h"
+#include "cuda.h"
+#include "layer.h"
+#include "network.h"
-typedef struct {
- int h,w,c;
- int stride;
- double *delta;
- double *output;
-} maxpool_layer;
+typedef layer maxpool_layer;
-image get_maxpool_image(maxpool_layer layer);
-maxpool_layer *make_maxpool_layer(int h, int w, int c, int stride);
-void forward_maxpool_layer(const maxpool_layer layer, double *in);
+image get_maxpool_image(maxpool_layer l);
+maxpool_layer make_maxpool_layer(int batch, int h, int w, int c, int size, int stride, int padding);
+void resize_maxpool_layer(maxpool_layer *l, int w, int h);
+void forward_maxpool_layer(const maxpool_layer l, network_state state);
+void backward_maxpool_layer(const maxpool_layer l, network_state state);
+
+#ifdef GPU
+void forward_maxpool_layer_gpu(maxpool_layer l, network_state state);
+void backward_maxpool_layer_gpu(maxpool_layer l, network_state state);
+#endif
#endif
--
Gitblit v1.10.0