Changeset cde0611 in sasview

Timestamp:

Aug 8, 2018 9:34:25 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

b259485

Parents:

ebfe223 (diff), db05c44 (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.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Files:

• build_tools/jenkins_ubuntu_build.sh (modified) (1 diff)
• run.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/GPUOptions.py (modified) (7 diffs)
• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)

build_tools/jenkins_ubuntu_build.sh

@@ -3 +3 @@
 
 ## Set up path for py36 - conda
-export PATH=/home/sasview/miniconda3/bin:$PATH
+export PATH=/home/sasview/anaconda3/bin:$PATH
 
 

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
@@ -226 +233 @@
     for cl_platform in cl_platforms:
         d_index = 0
-        cl_platforms = cl_platform.get_devices()
-        for cl_platform in cl_platforms:
-            if len(cl_platforms) > 1 and len(cl_platforms) > 1:
+        cl_devices = cl_platform.get_devices()
+        for cl_device in cl_devices:
+            if len(cl_platforms) > 1 and len(cl_devices) > 1:
                 combined_index = ":".join([str(p_index), str(d_index)])
             elif len(cl_platforms) > 1:
@@ -234 +241 @@
             else:
                 combined_index = str(d_index)
-            clinfo.append((combined_index, ":".join([cl_platform.name,
-                                                     cl_platform.name])))
+            clinfo.append((combined_index, ": ".join([cl_platform.name,
+                                                     cl_device.name])))
             d_index += 1
         p_index += 1

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -496 +496 @@
         # Now query the model item for available plots
         plots = GuiUtils.plotsFromFilename(filename, model)
+        ids = [list(self.active_plots.values())[id].data.id for id in range(len(self.active_plots))]
 
         new_plots = []
         for item, plot in plots.items():
             plot_id = plot.id
-            if plot_id in list(self.active_plots.keys()):
+            if plot_id in ids:
                 self.active_plots[plot_id].replacePlot(plot_id, plot)
             else:

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

@@ -135 +135 @@
         self.initializeCategoryCombo()
 
+        # Initial control state
+        self.initializeControls()
+
+        QtWidgets.QApplication.processEvents()
+
         # Connect signals to controls
         self.initializeSignals()
-
-        # Initial control state
-        self.initializeControls()
 
         if data is not None:
@@ -325 +327 @@
             QTreeView::item {
                 border: 1px;
-                padding: 2px 15px;
+                padding: 2px 1px;
             }