Merge pull request #2518 from nouiz/canopy_win

theano/gof/cmodule.py

@@ -1425,6 +1425,10 @@ def std_include_dirs():
 
 
 def std_lib_dirs_and_libs():
+    # We cache the results as on Windows, this trigger file access and
+    # this method is called many times.
+    if std_lib_dirs_and_libs.data is not None:
+        return std_lib_dirs_and_libs.data
     python_inc = distutils.sysconfig.get_python_inc()
     if sys.platform == 'win32':
         # Obtain the library name from the Python version instead of the
@@ -1452,25 +1456,39 @@ def std_lib_dirs_and_libs():
             #sys.base_prefix support only one case
             libdir = os.path.join(sys.prefix, 'libs')
 
-            for f, lib in [('libpython27.a', 'libpython 1.2'),
-                           ('libmsvcr90.a', 'mingw 4.5.2')]:
+            for f, lib in [('libpython27.a', 'libpython 1.2')]:
                 if not os.path.exists(os.path.join(libdir, f)):
                     print ("Your Python version is from Canopy. " +
                            "You need to install the package '" + lib +
                            "' from Canopy package manager."
                            )
+            libdirs = [
+                # Used in older Canopy
+                os.path.join(sys.prefix, 'libs'),
+                # Used in newer Canopy
+                os.path.join(sys.prefix,
+                             'EGG-INFO\mingw\usr\x86_64-w64-mingw32\lib')]
+            for f, lib in [('libmsvcr90.a',
+                            'mingw 4.5.2 or 4.8.1-2 (newer could work)')]:
+                if not any([os.path.exists(os.path.join(libdir, f))
+                            for libdir in libdirs]):
+                    print ("Your Python version is from Canopy. " +
+                           "You need to install the package '" + lib +
+                           "' from Canopy package manager."
+                           )
             python_lib_dirs.insert(0, libdir)
-
-        return [libname], python_lib_dirs
+        std_lib_dirs_and_libs.data = [libname], python_lib_dirs
 
     # Suppress -lpython2.x on OS X since the `-undefined dynamic_lookup`
     # makes it unnecessary.
     elif sys.platform == 'darwin':
-        return [], []
+        std_lib_dirs_and_libs.data = [], []
     else:
         # Typical include directory: /usr/include/python2.6
         libname = os.path.basename(python_inc)
-        return [libname], []
+        std_lib_dirs_and_libs.data = [libname], []
+    return std_lib_dirs_and_libs.data
+std_lib_dirs_and_libs.data = None
 
 
 def std_libs():