From 3724101655bf79b73e0bf8fcd801ac9c82d6d3c5 Mon Sep 17 00:00:00 2001
From: thatguymike <mike.houston@gmail.com>
Date: Tue, 19 Jan 2016 15:58:44 -0800
Subject: [PATCH] Cleaner workaround for max pool

---
 src/caffe/layer_factory.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index 2237175daa8..33b128f4e7d 100644
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -79,13 +79,14 @@ shared_ptr<Layer<Dtype> > GetPoolingLayer(const LayerParameter& param) {
   } else if (engine == PoolingParameter_Engine_CUDNN) {
     PoolingParameter p_param = param.pooling_param();
 
-// FIXME We assume that precision issue will be fixed in cuDNN v5.0
-#if CUDNN_VERSION >= 5000
-    return shared_ptr<Layer<Dtype> >(new CuDNNPoolingLayer<Dtype>(param));
-#else
-    return shared_ptr<Layer<Dtype> >(new PoolingLayer<Dtype>(param));
-#endif
-
+// CuDNN handles tie breaks differently than Caffe for MaxPooling.
+// Until there is a workaround in Caffe (index management) or cuDNN,
+// use Caffe layer to max pooling
+    if (param.pooling_param().pool() == PoolingParameter_PoolMethod_MAX) {
+        return shared_ptr<Layer<Dtype> >(new PoolingLayer<Dtype>(param));
+    } else {
+        return shared_ptr<Layer<Dtype> >(new CuDNNPoolingLayer<Dtype>(param));
+    }
 #endif
   } else {
     LOG(FATAL) << "Layer " << param.name() << " has unknown engine.";