Changeset 92583049 in sasview

Timestamp:

Jan 6, 2017 8:20:35 AM (8 years ago)

Author:

wojciech

Children:

f370ea07

Parents:

e2c0939

Message:

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

Location:

src/sas/sasgui

Files:

• guiframe/customdir.py (modified) (1 diff)
• perspectives/fitting/gpu_options.py (modified) (2 diffs)

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

@@ -79 +79 @@
         #Check if SAS_OPENCL is already set as enviromental variable
         self.sas_opencl = os.environ.get("SAS_OPENCL","")
-        
+
         for clopt in clinfo:
             button = wx.CheckBox(self.panel1, -1, label=clopt[1], name=clopt[1])
@@ -106 +106 @@
         accept_btn = wx.Button(self, wx.ID_OK)
         accept_btn.SetToolTipString("Accept new OpenCL settings. This will"
-                                    " overwrite SAS_OPENCL variable if set")
+                                    " override SAS_OPENCL variable if set")
 
         help_id = wx.NewId()