Changeset 73cbeec in sasview for src/sas/sasgui/perspectives/fitting/fitting.py

Timestamp:

Jan 13, 2017 6:58:05 AM (7 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1dc8ec9

Parents:

ae9b8bf

git-author:

Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (01/13/17 06:58:05)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (01/13/17 06:58:05)

Message:

Opencl dialog (#29)

Merged OpenCL dialog prototype branch

• Support to read available OpenCL infrastructure

• Added support for SAS_OPENCL in sasview

• Calling CL devices from get_devices rather than create some context

• Boxsizer instead of FlexGridSizer? introduced

• Calling more than on platform

• Changing clinfo setup

• Code cleanup

• lint fixes

• Added better exception handling

• Fixed help button accidently disabled with the previous commit

• Setting dialog to unmodal

• Setting 0 values at setup

• Switched to checkbox, beacuase all of them can be unset during initialization

• Switiching to more appropriate HELP button

• Code clean-up after review by PR

• Interactive response to SAS_OPENCL enviroment

• Added handling for platform names

• Corrected warning

• Handling for PYOPENCL_CTX for multiple platforms added

• Bug fixed

• Support for more than one platform and one device

• Minor code cleanup

• Added test button - currently outputs to console

• Towards saving in comnfig file

• Added settings reading from custom config file

• Writting to settings file

• Added message dialog for testing results

• Writting to configuration file at the end of session

• Setting NoOpenCL as defult

• Setting proper CL env even when initiated from None

• Adding back-compatibility support if SAS_OPENCL is not set in config_file

• Added warning about lenght of tests

• Return more reasonable test messages

• Font changed so it looks better on Windows

• Minor code cleanup

• Code cleanup

• Added focus om text box to make Windows working

• and fixing line

• making conditional check for kernelcl module

• Minor code changes to make pylint happy

• Changes to code after code review by PR

• Removing panel wx element that prevented mouse scrolling

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -45 +45 @@
 from sas.sasgui.guiframe.gui_manager import MDIFrame
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.perspectives.fitting.gpu_options import GpuOptions
 
 from . import models
@@ -192 +193 @@
         self.bumps_options_menu = self.menu1.FindItemById(self.id_bumps_options)
         self.bumps_options_menu.Enable(True)
+
+        self.id_gpu_options_panel = wx.NewId()
+        self.menu1.Append(self.id_gpu_options_panel, "OpenCL Options", "Choose OpenCL driver or turn it off")
+        wx.EVT_MENU(owner, self.id_gpu_options_panel, self.on_gpu_options)
 
         self.id_result_panel = wx.NewId()
@@ -801 +806 @@
         self.result_frame.Show()
         self.result_frame.Raise()
+
+    def on_gpu_options(self, event=None):
+        """
+        Make the Fit Results panel visible.
+        """
+        dialog = GpuOptions(None, wx.ID_ANY, "")
+        dialog.Show()
 
     def stop_fit(self, uid):