Changeset 62243ae in sasview

Timestamp:

Dec 22, 2016 8:36:12 AM (7 years ago)

Author:

wojciech

Children:

6c6aa83

Parents:

6af411b

Message:

Added settings reading from custom config file

Files:

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

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

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/gpu_options.py

@@ -13 +13 @@
 import logging
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+import imp
 
 class GpuOptions(wx.Dialog):
@@ -25 +26 @@
     def __init__(self, *args, **kwds):
 
-        from sas.sasgui.guiframe.customdir import SetupCustom
-
-        c_conf_dir = SetupCustom().setup_dir(PATH_APP)
-        self.custom_config = _find_local_config('custom_config', c_conf_dir)
-        if self.custom_config is None:
-            self.custom_config = _find_local_config('custom_config', os.getcwd())
-            if self.custom_config is None:
-                msgConfig = "Custom_config file was not imported"
-                logging.info(msgConfig)
-            else:
-                logging.info("using custom_config in %s" % os.getcwd())
-        else:
-            logging.info("using custom_config from %s" % c_conf_dir)
-        SAS_OPENCL_CUSTOM = custom_config.SAS_OPENCL
+        # from sas.sasgui.guiframe.customdir import SetupCustom
+        # from sas.sasgui.guiframe.gui_manager import get_app_dir, _find_local_config
+        #
+        # PATH_APP = get_app_dir()
+        # c_conf_dir = SetupCustom().setup_dir(PATH_APP)
+        # self.custom_config = _find_local_config('custom_config', c_conf_dir)
+        # if self.custom_config is None:
+        #     self.custom_config = _find_local_config('custom_config', os.getcwd())
+        #     if self.custom_config is None:
+        #         msgConfig = "Custom_config file was not imported"
+        #         logging.info(msgConfig)
+        #     else:
+        #         logging.info("using custom_config in %s" % os.getcwd())
+        # else:
+        #     logging.info("using custom_config from %s" % c_conf_dir)
+
+        # SAS_OPENCL_CUSTOM = None
+        # if self.custom_config.SAS_OPENCL:
+        #     SAS_OPENCL_CUSTOM = self.custom_config.SAS_OPENCL
 
         kwds["style"] = wx.DEFAULT_DIALOG_STYLE
@@ -52 +58 @@
         self.buttons = []
         #Check if SAS_OPENCL is already set as enviromental variable
-        self.sas_opencl =  os.environ["SAS_OPENCL"] \
-            if "SAS_OPENCL" in os.environ else SAS_OPENCL_CUSTOM
-        #or as a custom variable in the config file
+        self.sas_opencl = os.environ.get("SAS_OPENCL","")
+        #self.sas_opencl =  os.environ["SAS_OPENCL"] \
+        #    if "SAS_OPENCL" in os.environ else SAS_OPENCL_CUSTOM
 
         for clopt in clinfo:
@@ -65 +71 @@
             else:
                 self.option_button[clopt] = "None"
-                if self.sas_opencl.lower() == "none" :
+                if self.sas_opencl.lower() == "none":
                     button.SetValue(1)
 
@@ -174 +180 @@
         if self.sas_opencl:
             os.environ["SAS_OPENCL"] = self.sas_opencl
-            else:
+        else:
             if "SAS_OPENCL" in os.environ:
                 del(os.environ["SAS_OPENCL"])
-        sasmodels.kernelcl.ENV = None
-        #TODO: Write to config.py
-        self.custom_config.SAS_OPENCL = self.sas_opencl
+
+        try:
+            imp.find_module('sasmodels.kernelcl')
+            kernelcl_exist = True
+        except:
+            kernelcl_exist = False
+        if kernelcl_exist:
+            sasmodels.kernelcl.ENV = None
+            #self.custom_config.SAS_OPENCL = self.sas_opencl
 
         #Need to reload sasmodels.core module to account SAS_OPENCL = "None"