restage 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

restage/cache.py

@@ -107,24 +107,20 @@ def directory_under_module_data_path(sub: str, prefix=None, suffix=None, name=No
 
 def _compile_instr(entry: InstrEntry, instr: Instr, config: dict | None = None,
                    mpi: bool = False, acc: bool = False,
-                   target=None, generator=None):
-    from mccode_antlr import __version__
+                   target=None, flavor=None):
+    from mccode_antlr import __version__, Flavor
     from mccode_antlr.compiler.c import compile_instrument, CBinaryTarget
     if config is None:
         config = dict(default_main=True, enable_trace=False, portable=False, include_runtime=True,
                       embed_instrument_file=False, verbose=False)
     if target is None:
         target = CBinaryTarget(mpi=mpi or False, acc=acc or False, count=1, nexus=False)
-    if generator is None:
-        from mccode_antlr.translators.target import MCSTAS_GENERATOR
-        generator = MCSTAS_GENERATOR
+    if flavor is None:
+        flavor = Flavor.MCSTAS
 
     output = directory_under_module_data_path('bin')
-    # TODO consider adding `dump_source=True` _and_ putting the resulting file into
-    #      the cache in order to make debugging future problems a tiny bit easier.
-    # FIXME a future mccode-antlr will support setting 'source_file={file_path}'
-    #       to allow exactly this.
-    binary_path = compile_instrument(instr, target, output, generator=generator, config=config, dump_source=True)
+    source_file = output.joinpath(instr.name).with_suffix('.c')
+    binary_path = compile_instrument(instr, target, output, flavor=flavor, config=config, source_file=source_file)
     entry.mccode_version = __version__
     entry.binary_path = str(binary_path)
     return entry

restage/mcpl.py

@@ -4,20 +4,26 @@ from pathlib import Path
 def mcpl_real_filename(filename: Path) -> Path:
     """MCPL_output from McCode instruments has the bad habit of changing the output file name silently.
     Find the _real_ output file name by looking for the expected variants"""
-    if filename.exists() and filename.is_file():
-        return filename
-    if filename.with_suffix('.mcpl').exists() and filename.with_suffix('.mcpl').is_file():
-        return filename.with_suffix('.mcpl')
-    if filename.with_suffix('.mcpl.gz').exists() and filename.with_suffix('.mcpl.gz').is_file():
-        return filename.with_suffix('.mcpl.gz')
+    base, ext = filename.parent / filename.stem, filename.suffix
+    if ext in ('.gz',):
+        ext = base.suffix + ext
+        base = base.parent / base.stem
+    extensions = {'.mcpl.gz', '.mcpl', ''}
+    if ext not in extensions:
+        ValueError(f'Unsupported file extension: {ext}')
+    for ext in extensions:
+        check = base.with_suffix(ext)
+        if check.exists() and check.is_file():
+            return check
+        print(f'{base} -> {check} not found')
     raise FileNotFoundError(f'Could not find MCPL file {filename}')
 
 
-# def mcpl_particle_count(filename):
-    # from mcpl import MCPLFile
-    # with MCPLFile(mcpl_real_filename(filename)) as f:
-    #     n = f.nparticles
-    # return n
+def mcpl_real_extension(filename: Path) -> str:
+    for ext in ('.mcpl.gz', '.mcpl'):
+        if str(filename).endswith(ext):
+            return ext
+    return ''
 
 
 def mcpl_particle_count(filename):
