Changeset ced1bff in sasview

Timestamp:

Oct 25, 2017 4:57:22 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:

0bb1397

Parents:

c82fd8f

Message:

Enable OpenCL tests and display results in new window.

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• GPUOptions.py (modified) (5 diffs)
• UI/GPUOptionsUI.ui (modified) (6 diffs)
• UI/GPUTestResultsUI.ui (added)

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

@@ -3 +3 @@
 import sys
 import sasmodels
+import json
+import platform
 
 from PyQt4 import QtGui, QtCore, QtWebKit
 from sas.qtgui.Perspectives.Fitting.UI.GPUOptionsUI import Ui_GPUOptions
+from sas.qtgui.Perspectives.Fitting.UI.GPUTestResultsUI import Ui_GPUTestResults
 
 try:
@@ -57 +60 @@
             # Expand group and shift items down as more are added
             self.openCLCheckBoxGroup.resize(391, 60 + i)
-            self.okButton.setGeometry(QtCore.QRect(20, 90 + i, 93, 28))
-            self.resetButton.setGeometry(QtCore.QRect(120, 90 + i, 93, 28))
-            self.testButton.setGeometry(QtCore.QRect(220, 90 + i, 93, 28))
-            self.helpButton.setGeometry(QtCore.QRect(320, 90 + i, 93, 28))
-            self.resize(440, 130 + i)
+            self.label.setGeometry(QtCore.QRect(20, 90 + i, 391, 37))
+            self.okButton.setGeometry(QtCore.QRect(20, 127 + i, 93, 28))
+            self.resetButton.setGeometry(QtCore.QRect(120, 127 + i, 93, 28))
+            self.testButton.setGeometry(QtCore.QRect(220, 127 + i, 93, 28))
+            self.helpButton.setGeometry(QtCore.QRect(320, 127 + i, 93, 28))
+            self.resize(440, 167 + i)
             i += 30
 
@@ -91 +95 @@
             self.sas_open_cl = None
 
+    def set_open_cl(self):
+        """
+        Set openCL value when tests run or OK button clicked
+        """
+        no_opencl_msg = False
+        if self.sas_open_cl:
+            os.environ["SAS_OPENCL"] = self.sas_open_cl
+            if self.sas_open_cl.lower() == "none":
+                no_opencl_msg = True
+        else:
+            if "SAS_OPENCL" in os.environ:
+                del os.environ["SAS_OPENCL"]
+        # Sasmodels kernelcl doesn't exist when initiated with None
+        if 'sasmodels.kernelcl' in sys.modules:
+            sasmodels.kernelcl.ENV = None
+        reload(sasmodels.core)
+        return no_opencl_msg
+
     def testButtonClicked(self):
         """
-        Run the model tests when the test button is clicked
-        """
-        # TODO: Do something
-        pass
+        Run sasmodels check from here and report results from
+        """
+
+        no_opencl_msg = self.set_open_cl()
+
+        # Only import when tests are run
+        from sasmodels.model_test import model_tests
+
+        try:
+            from sasmodels.kernelcl import environment
+            env = environment()
+            clinfo = [(ctx.devices[0].platform.vendor,
+                       ctx.devices[0].platform.version,
+                       ctx.devices[0].vendor,
+                       ctx.devices[0].name,
+                       ctx.devices[0].version)
+                      for ctx in env.context]
+        except ImportError:
+            clinfo = None
+
+        failures = []
+        tests_completed = 0
+        for test in model_tests():
+            try:
+                test()
+            except Exception:
+                failures.append(test.description)
+
+            tests_completed += 1
+
+        info = {
+            'version': sasmodels.__version__,
+            'platform': platform.uname(),
+            'opencl': clinfo,
+            'failing tests': failures,
+        }
+
+        msg_info = 'OpenCL tests results'
+
+        msg = str(tests_completed) + ' tests completed.\n'
+        if len(failures) > 0:
+            msg += str(len(failures)) + ' tests failed.\n'
+            msg += 'Failing tests: '
+            msg += json.dumps(info['failing tests'])
+            msg += "\n"
+        else:
+            msg += "All tests passed!\n"
+
+        msg += "\nPlatform Details:\n\n"
+        msg += "Sasmodels version: "
+        msg += info['version'] + "\n"
+        msg += "\nPlatform used: "
+        msg += json.dumps(info['platform']) + "\n"
+        if no_opencl_msg:
+            msg += "\nOpenCL driver: None"
+        else:
+            msg += "\nOpenCL driver: "
+            msg += json.dumps(info['opencl']) + "\n"
+        GPUTestResults(self, msg, msg_info)
 
     def helpButtonClicked(self):
@@ -120 +197 @@
         Close the window after modifying the SAS_OPENCL value
         """
-        # If statement added to handle Reset
-        if self.sas_open_cl:
-            os.environ["SAS_OPENCL"] = self.sas_open_cl
-        else:
-            if "SAS_OPENCL" in os.environ:
-                del os.environ["SAS_OPENCL"]
-
-        # Sasmodels kernelcl doesn't exist when initiated with None
-        if 'sasmodels.kernelcl' in sys.modules:
-            sasmodels.kernelcl.ENV = None
-
-        reload(sasmodels.core)
+        self.set_open_cl()
         super(GPUOptions, self).reject()
 
@@ -140 +206 @@
         self.close()
         self.parent.gpu_options_widget = GPUOptions(self)
+
+
+class GPUTestResults(QtGui.QDialog, Ui_GPUTestResults):
+    """
+    OpenCL Dialog to modify the OpenCL options
+    """
+    def __init__(self, parent, msg, title):
+        super(GPUTestResults, self).__init__(parent)
+        self.setupUi(self)
+        self.resultsText.setText(_translate("GPUTestResults", msg, None))
+        self.open()
 
 

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

@@ -8 +8 @@
     <y>0</y>
     <width>440</width>
-    <height>178</height>
+    <height>211</height>
    </rect>
   </property>
@@ -17 +17 @@
    <property name="geometry">
     <rect>
-     <x>220</x>
-     <y>140</y>
+     <x>120</x>
+     <y>170</y>
      <width>93</width>
      <height>28</height>
@@ -31 +31 @@
     <rect>
      <x>320</x>
-     <y>140</y>
+     <y>170</y>
      <width>93</width>
      <height>28</height>
@@ -59 +59 @@
    <property name="geometry">
     <rect>
-     <x>120</x>
-     <y>140</y>
+     <x>220</x>
+     <y>170</y>
      <width>93</width>
      <height>28</height>
@@ -73 +73 @@
     <rect>
      <x>20</x>
-     <y>140</y>
+     <y>170</y>
      <width>93</width>
      <height>28</height>
@@ -80 +80 @@
    <property name="text">
     <string>OK</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>132</y>
+     <width>391</width>
+     <height>37</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>8</pointsize>
+    </font>
+   </property>
+   <property name="text">
+    <string>WARNING: Running tests can take a few minutes!</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
    </property>
   </widget>