Changeset ef0e644 in sasview for src

Timestamp:

Jan 17, 2017 7:21:59 AM (8 years ago)

Author:

wojciech

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7b15990, a9f579c, 220b1e7

Parents:

ca6cbc1c (diff), 1dc8ec9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged with master after fixes in sasmodels lib documention

Location:

src/sas/sasgui

Files:

• guiframe/customdir.py (modified) (1 diff)
• guiframe/gui_manager.py (modified) (5 diffs)
• guiframe/startup_configuration.py (modified) (2 diffs)
• perspectives/corfunc/corfunc.py (modified) (2 diffs)
• perspectives/corfunc/corfunc_panel.py (modified) (1 diff)
• perspectives/corfunc/plot_labels.py (modified) (1 diff)
• perspectives/fitting/fitting.py (modified) (3 diffs)
• perspectives/fitting/gpu_options.py (added)
• perspectives/fitting/media/plugin.rst (modified) (4 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/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):
@@ -2104 +2109 @@
         Quit the application
         """
+        #IF SAS_OPENCL is set, settings are stored in the custom config file
+        self._write_opencl_config_file()
         logging.info(" --- SasView session was closed --- \n")
         wx.Exit()
         sys.exit()
+
+    def _write_opencl_config_file(self):
+        """
+        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:
+                if "SAS_OPENCL" in line:
+                    if sas_opencl:
+                        new_config_lines.append("SAS_OPENCL = \""+sas_opencl+"\"")
+                    else:
+                        new_config_lines.append("SAS_OPENCL = None")
+                else:
+                    new_config_lines.append(line)
+            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")
+
 
     def _check_update(self, event=None):

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

@@ -67 +67 @@
             return []
         data = plotpanel.plots[graph.selected_plottable]
-        if data.id == IQ_DATA_LABEL or data.id == IQ_EXTRAPOLATED_DATA_LABEL or data.id == TRANSFORM_LABEL:
+        if data.id == IQ_DATA_LABEL or data.id == IQ_EXTRAPOLATED_DATA_LABEL or data.id == TRANSFORM_LABEL1 or data.id == TRANSFORM_LABEL3:
             return []
         item = plotpanel.plots[graph.selected_plottable]
@@ -179 +179 @@
                 # Show the extrapolation as a curve instead of points
                 new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
-        elif label == TRANSFORM_LABEL:
+        elif label == TRANSFORM_LABEL1 or label == TRANSFORM_LABEL3:
             new_plot.xaxis("{x}", 'A')
             new_plot.yaxis("{\\Gamma}", '')

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -274 +274 @@
         plot_x = transform.x[np.where(transform.x <= 200)]
         plot_y = transform.y[np.where(transform.x <= 200)]
-        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL)
+        self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1)
         # Only enable extract params button if a fourier trans. has been done
         if self.transform_type == 'fourier':

src/sas/sasgui/perspectives/corfunc/plot_labels.py

@@ -4 +4 @@
 
 GROUP_ID_TRANSFORM = r"$\Gamma(x)$"
-TRANSFORM_LABEL = r"$\Gamma(x)$"
+TRANSFORM_LABEL1 = r"$\Gamma1(x)$"
+TRANSFORM_LABEL3 = r"$\Gamma3(x)$"

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

@@ -45 +45 @@
 from sas.sasgui.guiframe.gui_manager import MDIFrame
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+from sas.sasgui.perspectives.fitting.gpu_options import GpuOptions
 
 from . import models
@@ -192 +193 @@
         self.bumps_options_menu = self.menu1.FindItemById(self.id_bumps_options)
         self.bumps_options_menu.Enable(True)
+
+        self.id_gpu_options_panel = wx.NewId()
+        self.menu1.Append(self.id_gpu_options_panel, "OpenCL Options", "Choose OpenCL driver or turn it off")
+        wx.EVT_MENU(owner, self.id_gpu_options_panel, self.on_gpu_options)
 
         self.id_result_panel = wx.NewId()
@@ -801 +806 @@
         self.result_frame.Show()
         self.result_frame.Raise()
+
+    def on_gpu_options(self, event=None):
+        """
+        Make the Fit Results panel visible.
+        """
+        dialog = GpuOptions(None, wx.ID_ANY, "")
+        dialog.Show()
 
     def stop_fit(self, uid):

src/sas/sasgui/perspectives/fitting/media/plugin.rst

@@ -568 +568 @@
     cube(x):
         $x^3$
-    sinc(x):
+    sas_sinx_x(x):
         $\sin(x)/x$, with limit $\sin(0)/0 = 1$.
     powr(x, y):
@@ -669 +669 @@
         (`link to Bessel function's code <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib/sas_JN.c>`_)
 
-    Si(x):
+    sas_Si(x):
         Sine integral $\text{Si}(x) = \int_0^x \tfrac{\sin t}{t}\,dt$.
 
@@ -693 +693 @@
         (`link to code <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib/Si.c>`_)
 
-    sph_j1c(x):
+    sas_3j1x_x(x):
         Spherical Bessel form
         $\text{sph_j1c}(x) = 3 j_1(x)/x = 3 (\sin(x) - x \cos(x))/x^3$,
@@ -701 +701 @@
         This function uses a Taylor series for small $x$ for numerical accuracy.
 
-        :code:`source = ["lib/sph_j1c.c", ...]`
-        (`link to code <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib/sph_j1c.c>`_)
-
-
-    sas_J1c(x):
+        :code:`source = ["lib/sas_3j1x_x.c", ...]`
+        (`link to code <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib/sas_3j1x_x.c>`_)
+
+
+    sas_2J1x_x(x):
         Bessel form $\text{sas_J1c}(x) = 2 J_1(x)/x$, with a limiting value
         of 1 at $x=0$, where $J_1(x)$ is the Bessel function of first kind