Changeset f38d027 in sasview

Timestamp:

Apr 2, 2019 8:52:44 AM (6 years ago)

Author:

GitHub <noreply@…>

Parents:

f994f188 (diff), e0d5b63 (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.

git-author:

Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (04/02/19 08:52:44)

git-committer:

GitHub <noreply@…> (04/02/19 08:52:44)

Message:

Merge e0d5b633dfbf05e21c4b415c0729be299e4d9a4c into f994f188e28dca36e7823b2deb3bf2bfc351c35c

File:

• src/sas/qtgui/Perspectives/Fitting/GPUOptions.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Fitting/GPUOptions.py

@@ -10 +10 @@
 import sasmodels.model_test
 import sasmodels.kernelcl
+from sasmodels.generate import F32, F64
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -112 +113 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-        # Sasmodels kernelcl doesn't exist when initiated with None
-        sasmodels.kernelcl.reset_environment()
+        # CRUFT: next version of reset_environment() will return env
+        sasmodels.sasview_model.reset_environment()
         return no_opencl_msg
 
@@ -122 +123 @@
 
         no_opencl_msg = self.set_sas_open_cl()
-
-        # Only import when tests are run
-        from sasmodels.model_test import model_tests
 
         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]
-        except Exception:
-            clinfo = None
+            clinfo = {}
+            if env.context[F64] is None:
+                clinfo['double'] = "None"
+            else:
+                ctx64 = env.context[F64].devices[0]
+                clinfo['double'] = ", ".join((
+                    ctx64.platform.vendor,
+                    ctx64.platform.version,
+                    ctx64.vendor,
+                    ctx64.name,
+                    ctx64.version))
+            if env.context[F32] is None:
+                clinfo['single'] = "None"
+            else:
+                ctx32 = env.context[F32].devices[0]
+                clinfo['single'] = ", ".join((
+                    ctx32.platform.vendor,
+                    ctx32.platform.version,
+                    ctx32.vendor,
+                    ctx32.name,
+                    ctx32.version))
+            # If the same device is used for single and double precision, then
+            # say so. Whether double is the same as single or single is the
+            # same as double depends on the order they are listed below.
+            if env.context[F32] == env.context[F64]:
+                clinfo['double'] = "same as single precision"
+        except Exception as exc:
+            logger.debug("exc %s", str(exc))
+            clinfo = {'double': "None", 'single': "None"}
 
         failures = []
         tests_completed = 0
-        for test in model_tests():
+        model_tests = sasmodels.model_test.make_suite('opencl', ['all'])
+        for test in model_tests:
             try:
-                test()
+                test.run_all()
             except Exception:
                 failures.append(test.description)
-
             tests_completed += 1
 
@@ -150 +169 @@
             'version': sasmodels.__version__,
             'platform': platform.uname(),
-            'opencl': clinfo,
+            'opencl_single': clinfo['single'],
+            'opencl_double': clinfo['double'],
             'failing tests': failures,
         }
@@ -172 +192 @@
         else:
             msg += "\nOpenCL driver: "
-            msg += json.dumps(info['opencl']) + "\n"
+            msg += "   single precision: " + json.dumps(info['opencl_single']) + "\n"
+            msg += "   double precision: " + json.dumps(info['opencl_double']) + "\n"
         GPUTestResults(self, msg)