Changeset 1b061a31 in sasview

Timestamp:

Jan 13, 2017 3:58:07 AM (8 years ago)

Author:

wojciech

Children:

506bca3

Parents:

65d1d04

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (01/13/17 03:56:27)

git-committer:

wpotrzebowski <Wojciech.Potrzebowski@…> (01/13/17 03:58:07)

Message:

Changes to code after code review by PR

Location:

src/sas/sasgui

Files:

• guiframe/gui_manager.py (modified) (2 diffs)
• guiframe/startup_configuration.py (modified) (1 diff)
• perspectives/fitting/gpu_options.py (modified) (5 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -2116 +2116 @@
 
     def _write_opencl_config_file(self):
-        #from sas.sasgui.guiframe.customdir import SetupCustom
-        #from sas.sasgui.guiframe.gui_manager import _find_local_config
-
-        sas_opencl = os.environ.get("SAS_OPENCL",None)
-        #How to store it in file
-        new_config_lines = []
-        config_file = open(custom_config.__file__)
+        """
+        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:
@@ -2133 +2133 @@
                 else:
                     new_config_lines.append(line)
-        config_file.close()
-        new_config_file = open(custom_config.__file__,"w")
-        new_config_file.writelines(new_config_lines)
-        new_config_file.close()
+            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")
 
 

src/sas/sasgui/guiframe/startup_configuration.py

@@ -46 +46 @@
                        'CLEANUP_PLOT':CURRENT.CLEANUP_PLOT,
                        'DEFAULT_PERSPECTIVE':CURRENT.DEFAULT_PERSPECTIVE,
-                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDE,
+                       'DEFAULT_OPEN_FOLDER':CURRENT.DEFAULT_OPEN_FOLDER,
                        'SAS_OPENCL': None}
 except:

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

@@ -12 +12 @@
 import warnings
 import wx
+import sasmodels
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
@@ -164 +165 @@
         """
         clinfo = []
+        platforms = []
         try:
             import pyopencl as cl
             platforms = cl.get_platforms()
-            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
         except ImportError:
             warnings.warn("pyopencl import failed. Using only CPU computations")
+
+        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
 
         clinfo.append(("None", "No OpenCL"))
@@ -206 +209 @@
         Close window on accpetance
         """
-        import sasmodels
+
         #If statement added to handle Reset
         if self.sas_opencl:
@@ -223 +226 @@
     def on_reset(self, event):
         """
-        Close window on accpetance
+        Resets selected values
         """
         for btn in self.buttons:
@@ -236 +239 @@
         import json
         import platform
-        import sasmodels
+        #import sasmodels
 
         #The same block of code as for OK but it is needed if we want to have