Changeset db05c44 in sasview

Timestamp:

Aug 7, 2018 11:38:19 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

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

Children:

c0de493

Parents:

8a518285

Message:

fix OpenCL device never being set correctly; fix loading in default device from config (and setting to no OpenCL by default)

Files:

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

run.py

@@ -145 +145 @@
         import sas.qtgui.convertUI
 
+    # initialize OpenCL setting
+    SAS_OPENCL = sas.get_custom_config().SAS_OPENCL
+    if SAS_OPENCL and "SAS_OPENCL" not in os.environ:
+        os.environ["SAS_OPENCL"] = SAS_OPENCL
+
 
 if __name__ == "__main__":

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

@@ -34 +34 @@
     clicked = False
     sas_open_cl = None
+    cl_options = None
 
     def __init__(self, parent=None):
@@ -49 +50 @@
         cl_tuple = _get_clinfo()
         self.sas_open_cl = os.environ.get("SAS_OPENCL", "")
+
+        # Keys are the names in the form "platform: device". Corresponding values are the combined indices, e.g.
+        # "0:1", for setting the SAS_OPENCL env.
+        self.cl_options = {}
+
         for title, descr in cl_tuple:
             # Create an item for each openCL option
@@ -55 +61 @@
             check_box.setText(_translate("GPUOptions", descr, None))
             self.optionsLayout.addWidget(check_box)
-            if (descr == self.sas_open_cl) or (
+            if (title == self.sas_open_cl) or (
                             title == "None" and not self.clicked):
                 check_box.click()
                 self.clicked = True
+            self.cl_options[descr] = title
         self.openCLCheckBoxGroup.setMinimumWidth(self.optionsLayout.sizeHint().width()+10)
 
@@ -76 +83 @@
         checked = None
         for box in self.openCLCheckBoxGroup.findChildren(QtWidgets.QCheckBox):
-            if box.isChecked() and (str(box.text()) == self.sas_open_cl or (
+            if box.isChecked() and (self.cl_options[str(box.text())] == self.sas_open_cl or (
                     str(box.text()) == "No OpenCL" and self.sas_open_cl == "")):
                 box.setChecked(False)
@@ -82 +89 @@
                 checked = box
         if hasattr(checked, "text"):
-            self.sas_open_cl = str(checked.text())
+            self.sas_open_cl = self.cl_options[str(checked.text())]
         else:
             self.sas_open_cl = None