Changeset b9c432ac in sasview for src/sas/sasgui/perspectives/fitting/gpu_options.py

Timestamp:

Mar 30, 2019 12:31:38 AM (5 years ago)

Author:

wojciech

Branches:

master

Children:

4ecf91a

Parents:

104613f (diff), 332c10d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview into ticket-1267

File:

• src/sas/sasgui/perspectives/fitting/gpu_options.py (modified) (2 diffs)

src/sas/sasgui/perspectives/fitting/gpu_options.py

@@ -257 +257 @@
         #The same block of code as for OK but it is needed if we want to have
         #active response to Test button
+        import numpy as np
         no_opencl_msg = False
         if self.sas_opencl:
@@ -269 +270 @@
         try:
             env = sasmodels.kernelcl.environment()
-            clinfo = [(ctx.devices[0].platform.vendor,
-                       ctx.devices[0].platform.version,
-                       ctx.devices[0].vendor,
-                       ctx.devices[0].name,
-                       ctx.devices[0].version)
-                      for ctx in env.context]
+            dtype64 = np.dtype('float64')
+            dtype32 = np.dtype('float32')
+            if dtype64 in env.context:
+                ctx = env.context[dtype64].devices[0]
+            else:
+                ctx = env.context[dtype32].devices[0]
+            clinfo = (ctx.platform.vendor,
+                        ctx.platform.version,
+                        ctx.vendor,
+                        ctx.name,
+                        ctx.version)
         except Exception:
             clinfo = None