Changeset f4f3919 in sasmodels

Timestamp:

Dec 21, 2015 11:29:34 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

5258859

Parents:

e97170c

Message:

improve performance timing by suppressing startup time

Location:

sasmodels

Files:

• compare.py (modified) (4 diffs)
• compare_many.py (modified) (1 diff)

sasmodels/compare.py

@@ -148 +148 @@
     models more quickly.
     """
+    pars = pars.copy()
     for p in pars:
         if p.endswith("_pd"): pars[p] = 0
+    return pars
 
 def eval_sasview(model_definition, pars, data, Nevals=1):
@@ -190 +192 @@
                                 platform="ocl", fast=fast)
     calculator = DirectModel(data, model, cutoff=cutoff)
-    value = None  # silence the linter
+    # Run the calculator once before starting the timing loop
+    value = calculator(**suppress_pd(pars))
+    # Now run the timing loop
     toc = tic()
     for _ in range(max(Nevals, 1)):  # force at least one eval
@@ -201 +205 @@
     model = core.load_model(model_definition, dtype=dtype, platform="dll")
     calculator = DirectModel(data, model, cutoff=cutoff)
-    value = None  # silence the linter
+    # Run the calculator once before starting the timing loop
+    value = calculator(**suppress_pd(pars))
+    # Now run the timing loop
     toc = tic()
     for _ in range(max(Nevals, 1)):  # force at least one eval
@@ -268 +274 @@
     # parameter selection
     if '-mono' in opts:
-        suppress_pd(pars)
+        pars = suppress_pd(pars)
     if '-pars' in opts:
         print("pars "+str(parlist(pars)))

sasmodels/compare_many.py

@@ -75 +75 @@
         constrain_pars(model_definition, pars_i)
         constrain_new_to_old(model_definition, pars_i)
-        if mono: suppress_pd(pars_i)
+        if mono:
+            pars_i = suppress_pd(pars_i)
 
         good = [True]