Fixing CUDNN options

Author: borisfom

.travis.yml

@@ -8,6 +8,9 @@ env:
     - WITH_CUDA=true WITH_CMAKE=true WITH_IO=true
     - WITH_CUDA=false WITH_CMAKE=false WITH_IO=false
     - WITH_CUDA=false WITH_CMAKE=true WITH_IO=false PYTHON_VERSION=3
+#  Currently there is no way to install cudnn via apt-get. Uncomment wjen it's available.
+#    - WITH_CUDA=true WITH_CMAKE=false WITH_IO=true WITH_CUDNN=true
+#    - WITH_CUDA=true WITH_CMAKE=true WITH_IO=true WITH_CUDNN=true
 
 language: cpp
 

3rdparty/cnmem/build/Makefile

@@ -7,6 +7,19 @@ $(error $(CONFIG_FILE) not found. See $(CONFIG_FILE).example.)
 endif
 include $(CONFIG_FILE)
 
+# Rectify input parameters
+ifeq ($(CPU_ONLY),1)
+  USE_CUDNN=0
+  USE_CNMEM=0
+endif
+
+ifeq ($(USE_CUDNN),1)
+# CNMEM is ON by default in CUDNN is ON
+  ifeq ($(USE_CNMEM),)
+    USE_CNMEM=1
+  endif
+endif
+
 PROJECT_DIR=$(PWD)
 
 BUILD_DIR_LINK := $(BUILD_DIR)

Makefile

@@ -3,7 +3,8 @@
 
 # cuDNN acceleration switch (uncomment to build with cuDNN).
 # USE_CUDNN := 1
-# CNMeM memory pool switch (github.com/NVIDIA/cnmem required)
+
+# CNMeM memory pool switch (experimental, may go away)
 # USE_CNMEM := 1
 
 # CPU-only switch (uncomment to build without GPU support).

Makefile.config.example

@@ -12,6 +12,11 @@ if $WITH_CMAKE; then
   if ! $WITH_CUDA; then
     CPU_ONLY=" -DCPU_ONLY=OFF"
   fi
+
+  if $WITH_CUDNN; then
+    CUDNN_ARGS=" -DUSE_CUDNN=ON "
+  fi
+
   PYTHON_ARGS=""
   if [ "$PYTHON_VERSION" = "3" ]; then
     PYTHON_ARGS="$PYTHON_ARGS -Dpython_version=3 -DBOOST_LIBRARYDIR=$CONDA_DIR/lib/"
@@ -21,7 +26,7 @@ if $WITH_CMAKE; then
   else
     IO_ARGS="-DUSE_OPENCV=OFF -DUSE_LMDB=OFF -DUSE_LEVELDB=OFF"
   fi
-  cmake -DBUILD_python=ON -DCMAKE_BUILD_TYPE=Release $CPU_ONLY $PYTHON_ARGS -DCMAKE_INCLUDE_PATH="$CONDA_DIR/include/" -DCMAKE_LIBRARY_PATH="$CONDA_DIR/lib/" $IO_ARGS ..
+  cmake -DBUILD_python=ON -DCMAKE_BUILD_TYPE=Release $CPU_ONLY $CUDNN_ARGS $PYTHON_ARGS -DCMAKE_INCLUDE_PATH="$CONDA_DIR/include/" -DCMAKE_LIBRARY_PATH="$CONDA_DIR/lib/" $IO_ARGS ..
   $MAKE
   $MAKE pytest
   if ! $WITH_CUDA; then