Changeset 8e109f9 in sasview

Timestamp:

Oct 11, 2018 1:54:35 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

1342f6a

Parents:

67ed543

Message:

use updated interface to sasmodels kernelcl

File:

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

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

@@ -8 +8 @@
 '''
 
+import json
+import platform
 import logging
 import os
 import sys
+
 import wx
+
+try:
+    import pyopencl as cl
+except ImportError:
+    cl = None
+
 import sasmodels
+import sasmodels.model_test
+import sasmodels.kernelcl
+
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
@@ -169 +181 @@
         clinfo = []
         platforms = []
-        try:
-            import pyopencl as cl
-            platforms = cl.get_platforms()
-        except ImportError:
+
+        if cl is None:
             logger.warn("Unable to import the pyopencl package.  It may not "
                         "have been installed.  If you wish to use OpenCL, try "
                         "running pip install --user pyopencl")
-        except cl.LogicError as err:
-            logger.warn("Unable to fetch the OpenCL platforms.  This likely "
-                        "means that the opencl drivers for your system are "
-                        "not installed.")
-            logger.warn(err)
+        else:
+            try:
+                platforms = cl.get_platforms()
+            except cl.LogicError as err:
+                logger.warn("Unable to fetch the OpenCL platforms.  This likely "
+                            "means that the opencl drivers for your system are "
+                            "not installed.")
+                logger.warn(err)
 
         p_index = 0
@@ -226 +239 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-
-        #Sasmodels kernelcl doesn't exist when initiated with None
-        if 'sasmodels.kernelcl' in sys.modules:
-            sasmodels.kernelcl.ENV = None
-
-        reload(sasmodels.core)
+        sasmodels.kernelcl.reset_environment()
         event.Skip()
 
@@ -247 +255 @@
         Run sasmodels check from here and report results from
         """
-        import json
-        import platform
-        #import sasmodels
-
         #The same block of code as for OK but it is needed if we want to have
         #active response to Test button
@@ -261 +265 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-
-        #Sasmodels kernelcl doesn't exist when initiated with None
-        if 'sasmodels.kernelcl' in sys.modules:
-            sasmodels.kernelcl.ENV = None
-
-
-        #Need to reload sasmodels.core module to account SAS_OPENCL = "None"
-        reload(sasmodels.core)
-
-
-        from sasmodels.model_test import model_tests
+        sasmodels.kernelcl.reset_environment()
 
         try:
-            from sasmodels.kernelcl import environment
-            env = environment()
+            env = sasmodels.kernelcl.environment()
             clinfo = [(ctx.devices[0].platform.vendor,
                        ctx.devices[0].platform.version,
@@ -282 +275 @@
                        ctx.devices[0].version)
                       for ctx in env.context]
-        except ImportError:
+        except Exception:
             clinfo = None
 
         failures = []
         tests_completed = 0
-        for test in model_tests():
+        for test in sasmodels.model_test.model_tests():
             try:
                 test()