Merge pull request #4773 from ruslanagit/master

theano/configdefaults.py

@@ -439,6 +439,9 @@ if param != "":
     del newp
     del distutils
 
+# to support path that includes spaces, we need to wrap it with double quotes on Windows
+if param and os.name == 'nt':
+    param = '"%s"' % param
 AddConfigVar('cxx',
              "The C++ compiler to use. Currently only g++ is"
              " supported, but supporting additional compilers should not be "
@@ -1177,7 +1180,7 @@ def default_blas_ldflags():
             use_unix_epd = True
             if sys.platform == 'win32':
                 return ' '.join(
-                    ['-L%s' % os.path.join(sys.prefix, "Scripts")] +
+                    ['-L"%s"' % os.path.join(sys.prefix, "Scripts")] +
                     # Why on Windows, the library used are not the
                     # same as what is in
                     # blas_info['libraries']?
@@ -1247,7 +1250,7 @@ def default_blas_ldflags():
                     ['-l%s' % l for l in blas_info['libraries']])
             elif sys.platform == 'win32':
                 return ' '.join(
-                    ['-L%s' % lib_path] +
+                    ['-L"%s"' % lib_path] +
                     # Why on Windows, the library used are not the
                     # same as what is in blas_info['libraries']?
                     ['-l%s' % l for l in ["mk2_core", "mk2_intel_thread",
@@ -1268,7 +1271,7 @@ def default_blas_ldflags():
             else:
                 # This branch is executed if no exception was raised
                 lib_path = os.path.join(sys.prefix, 'DLLs')
-                flags = ['-L%s' % lib_path]
+                flags = ['-L"%s"' % lib_path]
                 flags += ['-l%s' % l for l in ["mkl_core",
                                                "mkl_intel_thread",
                                                "mkl_rt"]]
@@ -1276,13 +1279,15 @@ def default_blas_ldflags():
                 if res:
                     return res
 
+        # to support path that includes spaces, we need to wrap it with double quotes on Windows
+        path_wrapper = "\"" if os.name == 'nt' else ""
         ret = (
             # TODO: the Gemm op below should separate the
             # -L and -l arguments into the two callbacks
             # that CLinker uses for that stuff.  for now,
             # we just pass the whole ldflags as the -l
             # options part.
-            ['-L%s' % l for l in blas_info.get('library_dirs', [])] +
+            ['-L%s%s%s' % (path_wrapper, l, path_wrapper) for l in blas_info.get('library_dirs', [])] +
             ['-l%s' % l for l in blas_info.get('libraries', [])] +
             blas_info.get('extra_link_args', []))
         # For some very strange reason, we need to specify -lm twice
@@ -1343,7 +1348,11 @@ def try_blas_flag(flags):
             return 0;
         }
         """)
-    cflags = flags + ['-L' + d for d in theano.gof.cmodule.std_lib_dirs()]
+    cflags = flags
+    # to support path that includes spaces, we need to wrap it with double quotes on Windows
+    path_wrapper = "\"" if os.name == 'nt' else ""
+    cflags.extend(['-L%s%s%s' % (path_wrapper, d, path_wrapper) for d in theano.gof.cmodule.std_lib_dirs()])
+
     res = GCC_compiler.try_compile_tmp(
         test_code, tmp_prefix='try_blas_',
         flags=cflags, try_run=True)

theano/gof/cmodule.py

@@ -2251,7 +2251,10 @@ class GCC_compiler(Compiler):
             cmd.extend(p for p in preargs if not p.startswith('-O'))
         else:
             cmd.extend(preargs)
-        cmd.extend('-I%s' % idir for idir in include_dirs)
+        # to support path that includes spaces, we need to wrap it with double quotes on Windows
+        path_wrapper = "\"" if os.name == 'nt' else ""
+        cmd.extend(['-I%s%s%s' % (path_wrapper, idir, path_wrapper) for idir in include_dirs])
+        cmd.extend(['-L%s%s%s' % (path_wrapper, ldir, path_wrapper) for ldir in lib_dirs])
         if hide_symbols and sys.platform != 'win32':
             # This has been available since gcc 4.0 so we suppose it
             # is always available. We pass it here since it
@@ -2262,7 +2265,6 @@ class GCC_compiler(Compiler):
             cmd.append('-fvisibility=hidden')
         cmd.extend(['-o', lib_filename])
         cmd.append(cppfilename)
-        cmd.extend(['-L%s' % ldir for ldir in lib_dirs])
         cmd.extend(['-l%s' % l for l in libs])
         # print >> sys.stderr, 'COMPILING W CMD', cmd
         _logger.debug('Running cmd: %s', ' '.join(cmd))

theano/misc/windows.py

@@ -24,6 +24,12 @@ def subprocess_Popen(command, **params):
         # execute "g++" without extensions.
         # (Executing "g++.bat" explicitly would also work.)
         params['shell'] = True
+        # "If shell is True, it is recommended to pass args as a string rather than as a sequence." (cite taken from https://docs.python.org/2/library/subprocess.html#frequently-used-arguments)
+        # In case when command arguments have spaces, passing a command as a list will result in incorrect arguments break down, and consequently
+        # in "The filename, directory name, or volume label syntax is incorrect" error message.
+        # Passing the command as a single string solves this problem.
+        if isinstance(command, list):
+            command = ' '.join(command)
 
     # Using the dummy file descriptors below is a workaround for a
     # crash experienced in an unusual Python 2.4.4 Windows environment

theano/sandbox/cuda/__init__.py

@@ -299,11 +299,14 @@ def dnn_available():
                   return 1;
                 }
                 """)
-            params = ["-l", "cudnn", "-I" + os.path.dirname(__file__)]
+            # to support path that includes spaces, we need to wrap it with double quotes on Windows
+            path_wrapper = "\"" if os.name =='nt' else ""
+            params = ["-l", "cudnn"]
+            params.extend(['-I%s%s%s' % (path_wrapper, os.path.dirname(__file__), path_wrapper)])
             if config.dnn.include_path:
-                params.append("-I" + config.dnn.include_path)
+                params.extend(['-I%s%s%s' % (path_wrapper, config.dnn.include_path, path_wrapper)])
             if config.dnn.library_path:
-                params.append("-L" + config.dnn.library_path)
+                params.extend(['-L%s%s%s' % (path_wrapper, config.dnn.library_path, path_wrapper)])
             if config.nvcc.compiler_bindir:
                 params.extend(['--compiler-bindir',
                                config.nvcc.compiler_bindir])

theano/sandbox/cuda/nvcc_compiler.py

@@ -321,10 +321,12 @@ class NVCC_compiler(Compiler):
             # the -rpath option is not understood by the Microsoft linker
             for rpath in rpaths:
                 cmd.extend(['-Xlinker', ','.join(['-rpath', rpath])])
-        cmd.extend('-I%s' % idir for idir in include_dirs)
+        # to support path that includes spaces, we need to wrap it with double quotes on Windows
+        path_wrapper = "\"" if os.name == 'nt' else ""
+        cmd.extend(['-I%s%s%s' % (path_wrapper, idir, path_wrapper) for idir in include_dirs])
+        cmd.extend(['-L%s%s%s' % (path_wrapper, ldir, path_wrapper) for ldir in lib_dirs])
         cmd.extend(['-o', lib_filename])
         cmd.append(os.path.split(cppfilename)[-1])
-        cmd.extend(['-L%s' % ldir for ldir in lib_dirs])
         cmd.extend(['-l%s' % l for l in libs])
         if sys.platform == 'darwin':
             # This tells the compiler to use the already-loaded python