From 3d2d0a7c98dbc8923d9ff705b81ff4f7940ea6ff Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Tue, 10 Jul 2018 22:24:17 +0000
Subject: [PATCH] Merge pull request #1172 from sberan/flush-stdout
---
src/maxpool_layer.h | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/maxpool_layer.h b/src/maxpool_layer.h
index 89fb245..ce56dd8 100644
--- a/src/maxpool_layer.h
+++ b/src/maxpool_layer.h
@@ -3,31 +3,20 @@
#include "image.h"
#include "cuda.h"
+#include "layer.h"
+#include "network.h"
-typedef struct {
- int batch;
- int h,w,c;
- int stride;
- int size;
- int *indexes;
- float *delta;
- float *output;
- #ifdef GPU
- int *indexes_gpu;
- float *output_gpu;
- float *delta_gpu;
- #endif
-} maxpool_layer;
+typedef layer maxpool_layer;
-image get_maxpool_image(maxpool_layer layer);
-maxpool_layer *make_maxpool_layer(int batch, int h, int w, int c, int size, int stride);
-void resize_maxpool_layer(maxpool_layer *layer, int h, int w);
-void forward_maxpool_layer(const maxpool_layer layer, float *input);
-void backward_maxpool_layer(const maxpool_layer layer, float *delta);
+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 layer, float * input);
-void backward_maxpool_layer_gpu(maxpool_layer layer, float * delta);
+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