Merge pull request #5682 from nouiz/dnn_enabled

doc/install_ubuntu.txt

@@ -30,7 +30,7 @@ For Ubuntu 16.04 with cuda 7.5
 
 .. code-block:: bash
 
-    sudo apt-get install python-numpy python-scipy python-dev python-pip python-nose g++ libopenblas-dev git
+    sudo apt-get install python-numpy python-scipy python-dev python-pip python-nose g++ libopenblas-dev git graphviz
     sudo pip install Theano
 
     # cuda 7.5 don't support the default g++ version. Install an supported version and make it the default.

doc/library/config.txt

@@ -692,6 +692,8 @@ import theano and print the config variable, as in:
 
     If ``'False'``, do not use cuDNN or check if it is available.
 
+    If ``'no_check'``, assume present and the version between header and library match (so less compilation at context init)",
+
 .. attribute:: config.conv.assert_shape
 
     If True, AbstractConv* ops will verify that user-provided

theano/compile/function_module.py

@@ -670,7 +670,7 @@ class Function(object):
             if name:
                 message = name
             else:
-                message = str(maker.profile.message) + " copy"
+                message = str(profile.message) + " copy"
             profile = theano.compile.profiling.ProfileStats(message=message)
             # profile -> object
         elif type(profile) == str:

theano/configdefaults.py

@@ -414,8 +414,9 @@ AddConfigVar('dnn.enabled',
              "'auto', use cuDNN if available, but silently fall back"
              " to not using it if not present."
              " If True and cuDNN can not be used, raise an error."
-             " If False, disable cudnn",
-             EnumStr("auto", "True", "False"),
+             " If False, disable cudnn even if present."
+             " If no_check, assume present and the version between header and library match (so less compilation at context init)",
+             EnumStr("auto", "True", "False", "no_check"),
              in_c_key=False)
 
 # This flag determines whether or not to raise error/warning message if

theano/gpuarray/dnn.py

@@ -152,7 +152,10 @@ def dnn_present():
         dnn_present.avail = False
         return False
 
-    dnn_present.avail, dnn_present.msg = _dnn_check_compile()
+    if config.dnn.enabled == "no_check":
+        dnn_present.avail, dnn_present.msg = True, "presence check disabled by dnn.enabled flag"
+    else:
+        dnn_present.avail, dnn_present.msg = _dnn_check_compile()
     if dnn_present.avail:
         dnn_present.avail, dnn_present.msg = _dnn_check_version()
         if not dnn_present.avail:

theano/sandbox/cuda/__init__.py

@@ -282,6 +282,8 @@ def dnn_available():
     if dnn_available.avail is None and not cuda_available:
         dnn_available.msg = "CUDA not available"
         dnn_available.avail = False
+    elif config.dnn.enabled == "no_check":
+        raise RuntimeException("The old gpu back-end do not support the flag dnn.enabled=no_check")
     elif dnn_available.avail is None:
         dev = active_device_number()
         if device_properties(dev)['major'] < 3: