fix timeouts and pimcomp artifacts dir
Validate Operations / validate-operations (push) Has been cancelled

This commit is contained in:
NiccoloN
2026-08-07 11:16:36 +02:00
parent 4ce2ec8171
commit ac84040e16
3 changed files with 18 additions and 12 deletions
@@ -1521,11 +1521,11 @@ def main():
"Reuse PIMCOMP outputs",
copy_pimcomp_outputs,
reused_pimcomp_dir,
out_dir / "pimcomp",
out_dir / "pimcomp/output",
)
if copied_pimcomp:
verification_info = out_dir / "pimcomp/VerificationInfo.json"
simulation_info = out_dir / "pimcomp/SimulationInfo.gz"
verification_info = out_dir / "pimcomp/output/VerificationInfo.json"
simulation_info = out_dir / "pimcomp/output/SimulationInfo.gz"
print_step("Reuse PIMCOMP")
print(f" Directory: {reused_pimcomp_dir}")
else:
@@ -361,7 +361,7 @@ def comparison_command_for(
if reuse_shared_pimcomp:
reuse_pimcomp_dir = spec.shared_pimcomp_dir
elif args.only == "raptor":
reuse_pimcomp_dir = spec.output_dir / "pimcomp/output"
reuse_pimcomp_dir = existing_pimcomp_dir(spec.output_dir)
return comparison_command(
spec.model,
spec.output_dir,
@@ -388,6 +388,11 @@ def pimcomp_artifact_ready(output_dir: Path) -> bool:
) and (output_dir.parent / "comparison_report.json").is_file()
def existing_pimcomp_dir(comparison_dir: Path) -> Path | None:
output_dir = comparison_dir / "pimcomp/output"
return output_dir if pimcomp_artifact_ready(output_dir) else None
def run_comparison_jobs(
comparison_jobs: list[tuple[str, list[str], Path | None]],
max_workers: int,
@@ -579,10 +584,10 @@ def main() -> int:
required = (
comparison_dir / "pimcomp/comparison_report.json"
if args.only == "pimcomp"
else comparison_dir / "pimcomp/output/SimulationInfo.gz"
else existing_pimcomp_dir(comparison_dir)
)
if not required.exists():
missing_reuse.append(str(required))
if required is None or not required.exists():
missing_reuse.append(str(required or comparison_dir / "pimcomp"))
elif args.only == "raptor":
report = comparison_dir / "pimcomp/comparison_report.json"
if not report.exists() or json.loads(report.read_text(encoding="utf-8")).get(