Merge pull request #6371 from notoraptor/win-fix-mkl-linking

theano/configdefaults.py

@@ -1359,7 +1359,7 @@ def default_blas_ldflags():
         else:
             # This branch is executed if no exception was raised
             if sys.platform == "win32":
-                lib_path = [os.path.join(sys.prefix, 'Library', 'bin')]
+                lib_path = os.path.join(sys.prefix, 'Library', 'bin')
                 flags = ['-L"%s"' % lib_path]
             else:
                 lib_path = blas_info.get('library_dirs', [])

theano/gpuarray/tests/test_dnn.py

@@ -2698,6 +2698,8 @@ class TestDnnConv3DRuntimeAlgorithms(TestDnnConv2DRuntimeAlgorithms):
 
 
 def test_conv_guess_once_with_dtypes():
+    # This test checks that runtime conv algorithm selection does not raise any exception
+    # when consecutive functions with different dtypes and precisions are executed.
     utt.seed_rng()
     inputs_shape = (2, 3, 5, 5)
     filters_shape = (2, 3, 40, 4)
@@ -2719,7 +2721,11 @@ def test_conv_guess_once_with_dtypes():
     f_float_config = get_function('float32', 'float32')
     f_double_config = get_function('float64', 'float64')
     # Let's just see if everything runs without raising any exception.
-    f_true_half_config()
+    try:
+        f_true_half_config()
+    except RuntimeError as e:
+        # float16 precision is not supported on all GPU cards.
+        assert 'CUDNN_STATUS_ARCH_MISMATCH' in e.message
     f_pseudo_half_config()
     f_float_config()
     f_double_config()