Changeset 73cbeec in sasview

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

Files:

• sasview/custom_config.py (modified) (1 diff)
• sasview/local_config.py (modified) (1 diff)
• src/sas/sasgui/guiframe/customdir.py (modified) (1 diff)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (5 diffs)
• src/sas/sasgui/guiframe/startup_configuration.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/gpu_options.py (added)

sasview/custom_config.py

@@ -15 +15 @@
 TOOLBAR_SHOW = True
 DEFAULT_PERSPECTIVE = "Fitting"
+SAS_OPENCL = "None"

sasview/local_config.py

@@ -140 +140 @@
 UPDATE_TIMEOUT = 2
 
+#OpenCL option
+SAS_OPENCL = None
+
 def printEVT(message):
     if __EVT_DEBUG__:

src/sas/sasgui/guiframe/customdir.py

@@ -34 +34 @@
         if not os.path.isfile(config_file):
             shutil.copyfile(os.path.join(path, "custom_config.py"), config_file)
+
+        #Adding SAS_OPENCL if it doesn't exist in the config file
+        # - to support backcompability
+        if not "SAS_OPENCL" in open(config_file).read():
+            open(config_file,"a+").write("SAS_OPENCL = \"None\"\n")
     except:
         # Check for data path next to exe/zip file.

src/sas/sasgui/guiframe/gui_manager.py

@@ -152 +152 @@
 SPLASH_SCREEN_HEIGHT = config.SPLASH_SCREEN_HEIGHT
 SS_MAX_DISPLAY_TIME = config.SS_MAX_DISPLAY_TIME
+SAS_OPENCL = config.SAS_OPENCL
 if not WELCOME_PANEL_ON:
     WELCOME_PANEL_SHOW = False
@@ -176 +177 @@
     else:
         DEFAULT_OPEN_FOLDER = PATH_APP
+    SAS_OPENCL = custom_config.SAS_OPENCL
 except:
     DATALOADER_SHOW = True
@@ -190 +192 @@
     CLEANUP_PLOT = False
     DEFAULT_OPEN_FOLDER = PATH_APP
-
+    SAS_OPENCL = None
 DEFAULT_STYLE = config.DEFAULT_STYLE
 
@@ -225 +227 @@
         CHILD_FRAME = wx.Frame
 
+#Initiliaze enviromental variable with custom setting but only if variable not set
+if SAS_OPENCL and not "SAS_OPENCL" in os.environ:
+    os.environ["SAS_OPENCL"] = SAS_OPENCL
 
 class ViewerFrame(PARENT_FRAME):
@@ -2104 +2109 @@
         Quit the application
         """
+        #IF SAS_OPENCL is set, settings are stored in the custom config file
+        self._write_opencl_config_file()
         logging.info(" --- SasView session was closed --- \n")
         wx.Exit()
         sys.exit()
+
+    def _write_opencl_config_file(self):
+        """
+        Writes OpenCL settings to custom config file, so they can be remmbered
+        from session to session
+        """
+        if custom_config is not None:
+            sas_opencl = os.environ.get("SAS_OPENCL",None)
+            new_config_lines = []
+            config_file = open(custom_config.__file__)
+            config_lines = config_file.readlines()
+            for line in config_lines:
+                if "SAS_OPENCL" in line:
+                    if sas_opencl:
+                        new_config_lines.append("SAS_OPENCL = \""+sas_opencl+"\"")
+                    else:
+                        new_config_lines.append("SAS_OPENCL = None")
+                else:
+                    new_config_lines.append(line)
+            config_file.close()
+
+            #If custom_config is None, settings will not be remmbered
+            new_config_file = open(custom_config.__file__,"w")
+            new_config_file.writelines(new_config_lines)
+            new_config_file.close()
+        else:
+            logging.info("Failed to save OPENCL settings in custom config file")
+
 
     def _check_update(self, event=None):

src/sas/sasgui/guiframe/startup_configuration.py

@@ -31 +31 @@
                    'CLEANUP_PLOT':False,
                    'DEFAULT_PERSPECTIVE':'Fitting',
-                   'DEFAULT_OPEN_FOLDER': None}
+                   'DEFAULT_OPEN_FOLDER': None,
+                   'SAS_OPENCL': None}
 try:
     CURRENT_STRINGS = {'GUIFRAME_WIDTH':CURRENT.GUIFRAME_WIDTH,
@@ -45 +46 @@
                        'CLEANUP_PLOT':CURRENT.CLEANUP_PLOT,
                        'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE,
-                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER}
+                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER,
+                       'SAS_OPENCL': None}
 except:
     CURRENT_STRINGS = DEFAULT_STRINGS

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):