Changeset 133812c7 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Nov 12, 2018 6:47:59 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

e5ae812

Parents:

ebcdb02

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (10/31/18 06:34:14)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (11/12/18 06:47:59)

Message:

Merged ESS_GUI

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• GPUOptions.py (modified) (6 diffs)

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

@@ -2448 +2448 @@
 
         # If multiple rows selected - toggle all of them, filtering uncheckable
-        # Switch off signaling from the model to avoid recursion
-        self._model_model.blockSignals(True)
         # Convert to proper indices and set requested enablement
         self.setParameterSelection(status)
-        self._model_model.blockSignals(False)
 
         # update the list of parameters to fit

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

@@ -2 +2 @@
 import os
 import sys
-import sasmodels
 import json
 import platform
 import webbrowser
+import logging
+
+import sasmodels
+import sasmodels.model_test
+import sasmodels.kernelcl
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -26 +30 @@
         return QtWidgets.QApplication.translate(context, text, disambig)
 
+logger = logging.getLogger(__name__)
 
 class GPUOptions(QtWidgets.QDialog, Ui_GPUOptions):
@@ -106 +111 @@
                 del os.environ["SAS_OPENCL"]
         # Sasmodels kernelcl doesn't exist when initiated with None
-        if 'sasmodels.kernelcl' in sys.modules:
-            sasmodels.kernelcl.ENV = None
-        from importlib import reload # assumed Python > 3.3
-        reload(sasmodels.core)
+        sasmodels.kernelcl.reset_environment()
         return no_opencl_msg
 
@@ -123 +125 @@
 
         try:
-            from sasmodels.kernelcl import environment
-            env = environment()
+            env = sasmodels.kernelcl.environment()
             clinfo = [(ctx.devices[0].platform.vendor,
                        ctx.devices[0].platform.version,
@@ -131 +132 @@
                        ctx.devices[0].version)
                       for ctx in env.context]
-        except ImportError:
+        except Exception:
             clinfo = None
 
@@ -222 +223 @@
     clinfo = []
     cl_platforms = []
+
     try:
         import pyopencl as cl
-        cl_platforms = cl.get_platforms()
     except ImportError:
-        print("pyopencl import failed. Using only CPU computations")
-    except cl.LogicError as e:
-        print(e.value)
+        cl = None
+
+    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")
+    else:
+        try:
+            cl_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