Merge branch 'main' into 2311_collective_scan

CITATION.cff

@@ -8,73 +8,79 @@ authors:
   - family-names: Valls
     given-names: Valentin
     affiliation: ESRF
-  - family-names: deschildre
+  - family-names: Gutierrez-Fernandez
+    given-names: Edgar
+    affiliation: ESRF
+  - family-names: Ashiotis
+    given-names: Giannis
+    affiliation: ESRF
+  - family-names: Karkoulis
+    given-names: Dimitris
+    affiliation: ESRF
+  - family-names: Nawaz
+    given-names: Zubair
+    affiliation: ESRF
+  - family-names: Deschildre
     given-names: Aurore
     affiliation: ESRF
   - family-names: Vincent
-    given-name: Thomas
+    given-names: Thomas
     affiliation: ESRF
   - family-names: Picca
-    given-name: Frederic Emmanuel
+    given-names: Frederic Emmanuel
     affiliation: Soleil
   - family-names: Massahud
-    given-name: Emily
+    given-names: Emily
     affiliation: ANSTO
-  - family-names: Gutierrez-Fernandez
-    given-name: Edgar
-    affiliation: ESRF
   - family-names: Payno
-    given-name: Henri
+    given-names: Henri
     affiliation: ESRF
   - family-names: Huder
-    given-name: Loïc
+    given-names: Loïc
     affiliation: ESRF
   - family-names: Wright
-    given-name: Johnathan Paul
+    given-names: Johnathan Paul
     affiliation: ESRF
   - family-names: Pandolfi
-    given-name: Ronald
+    given-names: Ronald
     affiliation: LBL
     orcid: https://orcid.org/0000-0003-0824-8548
   - family-names: Jankowski
-    given-name: Maciej
-    affiliation: ESRF
-  - family-names: Ashiotis
-    given-name: Giannis
+    given-names: Maciej
     affiliation: ESRF
   - family-names: Paleo
-    given-name: Pierre
+    given-names: Pierre
     affiliation: ESRF
   - family-names: Faure
-    given-name: Bertrand
+    given-names: Bertrand
     affiliation: Xenocs
   - family-names: Storm
-    given-name: Malte
+    given-names: Malte
     affiliation: Helmholtz-Zentrum Hereon
   - family-names: De Nolf
-    given-name: Wout
+    given-names: Wout
     affiliation: ESRF
   - family-names:  Wright
-    given-name: Christopher J.
+    given-names: Christopher J.
     affiliation: NSLS-II
   - family-names: Hopkins
-    given-name: Jesse B.
+    given-names: Jesse B.
     orcid: https://orcid.org/0000-0001-8554-8072
     affiliation: APS
   - family-names: Pascal
-    given-name: Elena
+    given-names: Elena
     affiliation: Diamond
   - family-names: Weninger
-    given-name: Clemens
+    given-names: Clemens
     affiliation: MAX IV
   - family-names: Detlefs
-    given-name: Carsten
+    given-names: Carsten
     affiliation: ESRF
   - family-names:  Plaswig
-    given-name: Florian
+    given-names: Florian
     affiliation: ESRF
   - family-names: Lavanchy
-    given-name: Aurelien
+    given-names: Aurelien
   - family-names: gbenecke
   - family-names: zxs-un
   - family-names: iltommi

src/pyFAI/app/benchmark.py

@@ -32,7 +32,7 @@
 __contact__ = "[email protected]"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "27/09/2024"
+__date__ = "08/11/2024"
 __status__ = "development"
 
 from argparse import ArgumentParser
@@ -91,14 +91,12 @@ def main(args=None):
     parser.add_argument("--no-1dimention",
                         action="store_false", dest="onedim", default=True,
                         help="Do not benchmark algorithms for 1D-regrouping")
-
     parser.add_argument("-m", "--memprof",
                         action="store_true", dest="memprof", default=False,
                         help="Perfrom memory profiling (Linux only)")
     parser.add_argument("-r", "--repeat",
                         dest="repeat", default=1, type=int,
                         help="Repeat each measurement x times to take the best")
-
     parser.add_argument("-ps", "--pixelsplit",
                         dest="pixelsplit", default=["bbox"], type=str, nargs="+",
                         help="Benchmark using specific pixel splitting protocols: no, bbox, pseudo, full, all",)
@@ -108,11 +106,12 @@ def main(args=None):
     parser.add_argument("-i", "--implementation",
                         dest="implementation", default=["cython", "opencl"], type=str, nargs="+",
                         help="Benchmark using specific algorithm implementations: python, cython, opencl, all")
-
     parser.add_argument("-f", "--function",
                         dest="function", default="ng", type=str,
                         help="Benchmark legacy (legacy), engine function (ng), or both (all)")
-
+    parser.add_argument("-o", "--devices",
+                        dest="devices", default=None, type=str,
+                        help="Comma separated list of paires of OpenCL platform:device ids like `0:1,1:0` to benchmark")
     parser.add_argument("--all",
                         action="store_true", dest="all", default=False,
                         help="Benchmark using all available methods and devices")
@@ -122,12 +121,16 @@ def main(args=None):
         pyFAI_logger.setLevel(logging.DEBUG)
 
     devices = []
-    if options.opencl_cpu:
-        devices.append("cpu")
-    if options.opencl_gpu:
-        devices.append("gpu")
-    if options.opencl_acc:
-        devices.append("acc")
+    if options.devices:
+        for pair in options.devices.split(","):
+            devices.append(pair.split(":"))
+    else:
+        if options.opencl_cpu:
+            devices.append("cpu")
+        if options.opencl_gpu:
+            devices.append("gpu")
+        if options.opencl_acc:
+            devices.append("acc")
 
     benchmark.run(number=options.number,
                   repeat=options.repeat,