comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-28 22:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

regtesting: Fix OpenMPI compatibility

Browse source
This commit is contained in:
Ole Schütt 2021-10-28 13:47:07 +02:00 • committed by Ole Schütt
parent adbf7f0be0
commit 8eae7e3658
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/docker/scripts/test_regtest.sh
View file

@ -15,7 +15,7 @@ source /opt/cp2k-toolchain/install/setup
# Make OpenMPI happy.
if command -v ompi_info &> /dev/null; then
TESTOPTS="-mpiexec 'mpiexec --bind-to none --allow-run-as-root' ${TESTOPTS}"
TESTOPTS="--mpiexec='mpiexec --bind-to none --allow-run-as-root' ${TESTOPTS}"
export OMPI_MCA_plm_rsh_agent=/bin/false
fi

5
tools/regtesting/do_regtest.py
View file

@ -41,6 +41,7 @@ async def main() -> None:
parser.add_argument("--maxtasks", type=int, default=os.cpu_count())
parser.add_argument("--timeout", type=int, default=400)
parser.add_argument("--maxerrors", type=int, default=50)
parser.add_argument("--mpiexec", default="mpiexec")
parser.add_argument("--keepalive", dest="keepalive", action="store_true")
parser.add_argument("--debug", action="store_true")
parser.add_argument("--restrictdir", action="append")
@ -68,6 +69,7 @@ async def main() -> None:
print(f"Workers: {cfg.num_workers}")
print(f"Timeout [s]: {cfg.timeout}")
print(f"Work base dir: {cfg.work_base_dir}")
print(f"MPI exec: {cfg.mpiexec}")
print(f"Keepalive: {cfg.keepalive}")
print(f"Debug: {cfg.debug}")
print(f"ARCH: {cfg.arch}")
@ -195,6 +197,7 @@ class Config:
leaf_dir = f"TEST-{args.arch}-{args.version}-{datestamp}"
self.work_base_dir = self.cp2k_root / "regtesting" / leaf_dir
self.error_summary = self.work_base_dir / "error_summary"
self.mpiexec = args.mpiexec.split()
self.keepalive = args.keepalive
self.arch = args.arch
self.version = args.version
@ -221,7 +224,7 @@ class Config:
env["HIP_VISIBLE_DEVICES"] = ",".join(visible_gpu_devices)
env["OMP_NUM_THREADS"] = str(self.ompthreads)
exe = self.cp2k_root / "exe" / self.arch / f"{exe_stem}.{self.version}"
cmd = ["mpiexec", f"-np={self.mpiranks}", exe] if self.use_mpi else [exe]
cmd = self.mpiexec + ["-np", str(self.mpiranks), exe] if self.use_mpi else [exe]
if self.debug:
print(f"Creating subprocess: {cmd} {args}")
return asyncio.create_subprocess_exec(