Modified the way the version of lazylinker is checked to avoid problems under Windows.

theano/gof/lazylinker_c.py

@@ -11,14 +11,12 @@ if config.compiledir not in sys.path:
     sys.path.append(config.compiledir)
 
 version = 0.1 # must match constant returned in function get_version()
+
+need_reload = False
 try:
     import lazylinker_ext
-    try:
-        import lazylinker_ext.lazylinker_ext
-        get_version = lazylinker_ext.lazylinker_ext.get_version
-    except:
-        get_version = lambda: None
-    if version != get_version():
+    need_reload = True
+    if version != getattr(lazylinker_ext, '_version', None):
         raise ImportError()
 except ImportError:
     get_lock()
@@ -26,13 +24,14 @@ except ImportError:
         # Maybe someone else already finished compiling it while we were
         # waiting for the lock?
         try:
+            if need_reload:
+                # The module was successfully imported earlier: we need to
+                # reload it to check if the version was updated.
+                reload(lazylinker_ext)
+            else:
                 import lazylinker_ext
-            try:
-                import lazylinker_ext.lazylinker_ext
-                get_version = lazylinker_ext.lazylinker_ext.get_version
-            except:
-                get_version = lambda: None
-            if version != get_version():
+                need_reload = True
+            if version != getattr(lazylinker_ext, '_version', None):
                 raise ImportError()
         except ImportError:
             print "COMPILING NEW CVM"
@@ -43,7 +42,21 @@ except ImportError:
             if not os.path.exists(loc):
                 os.mkdir(loc)
             cmodule.gcc_module_compile_str(dirname, code, location=loc)
-            print "NEW VERSION", lazylinker_ext.lazylinker_ext.get_version()
+            # Save version into the __init__.py file.
+            init_py = os.path.join(loc, '__init__.py')
+            open(init_py, 'w').write('_version = %s\n' % version)
+            # If we just compiled the module for the first time, then it was
+            # imported at the same time: we need to make sure we do not
+            # reload the now outdated __init__.pyc below.
+            init_pyc = os.path.join(loc, '__init__.pyc')
+            if os.path.isfile(init_pyc):
+                os.remove(init_pyc)
+            import lazylinker_ext
+            reload(lazylinker_ext)
+            from lazylinker_ext import lazylinker_ext as lazy_c
+            assert (lazylinker_ext._version ==
+                    lazy_c.get_version())
+            print "NEW VERSION", lazylinker_ext._version
     finally:
         # Release lock on compilation directory.
         release_lock()