BENCH: update the cruft

Author: andyfaff

benchmarks/asv.conf.json

@@ -28,7 +28,7 @@
     // If missing or the empty string, the tool will be automatically
     // determined by looking for tools on the PATH environment
     // variable.
-    "environment_type": "conda",
+    "environment_type": "virtualenv",
 
     // timeout in seconds for installing any dependencies in environment
     // defaults to 10 min
@@ -57,8 +57,14 @@
         "attrs": [],
         "scipy": [],
         "tqdm": [],
+        "build": [],
+        "meson-python": [],
+        "pip": [],
+        "meson": [],
+        "ninja": [],
     },
 
+    "build_command": "python -mpip wheel --no-deps --no-build-isolation --no-index -w {build_cache_dir} {build_dir}",
 
     // Combinations of libraries/python versions can be excluded/included
     // from the set to test. Each entry is a dictionary containing additional

benchmarks/benchmarks/analysis.py

@@ -1,4 +1,5 @@
 import os.path
+import multiprocessing as mp
 import numpy as np
 
 from .common import Benchmark
@@ -35,16 +36,20 @@ def setup(self):
 
         data = Data1D(data=(x, y, y_err))
 
-        p = Parameter(b_ls, 'b', vary=True, bounds=(-100, 100))
-        p |= Parameter(m_ls, 'm', vary=True, bounds=(-100, 100))
+        p = Parameter(b_ls, "b", vary=True, bounds=(-100, 100))
+        p |= Parameter(m_ls, "m", vary=True, bounds=(-100, 100))
 
         model = Model(p, fitfunc=line)
         self.objective = Objective(model, data)
         self.mcfitter = CurveFitter(self.objective)
         self.mcfitter_t = CurveFitter(self.objective, ntemps=20)
 
-        self.mcfitter.initialise('prior')
-        self.mcfitter_t.initialise('prior')
+        self.mcfitter.initialise("prior")
+        self.mcfitter_t.initialise("prior")
+        self.pool = mp.get_context("spawn").Pool()
+
+    def teardown(self):
+        self.pool.close()
 
     def time_sampler(self):
         # to get an idea of how fast the actual sampling is.
@@ -54,4 +59,5 @@ def time_sampler(self):
     def time_sampler_pool(self):
         # see how the multiprocessing in curvefitter performs
         # automatically use all the cores available
-        self.mcfitter_t.sample(20, pool=-1)
+        if __name__ == "__main__":
+            self.mcfitter_t.sample(20, pool=self.pool.map)

benchmarks/benchmarks/reflect.py

@@ -15,11 +15,15 @@
 class Abeles(Benchmark):
     def setup(self):
         self.q = np.linspace(0.005, 0.5, 50000)
-        self.layers = np.array([[0, 2.07, 0, 3],
-                                [50, 3.47, 0.0001, 4],
-                                [200, -0.5, 1e-5, 5],
-                                [50, 1, 0, 3],
-                                [0, 6.36, 0, 3]])
+        self.layers = np.array(
+            [
+                [0, 2.07, 0, 3],
+                [50, 3.47, 0.0001, 4],
+                [200, -0.5, 1e-5, 5],
+                [50, 1, 0, 3],
+                [0, 6.36, 0, 3],
+            ]
+        )
         self.repeat = 20
         self.number = 10
 
@@ -37,17 +41,17 @@ def time_reflectivity_pointwise_dq(self):
 
 
 class Reflect(Benchmark):
-    timeout = 120.
+    timeout = 120.0
     # repeat = 2
 
     def setup(self):
         pth = os.path.dirname(os.path.abspath(refnx.reflect.__file__))
-        e361 = RD(os.path.join(pth, 'test', 'e361r.txt'))
+        e361 = RD(os.path.join(pth, "tests", "e361r.txt"))
 
-        sio2 = SLD(3.47, name='SiO2')
-        si = SLD(2.07, name='Si')
-        d2o = SLD(6.36, name='D2O')
-        polymer = SLD(1, name='polymer')
+        sio2 = SLD(3.47, name="SiO2")
+        si = SLD(2.07, name="Si")
+        d2o = SLD(6.36, name="D2O")
+        polymer = SLD(1, name="polymer")
 
         # e361 is an older dataset, but well characterised
         structure361 = si | sio2(10, 4) | polymer(200, 3) | d2o(0, 3)
@@ -57,7 +61,7 @@ def setup(self):
         model361.bkg.vary = True
         model361.scale.range(0.1, 2)
         model361.bkg.range(0, 5e-5)
-        model361.dq = 5.
+        model361.dq = 5.0
 
         # d2o
         structure361[-1].sld.real.vary = True
@@ -76,10 +80,9 @@ def setup(self):
         self.model361 = model361
 
         # e361.x_err = None
-        self.objective = Objective(self.model361,
-                                   e361)
+        self.objective = Objective(self.model361, e361)
         self.fitter = CurveFitter(self.objective, nwalkers=200)
-        self.fitter.initialise('jitter')
+        self.fitter.initialise("jitter")
 
     def time_reflect_emcee(self):
         # test how fast the emcee sampler runs in serial mode