@@ -52,11 +58,7 @@ def mcpl_merge_files(files: list[Path], filepath: Path, keep_originals: bool = F
     from subprocess import run
     real_filenames = [mcpl_real_filename(f) for f in files]
     # if the real filenames have .mcpl or .mcpl.gz, the merged filename should too
-    ext = ''
-    if real_filenames[0].name.endswith('.mcpl.gz'):
-        ext = '.mcpl.gz'
-    elif real_filenames[0].name.endswith('.mcpl'):
-        ext = '.mcpl'
+    ext = mcpl_real_extension(real_filenames[0])
     filename = filepath.with_suffix(ext).as_posix()
 
     command = ['mcpltool', '--merge', filename] + [str(f) for f in real_filenames]
@@ -69,13 +71,8 @@ def mcpl_merge_files(files: list[Path], filepath: Path, keep_originals: bool = F
 
 
 def mcpl_rename_file(source: Path, dest: Path, strict: bool = False):
-    filepath = mcpl_real_filename(source)
-    filename = filepath.name  # this could be '{name}', '{name}.mcpl', or '{name}.mcpl.gz'
-    ext = ''
-    if filepath.name.endswith('.mcpl.gz'):
-        ext = '.mcpl.gz'
-    elif filepath.name.endswith('.mcpl'):
-        ext = '.mcpl'
+    filepath = mcpl_real_filename(source) # this could be '{name}', '{name}.mcpl', or '{name}.mcpl.gz'
+    ext = mcpl_real_extension(filepath)
 
     if not dest.name.endswith(ext):
         if strict:

{restage-0.5.0.dist-info → restage-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.5.0
+Version: 0.6.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
@@ -17,7 +17,7 @@ Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: confuse
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: mccode-antlr[hdf5]>=0.10.2
+Requires-Dist: mccode-antlr[hdf5]>=0.13.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: chopcal; extra == "test"

{restage-0.5.0.dist-info → restage-0.6.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 restage/__init__.py,sha256=HlqvPpL7DKet00NAFyqJBNg9UFO7o05Gt2tFyKBQcsY,744
 restage/bifrost_choppers.py,sha256=xQu21g2NcTLPpZ0ZWOuvN20zh07EWoO4QVoTnoORwZI,6443
-restage/cache.py,sha256=PD07z9pxGwBcxoizgy11zoQBjViF1ZSzKS0686RZ3FI,8115
+restage/cache.py,sha256=Xep5j7jzq_qppp1i-KNSxZLpvyeZdDJkTMnB_PEE1gM,7824
 restage/cspec_choppers.py,sha256=ZWxyCcwYn4z9ZNqj_r6RC9ImbhVjYc1fmv-Ijm8A2Yk,206
 restage/database.py,sha256=anyOby31fUN7rGAVNsnWDUhAISV0vQ7en8aQwVS5ZwA,11051
 restage/emulate.py,sha256=VrhfZJIbECdbDS-MHklqRuAIy9cRkjZkwPBTKQSQoe0,6164
 restage/energy.py,sha256=w78GUIWcHxANvBl2DTu73FQFawCXfzlK6L32TBQNt4g,3371
 restage/instr.py,sha256=A0ShtXkswt_f7o-cIDtsVbG03_tGELe1aS3WzLxzkJM,2494
-restage/mcpl.py,sha256=BZYxBytughjc8slR6gUaBy3D7gzo7Yl3ACXrXhWgagI,3403
+restage/mcpl.py,sha256=MKVY-2TYk5p8hW1lXJib5mxdbnILq4GoYiyAUgOBJmA,3269
 restage/range.py,sha256=TjOf4DSKfgoAIcrWQvv6MrtksQpnGJHdsEjVI5K-UfI,8116
 restage/run.py,sha256=nk8d7cIyIqSt-5pyGm68Zak5H1a-fbo_z2_36eN-08E,1481
 restage/scan.py,sha256=Yx8OQSBG6I2_64sW0LIDb0glVKwWoxUQQznASXgDZFQ,1432
@@ -14,8 +14,8 @@ restage/splitrun.py,sha256=W_pTeiMjc9hhu-zaE6fdetVLG6MGEpnaTOdgmgVkS1g,26061
 restage/tables.py,sha256=mL1SrCbgwfWzG-ezd_R3CxOSIZLNZRoC2r7ht59jGMA,16371
 restage/config/__init__.py,sha256=zFRT9QXgpUJpBncELCQ6by1-kjYp8Li1yJDfqxkHxAA,965
 restage/config/default.yaml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-restage-0.5.0.dist-info/METADATA,sha256=5MHru2wvnMp3OATaVEEHYBWI8fP16npDpXnXwXjlteo,6769
-restage-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-restage-0.5.0.dist-info/entry_points.txt,sha256=gghocSxC2gHHxUCalAibCN1mtkh3trNmAfH5Qwx0KYg,149
-restage-0.5.0.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
-restage-0.5.0.dist-info/RECORD,,
+restage-0.6.0.dist-info/METADATA,sha256=X4sDrQDtdq4jl0nkymuxCsnxM8QbBJ4_nTiwKWfyNwA,6769
+restage-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+restage-0.6.0.dist-info/entry_points.txt,sha256=gghocSxC2gHHxUCalAibCN1mtkh3trNmAfH5Qwx0KYg,149
+restage-0.6.0.dist-info/top_level.txt,sha256=iM_pb-taTZ0S2WMoDnt_qDMZoNMjmM19z3tTCuVm1IE,8
+restage-0.6.0.dist-info/RECORD,,