Changeset 7feb69d in sasview

Timestamp:

Dec 5, 2016 9:35:48 AM (7 years ago)

Author:

wojciech

Children:

4139147

Parents:

71ac835

Message:

Added handling for platform names

File:

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

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

@@ -64 +64 @@
         accept_btn = wx.Button(self, wx.ID_OK)
         accept_btn.SetToolTipString("Accept new OpenCL settings. This will"
-                                    "overwrite SAS_OPENCL variable if set")
+                                    " overwrite SAS_OPENCL variable if set")
 
         help_id = wx.NewId()
@@ -91 +91 @@
         self.SetSizer(self.vbox)
         self.vbox.Fit(self)
-
+        self.SetTitle("OpenCL options")
         self.Centre()
 
     def _get_clinfo(self):
+        """
+        Reading in information about available OpenCL infrastructure
+        :return:
+        """
         clinfo = []
         try:
@@ -100 +104 @@
             for platform in cl.get_platforms():
                 for device in platform.get_devices():
-                    clinfo.append(device.name)
+                    clinfo.append(":".join([platform.name,device.name]))
         except ImportError:
             warnings.warn("pyopencl import failed. Please check installation")
@@ -117 +121 @@
             if btn != selected_button:
                 btn.SetValue(0)
-        self.sas_opencl = self.option_button[selected_button.Name]
+        if selected_button.GetValue():
+            self.sas_opencl = self.option_button[selected_button.Name]
+        else:
+            self.sas_opencl = None
 
     def on_OK(self, event):