revert engine switch for build to always include caffe engine

diff --git a/Makefile b/Makefile
index 41793a9..546de93 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -257,12 +257,6 @@ else
        COMMON_FLAGS += -DNDEBUG -O2
 endif
 
-# Computation engine configuration (default is standard Caffe)
-ENGINE ?= caffe
-ifeq ($(ENGINE), caffe)
-       COMMON_FLAGS += -DCAFFE_ENGINE
-endif
-
 # CPU-only configuration
 ifeq ($(CPU_ONLY), 1)
        OBJS := $(PROTO_OBJS) $(CXX_OBJS)

diff --git a/Makefile.config.example b/Makefile.config.example
index 12c4447..7c96d8a 100644 (file)
--- a/Makefile.config.example
+++ b/Makefile.config.example
@@ -1,9 +1,6 @@
 ## Refer to http://caffe.berkeleyvision.org/installation.html
 # Contributions simplifying and improving our build system are welcome!
 
-# Computation engine switch: currently only the standard Caffe engine.
-ENGINE := caffe
-
 # CPU-only switch (uncomment to build without GPU support).
 # CPU_ONLY := 1
 

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index 587d920..24eff75 100644 (file)
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -15,9 +15,7 @@ ConvolutionLayer<Dtype>* GetConvolutionLayer(const string& name,
     const LayerParameter& param) {
   ConvolutionParameter_Engine engine = param.convolution_param().engine();
   if (engine == ConvolutionParameter_Engine_DEFAULT) {
-#ifdef CAFFE_ENGINE
     engine = ConvolutionParameter_Engine_CAFFE;
-#endif
   }
   if (engine == ConvolutionParameter_Engine_CAFFE) {
     return new CaffeConvolutionLayer<Dtype>(param);
@@ -37,9 +35,7 @@ PoolingLayer<Dtype>* GetPoolingLayer(const string& name,
     const LayerParameter& param) {
   PoolingParameter_Engine engine = param.pooling_param().engine();
   if (engine == PoolingParameter_Engine_DEFAULT) {
-#ifdef CAFFE_ENGINE
     engine = PoolingParameter_Engine_CAFFE;
-#endif
   }
   if (engine == PoolingParameter_Engine_CAFFE) {
     return new CaffePoolingLayer<Dtype>(param);
@@ -59,9 +55,7 @@ ReLULayer<Dtype>* GetReLULayer(const string& name,
     const LayerParameter& param) {
   ReLUParameter_Engine engine = param.relu_param().engine();
   if (engine == ReLUParameter_Engine_DEFAULT) {
-#ifdef CAFFE_ENGINE
     engine = ReLUParameter_Engine_CAFFE;
-#endif
   }
   if (engine == ReLUParameter_Engine_CAFFE) {
     return new CaffeReLULayer<Dtype>(param);
@@ -81,9 +75,7 @@ SigmoidLayer<Dtype>* GetSigmoidLayer(const string& name,
     const LayerParameter& param) {
   SigmoidParameter_Engine engine = param.sigmoid_param().engine();
   if (engine == SigmoidParameter_Engine_DEFAULT) {
-#ifdef CAFFE_ENGINE
     engine = SigmoidParameter_Engine_CAFFE;
-#endif
   }
   if (engine == SigmoidParameter_Engine_CAFFE) {
     return new CaffeSigmoidLayer<Dtype>(param);
@@ -103,9 +95,7 @@ TanHLayer<Dtype>* GetTanHLayer(const string& name,
     const LayerParameter& param) {
   TanHParameter_Engine engine = param.tanh_param().engine();
   if (engine == TanHParameter_Engine_DEFAULT) {
-#ifdef CAFFE_ENGINE
     engine = TanHParameter_Engine_CAFFE;
-#endif
   }
   if (engine == TanHParameter_Engine_CAFFE) {
     return new CaffeTanHLayer<Dtype>(param);
@@ -125,9 +115,7 @@ SoftmaxLayer<Dtype>* GetSoftmaxLayer(const string& name,
     const LayerParameter& param) {
   SoftmaxParameter_Engine engine = param.softmax_param().engine();
   if (engine == SoftmaxParameter_Engine_DEFAULT) {
-#ifdef CAFFE_ENGINE
     engine = SoftmaxParameter_Engine_CAFFE;
-#endif
   }
   if (engine == SoftmaxParameter_Engine_CAFFE) {
     return new CaffeSoftmaxLayer<Dtype>(param);