Merge pull request #6384 from notoraptor/fix-version

theano/gpuarray/__init__.py

@@ -20,7 +20,6 @@ pygpu_activated = False
 try:
     import pygpu
     import pygpu.gpuarray
-    import pygpu.version
 except ImportError:
     pygpu = None
 
@@ -42,23 +41,36 @@ def transfer(x, target):
 register_transfer(transfer)
 
 
+def pygpu_parse_version(version_string):
+    from collections import namedtuple
+    version_type = namedtuple('version_type', ('major', 'minor', 'patch', 'fullversion'))
+    pieces = version_string.split('.', 2)
+    assert len(pieces) == 3
+    major = int(pieces[0])
+    minor = int(pieces[1])
+    patch = int(pieces[2].split('+', 1)[0])
+    fullversion = '%d.%d.%s' % (major, minor, pieces[2])
+    return version_type(major=major, minor=minor, patch=patch, fullversion=fullversion)
+
+
 def init_dev(dev, name=None, preallocate=None):
     global pygpu_activated
     if not config.cxx:
         raise RuntimeError("The new gpu-backend need a c++ compiler.")
-    if (pygpu.version.major != 0 or pygpu.version.minor != 7 or
-            pygpu.version.patch < 0):
+    pygpu_version = pygpu_parse_version(pygpu.__version__)
+    if (pygpu_version.major != 0 or pygpu_version.minor != 7 or
+            pygpu_version.patch < 0):
         raise ValueError(
             "Your installed version of pygpu(%s) is too old, please upgrade to 0.7.0 or later" %
-            pygpu.version.fullversion)
+            pygpu_version.fullversion)
     # This is for the C headers API, we need to match the exact version.
     gpuarray_version_major_supported = 2
     gpuarray_version_major_detected = pygpu.gpuarray.api_version()[0]
     if gpuarray_version_major_detected != gpuarray_version_major_supported:
         raise ValueError(
-            "Your installed version oflibgpuarray is not in sync with the current Theano"
-            " version. The installed libgpuarray version support API version %d,"
-            " while current Theano support API version %d. Change the version of"
+            "Your installed version of libgpuarray is not in sync with the current Theano"
+            " version. The installed libgpuarray version supports API version %d,"
+            " while current Theano supports API version %d. Change the version of"
             " libgpuarray or Theano to fix this problem.",
             gpuarray_version_major_detected,
             gpuarray_version_major_supported)