Changeset b2964ef in sasview for src/sas/sasgui

Timestamp:

Apr 2, 2019 5:42:56 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Parents:

fa307dd (diff), 4688acf (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.

git-author:

Wojciech Potrzebowski <Wojciech.Potrzebowski@…> (04/02/19 05:42:56)

git-committer:

GitHub <noreply@…> (04/02/19 05:42:56)

Message:

Merge pull request #219 from SasView?/ticket-1267

I've tested it on OSX and Windows and it seems to behave as expected. This should fix ticket #1239, #219 and sasmodels#202

Location:

src/sas/sasgui/perspectives/fitting

Files:

• gpu_options.py (modified) (7 diffs)
• media/fitting_help.rst (modified) (4 diffs)
• media/fitting_sq.rst (deleted)
• media/p_and_s_buttons.png (added)
• media/p_and_s_buttons_parameters.png (added)
• media/p_and_s_sum_model.png (added)
• media/p_and_s_sum_model_parameters.png (added)

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

@@ -16 +16 @@
 import wx
 
+# TODO: move device query functions to sasmodels
 try:
     import pyopencl as cl
@@ -24 +25 @@
 import sasmodels.model_test
 import sasmodels.sasview_model
+from sasmodels.generate import F32, F64
 
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
 
 logger = logging.getLogger(__name__)
-
-
 
 class CustomMessageBox(wx.Dialog):
@@ -76 +76 @@
 
         self.SetAutoLayout(True)
-        self.ShowModal()
-        self.Destroy()
 
 
@@ -144 +142 @@
         test_btn = wx.Button(self, test_id, 'Test')
         test_btn.SetToolTipString("Test if models compile on the given infrastructure")
+        self.test_btn = test_btn
 
         self.Bind(wx.EVT_BUTTON, self.on_OK, accept_btn)
@@ -179 +178 @@
         :return:
         """
+        # TODO: Include cuda platforms if available.
         clinfo = []
         platforms = []
@@ -257 +257 @@
         #The same block of code as for OK but it is needed if we want to have
         #active response to Test button
+
         no_opencl_msg = False
         if self.sas_opencl:
@@ -265 +266 @@
             if "SAS_OPENCL" in os.environ:
                 del os.environ["SAS_OPENCL"]
-        sasmodels.sasview_model.reset_environment()
+        # CRUFT: next version of reset_environment() will return env
+        env = sasmodels.sasview_model.reset_environment()
 
         try:
             env = sasmodels.kernelcl.environment()
-            clinfo = [(ctx.devices[0].platform.vendor,
-                       ctx.devices[0].platform.version,
-                       ctx.devices[0].vendor,
-                       ctx.devices[0].name,
-                       ctx.devices[0].version)
-                      for ctx in env.context]
-        except Exception:
-            clinfo = None
+            clinfo = {}
+            if env.context[F64] is None:
+                clinfo['double'] = "None"
+            else:
+                ctx64 = env.context[F64].devices[0]
+                clinfo['double'] = ", ".join((
+                    ctx64.platform.vendor,
+                    ctx64.platform.version,
+                    ctx64.vendor,
+                    ctx64.name,
+                    ctx64.version))
+            if env.context[F32] is None:
+                clinfo['single'] = "None"
+            else:
+                ctx32 = env.context[F32].devices[0]
+                clinfo['single'] = ", ".join((
+                    ctx32.platform.vendor,
+                    ctx32.platform.version,
+                    ctx32.vendor,
+                    ctx32.name,
+                    ctx32.version))
+            # If the same device is used for single and double precision, then
+            # say so. Whether double is the same as single or single is the
+            # same as double depends on the order they are listed below.
+            if env.context[F32] == env.context[F64]:
+                clinfo['double'] = "same as single precision"
+        except Exception as exc:
+            logger.debug("exc %s", str(exc))
+            clinfo = {'double': "None", 'single': "None"}
+
+        msg = "\nPlatform Details:\n\n"
+        msg += "Sasmodels version: "
+        msg += sasmodels.__version__ + "\n"
+        msg += "\nPlatform used: "
+        msg += json.dumps(platform.uname()) + "\n"
+        if no_opencl_msg:
+            msg += "\nOpenCL driver: None\n"
+        else:
+            msg += "\nOpenCL driver:\n"
+            msg += "   single precision: " + clinfo['single'] + "\n"
+            msg += "   double precision: " + clinfo['double'] + "\n"
+
+        msg_title = 'OpenCL tests results'
+        running = msg + "\nRunning tests.  This may take several minutes.\n\n"
+        msg_dialog = CustomMessageBox(self.panel1, running, msg_title)
+        msg_dialog.Show()
 
         failures = []
         tests_completed = 0
-        for test in sasmodels.model_test.model_tests():
+        self.test_btn.Disable()
+        tests = sasmodels.model_test.make_suite('opencl', ['all'])
+        for test in tests:
             try:
-                test()
-            except Exception:
-                failures.append(test.description)
-
+                wx.Yield()
+                test.run_all()
+                msg_dialog.text.AppendText('.')
+            except Exception as exc:
+                logger.debug("%s failed with %s", test.test_name, str(exc))
+                msg_dialog.text.AppendText('\nFail: ' + test.test_name)
+                failures.append(test.test_name)
             tests_completed += 1
-
-        info = {
-            'version':  sasmodels.__version__,
-            'platform': platform.uname(),
-            'opencl': clinfo,
-            'failing tests': failures,
-        }
-
-        msg_info = 'OpenCL tests results'
-
-        msg = str(tests_completed)+' tests completed.\n'
-        if len(failures) > 0:
-            msg += str(len(failures))+' tests failed.\n'
-            msg += 'Failing tests: '
-            msg += json.dumps(info['failing tests'])
-            msg += "\n"
-        else:
-            msg += "All tests passed!\n"
-
-        msg += "\nPlatform Details:\n\n"
-        msg += "Sasmodels version: "
-        msg += info['version']+"\n"
-        msg += "\nPlatform used: "
-        msg += json.dumps(info['platform'])+"\n"
-        if no_opencl_msg:
-            msg += "\nOpenCL driver: None"
-        else:
-            msg += "\nOpenCL driver: "
-            msg += json.dumps(info['opencl'])+"\n"
-
-        CustomMessageBox(self.panel1, msg, msg_info)
+            # TODO: Put a stop button in CustomDialog and test it here.
+            #if tests_completed > 5: break
+
+        status = 'Failed %d of %d' % (len(failures), tests_completed)
+        msg_dialog.text.AppendText('\n\n' + status + '\n')
+        self.test_btn.Enable()
+        msg_dialog.ShowModal()
+        msg_dialog.Destroy()
 
     def on_help(self, event):

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

@@ -42 +42 @@
 *  *Ellipsoid* - ellipsoidal shapes (oblate,prolate, core shell, etc)
 *  *Parellelepiped* - as the name implies
-*  *Sphere* - sheroidal shapes (sphere, core multishell, vesicle, etc)
+*  *Sphere* - spheroidal shapes (sphere, core multishell, vesicle, etc)
 *  *Lamellae* - lamellar shapes (lamellar, core shell lamellar, stacked
    lamellar, etc)
@@ -61 +61 @@
 on the *Description* button to the right.
 
+Product Models
+^^^^^^^^^^^^^^
+
+S(Q) models can be combined with many models in the other categories to
+generate what SasView calls "product models". The combination can be done by
+one of two methods, but how they behave is slightly different.
+
+The first, most straightforward, method is simply to use the S(Q) drop-down in
+the FitPage:
+
+.. figure:: p_and_s_buttons.png
+
+This example would then generate a product model with the following parameters:
+
+.. figure:: p_and_s_buttons_parameters.png
+
+The other method is to use the :ref:`Sum|Multi(p1,p2)` tool under Fitting >
+Plugin Model Operations:
+
+.. figure:: p_and_s_sum_model.png
+
+This creates a product model with the following parameters:
+
+.. figure:: p_and_s_sum_model_parameters.png
+
+As can be seen, the second method has produced a product model with an extra
+parameter: *radius_effective*. This is the radial distance determining the
+range of the $S(Q)$ interaction and may, or may not, be the same as the
+*radius*, in this example, depending on the concentration of the system. In
+other systems, *radius_effective* may depend on the particle form (shape).
+
+See :ref:`Product_Models` for more information.
+
 Show 1D/2D
 ^^^^^^^^^^
@@ -119 +152 @@
 
 For a complete list of all the library models available in SasView, see
-the `Model Documentation <../../../index.html>`_ .
+the `Model Documentation <../../../sasgui/perspectives/fitting/models/index.html>`_ .
 
 It is also possible to add your own models.
@@ -216 +249 @@
 Such a plugin should then be available in the S(Q) drop-down box on a FitPage (once
 a P(Q) model has been selected).
+
+.. _Sum|Multi(p1,p2):
 
 Sum|Multi(p1,p2)