Changeset 14fa542 in sasview

Timestamp:

Oct 24, 2017 8:54:24 AM (7 years ago)

Author:

krzywon

Branches:

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

Children:

a6cd8d1

Parents:

06ce180

Message:

Auto-populate OpenCL dialog with available options to finalize GUI.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingPerspective.py (modified) (1 diff)
• GPUOptions.py (modified) (2 diffs)
• UI/GPUOptionsUI.ui (modified) (5 diffs)

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

@@ -63 +63 @@
 
         # GPU Options
-        self.gpu_options_widget = GPUOptions()
+        self.gpu_options_widget = GPUOptions(self)
 
         self.menu_manager = ModelUtilities.ModelManager()

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

@@ -1 +1 @@
 # global
-import sys
-import os
-import types
 
-from PyQt4 import QtCore
-from PyQt4 import QtGui
-from PyQt4 import QtWebKit
+from PyQt4 import QtGui, QtCore
 from sas.qtgui.Perspectives.Fitting.UI.GPUOptionsUI import Ui_GPUOptions
 
-from bumps import fitters
-import bumps.options
+try:
+    _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+    def _fromUtf8(s):
+        return s
 
-# Set the default optimizer
-fitters.FIT_DEFAULT_ID = 'lm'
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
 
 
@@ -25 +28 @@
         self.setupUi(self)
 
+        # Get list of openCL options and add to GUI
+        cl_tuple = self._get_clinfo()
+        i = 0
+        for title, descr in cl_tuple:
+            button = QtGui.QRadioButton(self.openCLButtonGroup)
+            button.setGeometry(20, 20 + i, 351, 30)
+            button.setObjectName(_fromUtf8(title))
+            button.setText(_translate("GPUOptions", descr, None))
+            # Expand group and shift items down as more are added
+            self.openCLButtonGroup.resize(391, 60 + i)
+            self.pushButton.setGeometry(QtCore.QRect(220, 90 + i, 93, 28))
+            self.TestButton.setGeometry(QtCore.QRect(20, 90 + i, 193, 28))
+            self.pushButton_2.setGeometry(QtCore.QRect(320, 90 + i, 93, 28))
+            self.resize(440, 130 + i)
+            i += 30
 
-def main():
-    app = QtGui.QApplication(sys.argv)
+    def _get_clinfo(self):
+        """
+        Reading in information about available OpenCL infrastructure
+        :return:
+        """
+        clinfo = []
+        platforms = []
+        try:
+            import pyopencl as cl
+            platforms = cl.get_platforms()
+        except ImportError:
+            print("pyopencl import failed. Using only CPU computations")
 
-    w = GPUOptions()
-    w.show()
+        p_index = 0
+        for platform in platforms:
+            d_index = 0
+            devices = platform.get_devices()
+            for device in devices:
+                if len(devices) > 1 and len(platforms) > 1:
+                    combined_index = ":".join([str(p_index), str(d_index)])
+                elif len(platforms) > 1:
+                    combined_index = str(p_index)
+                else:
+                    combined_index = str(d_index)
+                clinfo.append((combined_index, ":".join([platform.name, device.name])))
+                d_index += 1
+            p_index += 1
 
-    sys.exit(app.exec_())
-
-if __name__ == '__main__':
-    main()
+        clinfo.append(("None", "No OpenCL"))
+        return clinfo

src/sas/qtgui/Perspectives/Fitting/UI/GPUOptionsUI.ui

@@ -8 +8 @@
     <y>0</y>
     <width>440</width>
-    <height>163</height>
+    <height>178</height>
    </rect>
   </property>
@@ -18 +18 @@
     <rect>
      <x>220</x>
-     <y>110</y>
+     <y>140</y>
      <width>93</width>
      <height>28</height>
@@ -31 +31 @@
     <rect>
      <x>20</x>
-     <y>110</y>
+     <y>140</y>
      <width>193</width>
      <height>28</height>
@@ -44 +44 @@
     <rect>
      <x>320</x>
-     <y>110</y>
+     <y>140</y>
      <width>93</width>
      <height>28</height>
@@ -53 +53 @@
    </property>
   </widget>
-  <widget class="QWidget" name="gridLayoutWidget">
+  <widget class="QGroupBox" name="openCLButtonGroup">
    <property name="geometry">
     <rect>
      <x>20</x>
-     <y>10</y>
+     <y>20</y>
      <width>391</width>
-     <height>91</height>
+     <height>111</height>
     </rect>
    </property>
-   <layout class="QGridLayout" name="OpenCLDialogOptionsSection">
-    <item row="0" column="0">
-     <widget class="QRadioButton" name="AvailableOpenCLOptions">
-      <property name="text">
-       <string>None</string>
-      </property>
-      <property name="checked">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-   </layout>
+   <property name="title">
+    <string>Available OpenCL Options</string>
+   </property>
   </widget>
  </widget>