Changeset 4320104 in sasview for src/sas

Timestamp:

Jan 11, 2017 3:52:59 AM (8 years ago)

Author:

wojciech

Children:

65d1d04

Parents:

4cb58ce

Message:

making conditional check for kernelcl module

File:

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

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

@@ -9 +9 @@
 
 import os
+import sys
 import warnings
 import wx
@@ -25 +26 @@
 
         self.text = wx.TextCtrl(self, -1, size=(500, 400),
-                           style=wx.TE_MULTILINE|wx.TE_READONLY
-                                 |wx.SUNKEN_BORDER)
+                           style=wx.TE_MULTILINE|wx.TE_READONLY)
         self.text.SetValue(msg)
         self.text.SetBackgroundColour(self.GetBackgroundColour())
@@ -214 +214 @@
 
         #Sasmodels kernelcl doesn't exist when initiated with None
-        try:
+        if 'sasmodels.kernelcl' in sys.modules:
             sasmodels.kernelcl.ENV = None
-        except:
-            #TODO: Need to provide reasonable exception case
-            pass
-
-        #Need to reload sasmodels.core module to account SAS_OPENCL = "None"
+
         reload(sasmodels.core)
         event.Skip()
@@ -253 +249 @@
 
         #Sasmodels kernelcl doesn't exist when initiated with None
-        try:
+        if 'sasmodels.kernelcl' in sys.modules:
             sasmodels.kernelcl.ENV = None
-        except:
-            #TODO: Need to provide reasonable exception case
-            pass
+
 
         #Need to reload sasmodels.core module to account SAS_OPENCL = "None"