restage 0.3.1__tar.gz → 0.4.0__tar.gz

{restage-0.3.1 → restage-0.4.0}/.github/workflows/wheels.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Check metadata
       run: pipx run twine check dist/*
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         path: dist/*
 
@@ -44,7 +44,7 @@ jobs:
     steps:
     - uses: actions/setup-python@v4
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: artifact
         path: dist

{restage-0.3.1/src/restage.egg-info → restage-0.4.0}/PKG-INFO

@@ -1,14 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: restage
-Version: 0.3.1
+Version: 0.4.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
+License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: mccode-antlr[hdf5]==0.7.0
+Requires-Dist: mccode-antlr[hdf5]>=0.10.2
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.3.1 → restage-0.4.0}/pyproject.toml

@@ -5,18 +5,26 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "restage"
 dependencies = [
-    'zenlog>=1.1,',
+    'zenlog>=1.1',
     'platformdirs>=3.11',
     'psutil>=5.9.6',
-    "importlib_metadata; python_version<'3.8'",
-    'mccode-antlr[hdf5]==0.7.0',
+    'mccode-antlr[hdf5]>=0.10.2',
 ]
 readme = "README.md"
+license = {text = "BSD-3-Clause"}
+requires-python = ">=3.9"
 authors = [
     { name = "Gregory Tucker", email = "gregory.tucker@ess.eu" },
 ]
 classifiers = [
     "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dynamic = ["version"]
 
@@ -26,6 +34,7 @@ test = ["pytest", "chopcal"]
 [project.scripts]
 restage = "restage.run:entrypoint"
 splitrun = "restage.splitrun:entrypoint"
+restage_bifrost_choppers = "restage.bifrost_choppers:script"
 
 [tool.setuptools_scm]
 
@@ -34,10 +43,9 @@ legacy_tox_ini = """
     [tox]
     min_version = 4.0
     env_list =
+        py313
         py312
         py311
-        py310
-        py39
         type
 
     [testenv]

{restage-0.3.1 → restage-0.4.0}/src/restage/energy.py

@@ -28,7 +28,7 @@ def bifrost_translate_energy_to_chopper_parameters(parameters: dict):
         name = ''.join(name)
         if name not in parameters:
             parameters[name] = 0
-    order = get_and_remove(parameters, 'order', 1)
+    order = get_and_remove(parameters, 'order', 14)
     time = get_and_remove(parameters, 'time', get_and_remove(parameters, 't', 170/180/(2 * 15 * 14)))
     return one_generic_energy_to_chopper_parameters(calculate, time, order, parameters)
 

{restage-0.3.1 → restage-0.4.0}/src/restage/instr.py

@@ -1,25 +1,41 @@
 """
 Utilities for interfacing with mccode_antlr.instr.Instr objects
 """
+from __future__ import annotations
+
 from pathlib import Path
 from typing import Union
 from mccode_antlr.instr import Instr
+from mccode_antlr.reader import Registry
 
 
-def load_instr(filepath: Union[str, Path]) -> Instr:
+def load_instr(filepath: Union[str, Path], extra_registries: list[Registry] | None = None) -> Instr:
     """Loads an Instr object from a .instr file or a HDF5 file"""
-    from mccode_antlr.loader import load_mcstas_instr
     from mccode_antlr.io import load_hdf5
+    from mccode_antlr.loader import load_mcstas_instr
 
     if not isinstance(filepath, Path):
         filepath = Path(filepath)
     if not filepath.exists() or not filepath.is_file():
         raise ValueError('The provided filepath does not exist or is not a file')
 
+    # FIXME this hack should be removed ASAP
+    if extra_registries is None:
+        from mccode_antlr.reader import GitHubRegistry
+        mcpl_input_once_registry = GitHubRegistry(
+            name='mcpl_input_once',
+            url='https://github.com/g5t/mccode-mcpl-input-once',
+            version='main',
+            filename='pooch-registry.txt'
+        )
+        extra_registries = [mcpl_input_once_registry]
+
     if filepath.suffix == '.instr':
-        return load_mcstas_instr(filepath)
+        return load_mcstas_instr(filepath, registries=extra_registries)
 
-    return load_hdf5(filepath)
+    instr = load_hdf5(filepath)
+    instr.registries += tuple(extra_registries)
+    return instr
 
 
 def collect_parameter_dict(instr: Instr, kwargs: dict, strict: bool = True) -> dict:

{restage-0.3.1 → restage-0.4.0}/src/restage/splitrun.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from typing import Union
 from pathlib import Path
-from .range import Singular, MRange
 from .tables import SimulationEntry, InstrEntry
-from mccode_antlr.compiler.c import CBinaryTarget
 
+def mcpl_parameter_split(s: str) -> tuple[str, str]:
+    k, v = s.split(':', 1)
+    return k, v
 
 def make_splitrun_parser():
     from argparse import ArgumentParser
@@ -40,6 +40,12 @@ def make_splitrun_parser():
     # splitrun controlling parameters
     aa('--split-at', nargs=1, type=str, default=['mcpl_split'],
        help='Component at which to split -- DEFAULT: mcpl_split')
+    aa('--mcpl-output-component', nargs=1, type=str, default=None,
+       help='Inserted MCPL file producing component, MCPL_output(.comp) if not provided')
+    aa('--mcpl-input-component', nargs=1, type=str, default=None,
+       help='Inserted MCPL file consuming component, MCPL_input(.comp) if not provided')
+    aa('--mcpl-input-parameters', nargs='+', type=mcpl_parameter_split, metavar='key:value')
+    aa('--mcpl-output-parameters', nargs='+', type=mcpl_parameter_split, metavar='key:value')
     aa('-P', action='append', default=[], help='Cache parameter matching precision')
 
     # Other McCode runtime arguments exist, but are likely not used during a scan:
@@ -78,31 +84,6 @@ def regular_mccode_runtime_dict(args: dict) -> dict:
     return t
 
 
-def mccode_runtime_dict_to_args_list(args: dict) -> list[str]:
-    """Convert a dictionary of McCode runtime arguments to a string.
-
-    :parameter args: A dictionary of McCode runtime arguments.
-    :return: A list of arguments suitable for use in a command line call to a McCode compiled instrument.
-    """
-    # convert to a standardized string:
-    out = []
-    if 'seed' in args and args['seed'] is not None:
-        out.append(f'--seed={args["seed"]}')
-    if 'ncount' in args and args['ncount'] is not None:
-        out.append(f'--ncount={args["ncount"]}')
-    if 'dir' in args and args['dir'] is not None:
-        out.append(f'--dir={args["dir"]}')
-    if 'trace' in args and args['trace']:
-        out.append('--trace')
-    if 'gravitation' in args and args['gravitation']:
-        out.append('--gravitation')
-    if 'bufsiz' in args and args['bufsiz'] is not None:
-        out.append(f'--bufsiz={args["bufsiz"]}')
-    if 'format' in args and args['format'] is not None:
-        out.append(f'--format={args["format"]}')
-    return out
-
-
 def parse_splitrun_precision(unparsed: list[str]) -> dict[str, float]:
     precision = {}
     for p in unparsed:
@@ -113,43 +94,34 @@ def parse_splitrun_precision(unparsed: list[str]) -> dict[str, float]:
     return precision
 
 
-def sort_args(args: list[str]) -> list[str]:
-    """Take the list of arguments and sort them into the correct order for splitrun"""
-    # TODO this is a bit of a hack, but it works for now
-    first, last = [], []
-    k = 0
-    while k < len(args):
-        if args[k].startswith('-'):
-            first.append(args[k])
-            k += 1
-            if '=' not in first[-1] and k < len(args) and not args[k].startswith('-') and '=' not in args[k]:
-                first.append(args[k])
-                k += 1
-        else:
-            last.append(args[k])
-            k += 1
-    return first + last
-
-
-def parse_splitrun():
+def parse_splitrun(parser):
     from .range import parse_scan_parameters
+    from mccode_antlr.run.runner import sort_args
     import sys
     sys.argv[1:] = sort_args(sys.argv[1:])
 
-    args = make_splitrun_parser().parse_args()
+    args = parser.parse_args()
+    if args.mcpl_input_parameters is not None:
+        args.mcpl_input_parameters = dict(args.mcpl_input_parameters)
+    if args.mcpl_output_parameters is not None:
+        args.mcpl_output_parameters = dict(args.mcpl_output_parameters)
     parameters = parse_scan_parameters(args.parameters)
     precision = parse_splitrun_precision(args.P)
     return args, parameters, precision
 
 
 def entrypoint():
-    args, parameters, precision = parse_splitrun()
+    args, parameters, precision = parse_splitrun(make_splitrun_parser())
     splitrun_from_file(args, parameters, precision)
 
 
 def splitrun_from_file(args, parameters, precision):
     from .instr import load_instr
     instr = load_instr(args.instrument[0])
+    splitrun_args(instr, parameters, precision, args)
+
+
+def splitrun_args(instr, parameters, precision, args, **kwargs):
     splitrun(instr, parameters, precision, split_at=args.split_at[0], grid=args.mesh,
              seed=args.seed[0] if args.seed is not None else None,
              ncount=args.ncount[0] if args.ncount is not None else None,
@@ -164,6 +136,11 @@ def splitrun_from_file(args, parameters, precision):
              parallel=args.parallel,
              gpu=args.gpu,
              process_count=args.process_count,
+             mcpl_output_component=args.mcpl_output_component[0] if args.mcpl_output_component is not None else None,
+             mcpl_output_parameters=args.mcpl_output_parameters,
+             mcpl_input_component=args.mcpl_input_component[0] if args.mcpl_input_component is not None else None,
+             mcpl_input_parameters=args.mcpl_input_parameters,
+             **kwargs
              )
 
 
@@ -174,8 +151,11 @@ def splitrun(instr, parameters, precision: dict[str, float], split_at=None, grid
              parallel=False, gpu=False, process_count=0,
              callback=None, callback_arguments: dict[str, str] | None = None,
              output_split_instrs=True,
+             mcpl_output_component=None, mcpl_output_parameters: dict[str, str] | None = None,
+             mcpl_input_component=None, mcpl_input_parameters: dict[str, str] | None = None,
              **runtime_arguments):
     from zenlog import log
+    from mccode_antlr.common import ComponentParameter, Expr
     from .energy import get_energy_parameter_names
     if split_at is None:
         split_at = 'mcpl_split'
@@ -183,7 +163,17 @@ def splitrun(instr, parameters, precision: dict[str, float], split_at=None, grid
     if not instr.has_component_named(split_at):
         log.error(f'The specified split-at component, {split_at}, does not exist in the instrument file')
     # splitting defines an instrument parameter in both returned instrument, 'mcpl_filename'.
-    pre, post = instr.mcpl_split(split_at, remove_unused_parameters=True)
+    if mcpl_output_parameters is not None:
+        mcpl_output_parameters = tuple(ComponentParameter(k, Expr.parse(v)) for k, v in mcpl_output_parameters.items())
+    if mcpl_input_parameters is not None:
+        mcpl_input_parameters = tuple(ComponentParameter(k, Expr.parse(v)) for k, v in mcpl_input_parameters.items())
+    pre, post = instr.mcpl_split(split_at,
+                                 output_component=mcpl_output_component,
+                                 output_parameters=mcpl_output_parameters,
+                                 input_component=mcpl_input_component,
+                                 input_parameters=mcpl_input_parameters,
+                                 remove_unused_parameters=True
+                                 )
     if output_split_instrs:
         for p in (pre, post):
             with open(f'{p.name}.instr', 'w') as f:
@@ -204,7 +194,8 @@ def splitrun(instr, parameters, precision: dict[str, float], split_at=None, grid
                              dry_run=dry_run, parallel=parallel, gpu=gpu, process_count=process_count)
 
     splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, grid, precision,
-                      dry_run=dry_run, callback=callback, callback_arguments=callback_arguments, **runtime_arguments)
+                      dry_run=dry_run, parallel=parallel, gpu=gpu, process_count=process_count,
+                      callback=callback, callback_arguments=callback_arguments, **runtime_arguments)
 
 
 def splitrun_pre(instr, parameters, grid, precision: dict[str, float],
@@ -259,6 +250,7 @@ def _pre_step(instr, entry, names, precision, translate, kw, min_pc, max_pc, dry
 
 def splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, grid, precision: dict[str, float],
                       summary=True, dry_run=False, callback=None, callback_arguments: dict[str, str] | None = None,
+                      parallel=False, gpu=False, process_count=0,
                       **runtime_arguments):
     from pathlib import Path
     from .cache import cache_instr, cache_get_simulation
@@ -267,7 +259,7 @@ def splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, gri
     from .instr import collect_parameter_dict
     from .tables import best_simulation_entry_match
     from .emulate import mccode_sim_io, mccode_dat_io, mccode_dat_line
-    instr_entry = cache_instr(post, mpi=False, acc=False)
+    instr_entry = cache_instr(post, mpi=parallel, acc=gpu)
     args = regular_mccode_runtime_dict(runtime_arguments)
     sit_kw = {'seed': args.get('seed'), 'ncount': args.get('ncount'), 'gravitation': args.get('gravitation', False)}
     # recombine the parameters to ensure the 'correct' scan is performed
@@ -308,7 +300,7 @@ def splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, gri
         # TODO Use the following line instead of the one after it when McCode is fixed to use zero-padded folder names
         # # runtime_arguments['dir'] = args["dir"].joinpath(str(number).zfill(n_zeros))
         runtime_arguments['dir'] = args['dir'].joinpath(str(number))
-        do_secondary_simulation(sim_entry, instr_entry, secondary_pars, runtime_arguments, dry_run=dry_run)
+        do_secondary_simulation(sim_entry, instr_entry, secondary_pars, runtime_arguments, dry_run=dry_run, process_count=process_count)
         if summary and not dry_run:
             # the data file has *all* **scanned** parameters recorded for each step:
             detectors, line = mccode_dat_line(runtime_arguments['dir'], {k: v for k,v in zip(names, values)})
@@ -332,7 +324,8 @@ def splitrun_combined(pre_entry, pre, post, pre_parameters, post_parameters, gri
 
 
 def _args_pars_mcpl(args: dict, params: dict, mcpl_filename) -> str:
-    # Combine the arguments, parameters, and mcpl filename into a single command-arguments string:
+    """Combine the arguments, parameters, and mcpl filename into a single command-arguments string:"""
+    from mccode_antlr.run.runner import mccode_runtime_dict_to_args_list
     first = ' '.join(mccode_runtime_dict_to_args_list(args))
     second = ' '.join([f'{k}={v}' for k, v in params.items()])
     third = f'mcpl_filename={mcpl_filename}'
@@ -457,7 +450,8 @@ def repeat_simulation_until(count, runner, args: dict, parameters, work_dir: Pat
     combine_mccode_sims_in_directories(outputs, work_dir)
 
 
-def do_secondary_simulation(p_sit: SimulationEntry, entry: InstrEntry, pars: dict, args: dict, dry_run: bool = False):
+def do_secondary_simulation(p_sit: SimulationEntry, entry: InstrEntry, pars: dict, args: dict, dry_run: bool = False,
+                            process_count: int = 0):
     from zenlog import log
     from pathlib import Path
     from shutil import copy
@@ -475,7 +469,7 @@ def do_secondary_simulation(p_sit: SimulationEntry, entry: InstrEntry, pars: dic
 
     mcpl_path = mcpl_real_filename(Path(p_sit.output_path).joinpath(mcpl_filename))
     executable = Path(entry.binary_path)
-    target = CBinaryTarget(mpi=entry.mpi, acc=entry.acc, count=1 if not entry.mpi else 0, nexus=False)
+    target = CBinaryTarget(mpi=entry.mpi, acc=entry.acc, count=process_count, nexus=False)
     run_compiled_instrument(executable, target, _args_pars_mcpl(args, pars, mcpl_path), capture=False, dry_run=dry_run)
 
     if not dry_run:

{restage-0.3.1 → restage-0.4.0}/src/restage/tables.py

@@ -10,8 +10,8 @@ def uuid():
 
 
 def utc_timestamp() -> float:
-    from datetime import datetime
-    return datetime.utcnow().timestamp()
+    from datetime import datetime, timezone
+    return datetime.now(timezone.utc).timestamp()
 
 
 COMMON_COLUMNS = ['seed', 'ncount', 'output_path', 'gravitation', 'creation', 'last_access']

{restage-0.3.1 → restage-0.4.0/src/restage.egg-info}/PKG-INFO

@@ -1,14 +1,22 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: restage
-Version: 0.3.1
+Version: 0.4.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
+License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: mccode-antlr[hdf5]==0.7.0
+Requires-Dist: mccode-antlr[hdf5]>=0.10.2
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.3.1 → restage-0.4.0}/src/restage.egg-info/SOURCES.txt

@@ -23,8 +23,6 @@ src/restage.egg-info/dependency_links.txt
 src/restage.egg-info/entry_points.txt
 src/restage.egg-info/requires.txt
 src/restage.egg-info/top_level.txt
-test/splitRunTest_first.c
-test/splitRunTest_second.c
 test/test_cache.py
 test/test_database.py
 test/test_energy.py

{restage-0.3.1 → restage-0.4.0}/src/restage.egg-info/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 restage = restage.run:entrypoint
+restage_bifrost_choppers = restage.bifrost_choppers:script
 splitrun = restage.splitrun:entrypoint

restage-0.4.0/src/restage.egg-info/requires.txt

@@ -0,0 +1,8 @@
+zenlog>=1.1
+platformdirs>=3.11
+psutil>=5.9.6
+mccode-antlr[hdf5]>=0.10.2
+
+[test]
+pytest
+chopcal

{restage-0.3.1 → restage-0.4.0}/test/test_single.py

@@ -1,4 +1,28 @@
+from __future__ import annotations
+
 import unittest
+from mccode_antlr.compiler.check import simple_instr_compiles
+
+
+def compiled_test(method, compiler: str | None = None):
+    if compiler is None:
+        compiler = 'cc'
+    if simple_instr_compiles(compiler):
+        return method
+
+    @unittest.skip(f"Skipping due to lack of working {compiler}")
+    def skipped_method(*args, **kwargs):
+        return method(*args, **kwargs)
+
+    return skipped_method
+
+
+def gpu_compiled_test(method):
+    return compiled_test(method, 'acc')
+
+
+def mpi_compiled_test(method):
+    return compiled_test(method, 'mpi/cc')
 
 
 class SingleTestCase(unittest.TestCase):
@@ -14,7 +38,7 @@ class SingleTestCase(unittest.TestCase):
         self.assertTrue(args.mesh)
 
     def test_mixed_parsing(self):
-        from restage.splitrun import sort_args
+        from mccode_antlr.run.runner import sort_args
         args = self.parser.parse_args(sort_args(['test.instr', '-m', 'a=1', 'b=2', '--split-at=here']))
         self.assertEqual(args.instrument, ['test.instr'])
         self.assertEqual(args.parameters, ['a=1', 'b=2'])
@@ -80,6 +104,17 @@ class SingleTestCase(unittest.TestCase):
             self.assertEqual(values[3], 'blah')
             self.assertEqual(values[4], '/data')
 
+    def test_mcpl_split_parameters(self):
+        args = self.parser.parse_args(['test.instr', 'a=1.0', 'b=2', 'c=3:5', 'd=blah',  'e=/data',
+                                       '--mcpl-input-parameters', 'preload:1', 'v_smear:0.01'])
+        self.assertEqual(args.parameters, ['a=1.0', 'b=2', 'c=3:5', 'd=blah', 'e=/data'])
+        self.assertEqual(args.mcpl_input_parameters, [('preload', '1'), ('v_smear', '0.01')])
+        args = self.parser.parse_args(['new_tst.instr', '--mcpl-output-parameters', 'preload:1',
+                                       '--mcpl-input-component=MCPL_input_once'])
+        self.assertEqual(args.parameters, [])
+        self.assertEqual(args.mcpl_output_parameters, [('preload', '1')])
+        self.assertEqual(args.mcpl_input_component, ['MCPL_input_once'])
+
 
 class DictWranglingTestCase(unittest.TestCase):
     def test_regularization(self):
@@ -113,24 +148,21 @@ class SplitRunTestCase(unittest.TestCase):
 
     def _define_instr(self):
         from math import pi, asin, sqrt
-        from antlr4 import CommonTokenStream, InputStream
-        from mccode_antlr.grammar import McInstrParser, McInstrLexer
-        from mccode_antlr.instr import InstrVisitor
-        from mccode_antlr.reader import Reader, MCSTAS_REGISTRY, LocalRegistry
-        from pathlib import Path
+        from mccode_antlr.reader import MCSTAS_REGISTRY
+        from mccode_antlr.reader import GitHubRegistry
+        from mccode_antlr.loader.loader import parse_mccode_instr
 
         def parse(contents):
-            parser = McInstrParser(CommonTokenStream(McInstrLexer(InputStream(contents))))
             # registries = [LocalRegistry(name='test_files', root=Path(__file__).parent.as_posix()), MCSTAS_REGISTRY]
-            registries = [MCSTAS_REGISTRY]
-            reader = Reader(registries=registries)
-            visitor = InstrVisitor(reader, '<test string>')
-            instr = visitor.visitProg(parser.prog())
-            instr.flags = tuple(reader.c_flags)
-            instr.registries = tuple(registries)
-            return instr
-
-        from mccode_antlr.loader import parse_mcstas_instr
+            mcpl_input_once_registry = GitHubRegistry(
+                name='mcpl_input_once',
+                url='https://github.com/g5t/mccode-mcpl-input-once',
+                version='main',
+                filename='pooch-registry.txt'
+            )
+            registries = [MCSTAS_REGISTRY, mcpl_input_once_registry]
+            return parse_mccode_instr(contents, registries, '<test string>')
+
         d_spacing = 3.355  # (002) for Highly-ordered Pyrolytic Graphite
         mean_energy = 5.0
         energy_width = 1.0
@@ -202,7 +234,8 @@ class SplitRunTestCase(unittest.TestCase):
             output.mkdir(parents=True)
 
         # run the scan
-        splitrun(self.instr, scan, precision={}, split_at='split_at', grid=False, ncount=10_000, dir=output)
+        splitrun(self.instr, scan, precision={}, split_at='split_at', grid=False, ncount=10_000, dir=output,
+                 mcpl_input_component='MCPL_input_once')
 
         # check the scan directory for output
         for x in self.dir.glob('**/*.dat'):
