From 6d65918d19e9e90a2231b048bfd7af9d8612ede3 Mon Sep 17 00:00:00 2001
From: Artyom Beilis <artyomtnk@yahoo.com>
Date: Tue, 20 Feb 2018 10:25:01 +0200
Subject: [PATCH 1/2] Fix failure to run on system without GPU in CPU mode

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

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index f14253a510e..9b75f1e9789 100644
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -50,7 +50,7 @@ shared_ptr<Layer<Dtype> > GetConvolutionLayer(
   if (engine == ConvolutionParameter_Engine_DEFAULT) {
     engine = ConvolutionParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if (!use_dilation) {
+    if (!use_dilation && Caffe::mode()==Caffe::GPU) {
       engine = ConvolutionParameter_Engine_CUDNN;
     }
 #endif
@@ -80,7 +80,9 @@ shared_ptr<Layer<Dtype> > GetPoolingLayer(const LayerParameter& param) {
   if (engine == PoolingParameter_Engine_DEFAULT) {
     engine = PoolingParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    engine = PoolingParameter_Engine_CUDNN;
+    if(Caffe::mode()==Caffe::GPU) {
+        engine = PoolingParameter_Engine_CUDNN;
+    }
 #endif
   }
   if (engine == PoolingParameter_Engine_CAFFE) {
@@ -118,7 +120,9 @@ shared_ptr<Layer<Dtype> > GetLRNLayer(const LayerParameter& param) {
 
   if (engine == LRNParameter_Engine_DEFAULT) {
 #ifdef USE_CUDNN
-    engine = LRNParameter_Engine_CUDNN;
+    if(Caffe::mode()==Caffe::GPU) {
+        engine = LRNParameter_Engine_CUDNN;
+    }
 #else
     engine = LRNParameter_Engine_CAFFE;
 #endif
@@ -156,7 +160,9 @@ shared_ptr<Layer<Dtype> > GetReLULayer(const LayerParameter& param) {
   if (engine == ReLUParameter_Engine_DEFAULT) {
     engine = ReLUParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    engine = ReLUParameter_Engine_CUDNN;
+    if(Caffe::mode()==Caffe::GPU) {
+        engine = ReLUParameter_Engine_CUDNN;
+    }
 #endif
   }
   if (engine == ReLUParameter_Engine_CAFFE) {
@@ -180,7 +186,9 @@ shared_ptr<Layer<Dtype> > GetSigmoidLayer(const LayerParameter& param) {
   if (engine == SigmoidParameter_Engine_DEFAULT) {
     engine = SigmoidParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    engine = SigmoidParameter_Engine_CUDNN;
+    if(Caffe::mode()==Caffe::GPU) {
+        engine = SigmoidParameter_Engine_CUDNN;
+    }
 #endif
   }
   if (engine == SigmoidParameter_Engine_CAFFE) {
@@ -204,7 +212,9 @@ shared_ptr<Layer<Dtype> > GetSoftmaxLayer(const LayerParameter& param) {
   if (engine == SoftmaxParameter_Engine_DEFAULT) {
     engine = SoftmaxParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    engine = SoftmaxParameter_Engine_CUDNN;
+    if(Caffe::mode()==Caffe::GPU) {
+        engine = SoftmaxParameter_Engine_CUDNN;
+    }
 #endif
   }
   if (engine == SoftmaxParameter_Engine_CAFFE) {
@@ -228,7 +238,9 @@ shared_ptr<Layer<Dtype> > GetTanHLayer(const LayerParameter& param) {
   if (engine == TanHParameter_Engine_DEFAULT) {
     engine = TanHParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    engine = TanHParameter_Engine_CUDNN;
+    if(Caffe::mode()==Caffe::GPU) {
+        engine = TanHParameter_Engine_CUDNN;
+    }
 #endif
   }
   if (engine == TanHParameter_Engine_CAFFE) {

From c006d1635b7b74041706903b1c84834af914b17e Mon Sep 17 00:00:00 2001
From: Artyom Beilis <artyomtnk@yahoo.com>
Date: Tue, 20 Feb 2018 11:16:22 +0200
Subject: [PATCH 2/2] Style fix

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

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index 9b75f1e9789..5f6d46a727c 100644
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -50,7 +50,7 @@ shared_ptr<Layer<Dtype> > GetConvolutionLayer(
   if (engine == ConvolutionParameter_Engine_DEFAULT) {
     engine = ConvolutionParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if (!use_dilation && Caffe::mode()==Caffe::GPU) {
+    if (!use_dilation && Caffe::mode() == Caffe::GPU) {
       engine = ConvolutionParameter_Engine_CUDNN;
     }
 #endif
@@ -80,7 +80,7 @@ shared_ptr<Layer<Dtype> > GetPoolingLayer(const LayerParameter& param) {
   if (engine == PoolingParameter_Engine_DEFAULT) {
     engine = PoolingParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if(Caffe::mode()==Caffe::GPU) {
+    if (Caffe::mode() == Caffe::GPU) {
         engine = PoolingParameter_Engine_CUDNN;
     }
 #endif
@@ -120,7 +120,7 @@ shared_ptr<Layer<Dtype> > GetLRNLayer(const LayerParameter& param) {
 
   if (engine == LRNParameter_Engine_DEFAULT) {
 #ifdef USE_CUDNN
-    if(Caffe::mode()==Caffe::GPU) {
+    if (Caffe::mode() == Caffe::GPU) {
         engine = LRNParameter_Engine_CUDNN;
     }
 #else
@@ -160,7 +160,7 @@ shared_ptr<Layer<Dtype> > GetReLULayer(const LayerParameter& param) {
   if (engine == ReLUParameter_Engine_DEFAULT) {
     engine = ReLUParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if(Caffe::mode()==Caffe::GPU) {
+    if (Caffe::mode() == Caffe::GPU) {
         engine = ReLUParameter_Engine_CUDNN;
     }
 #endif
@@ -186,7 +186,7 @@ shared_ptr<Layer<Dtype> > GetSigmoidLayer(const LayerParameter& param) {
   if (engine == SigmoidParameter_Engine_DEFAULT) {
     engine = SigmoidParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if(Caffe::mode()==Caffe::GPU) {
+    if (Caffe::mode() == Caffe::GPU) {
         engine = SigmoidParameter_Engine_CUDNN;
     }
 #endif
@@ -212,7 +212,7 @@ shared_ptr<Layer<Dtype> > GetSoftmaxLayer(const LayerParameter& param) {
   if (engine == SoftmaxParameter_Engine_DEFAULT) {
     engine = SoftmaxParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if(Caffe::mode()==Caffe::GPU) {
+    if (Caffe::mode() == Caffe::GPU) {
         engine = SoftmaxParameter_Engine_CUDNN;
     }
 #endif
@@ -238,7 +238,7 @@ shared_ptr<Layer<Dtype> > GetTanHLayer(const LayerParameter& param) {
   if (engine == TanHParameter_Engine_DEFAULT) {
     engine = TanHParameter_Engine_CAFFE;
 #ifdef USE_CUDNN
-    if(Caffe::mode()==Caffe::GPU) {
+    if (Caffe::mode() == Caffe::GPU) {
         engine = TanHParameter_Engine_CUDNN;
     }
 #endif