Changes in src/sas/sasgui/perspectives/fitting/gpu_options.py [895703d:388aefb] in sasview

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.sasview_model
-
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
@@ -181 +169 @@
         clinfo = []
         platforms = []
-
-        if cl is None:
+        try:
+            import pyopencl as cl
+            platforms = cl.get_platforms()
+        except ImportError:
             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")
-        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)
+        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
@@ -239 +226 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-        sasmodels.sasview_model.reset_environment()
+
+        #Sasmodels kernelcl doesn't exist when initiated with None
+        if 'sasmodels.kernelcl' in sys.modules:
+            sasmodels.kernelcl.ENV = None
+
+        reload(sasmodels.core)
         event.Skip()
 
@@ -255 +247 @@
         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
@@ -265 +261 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-        sasmodels.sasview_model.reset_environment()
+
+        #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
 
         try:
-            env = sasmodels.kernelcl.environment()
+            from sasmodels.kernelcl import environment
+            env = environment()
             clinfo = [(ctx.devices[0].platform.vendor,
                        ctx.devices[0].platform.version,
@@ -275 +282 @@
                        ctx.devices[0].version)
                       for ctx in env.context]
-        except Exception:
+        except ImportError:
             clinfo = None
 
         failures = []
         tests_completed = 0
-        for test in sasmodels.model_test.model_tests():
+        for test in model_tests():
             try:
                 test()