@@ -210,14 +243,27 @@ class SplitRunTestCase(unittest.TestCase):
 
         # It would be nice to check that the produced mccode.sim and mccode.dat files look right.
 
+    @mpi_compiled_test
     def test_parallel_scan(self):
+        """This test requires mpicc and MCPL shared libraries to work
+
+        On some systems (Fedora at least) specifying which MPI to use requires using
+        the `module` system, e.g.,
+            $ module load mpi/openmpi-x86_64
+        And for some unexplored reason, MCPL shared libraries are not found in their
+        default installed location, /usr/local/lib64/libmcpl.so; so this test must
+        be invoked with that location specified, e.g.,
+            $ LD_LIBRARY_PATH=/usr/local/lib64 pytest test/test_single.py -k test_parallel_scan
+        """
         from restage.splitrun import splitrun
         from restage.range import parse_scan_parameters
         scan = parse_scan_parameters([f'a1={self.min_a1}:0.5:{self.max_a1}', f'a2={2 * self.min_a1}:{2 * self.max_a1}'])
         output = self.dir.joinpath('test_parallel_scan')
         if not output.exists():
             output.mkdir(parents=True)
-        splitrun(self.instr, scan, precision={}, split_at='split_at', grid=False, ncount=100_000, dir=output, parallel=True)
+        splitrun(self.instr, scan, precision={}, split_at='split_at', grid=False, ncount=100_000, dir=output,
+                 parallel=True, process_count=4,
+                 mcpl_input_component='MCPL_input_once', mcpl_input_parameters={'preload': '1'})
 
         # check the scan directory for output
         for x in self.dir.glob('**/*.dat'):

restage-0.3.1/src/restage.egg-info/requires.txt

@@ -1,11 +0,0 @@
-zenlog>=1.1
-platformdirs>=3.11
-psutil>=5.9.6
-mccode-antlr[hdf5]==0.7.0
-
-[:python_version < "3.8"]
-importlib_metadata
-
-[test]
-pytest
-chopcal