From cdd1cb0e8c4fda3671714bb5ad6ba1825cff16d1 Mon Sep 17 00:00:00 2001
From: Puneet Kohli <punkohl@gmail.com>
Date: Sun, 06 May 2018 21:45:26 +0000
Subject: [PATCH] Change matplotlib backend to 'agg' when 'show_plot' is false. This allows the script to be run from command line without any errors (for ex, on a remote machine)
---
src/maxpool_layer.h | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/maxpool_layer.h b/src/maxpool_layer.h
index cde8445..ce56dd8 100644
--- a/src/maxpool_layer.h
+++ b/src/maxpool_layer.h
@@ -2,21 +2,22 @@
#define MAXPOOL_LAYER_H
#include "image.h"
+#include "cuda.h"
+#include "layer.h"
+#include "network.h"
-typedef struct {
- int batch;
- int h,w,c;
- int stride;
- int size;
- float *delta;
- float *output;
-} 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, int c);
-void forward_maxpool_layer(const maxpool_layer layer, float *in);
-void backward_maxpool_layer(const maxpool_layer layer, float *in, 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 l, network_state state);
+void backward_maxpool_layer_gpu(maxpool_layer l, network_state state);
+#endif
#endif
--
Gitblit v1.10.0