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

Tests: Turn --mpiexec argument into a template

Browse source
This commit is contained in:
Ole Schütt 2024-07-19 16:15:39 +02:00 • committed by Ole Schütt
parent b8f1bc8f10
commit 3aa77c817f
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/do_regtest.py
View file

@ -55,7 +55,8 @@ async def main() -> None:
parser.add_argument("--num_gpus", type=int, default=0)
parser.add_argument("--timeout", type=int, default=400)
parser.add_argument("--maxerrors", type=int, default=50)
parser.add_argument("--mpiexec", default="mpiexec --bind-to none")
help = "Template for launching MPI jobs, {N} is replaced by number of processors."
parser.add_argument("--mpiexec", default="mpiexec -n {N} --bind-to none", help=help)
help = "Runs only the first test of each directory."
parser.add_argument("--smoketest", dest="smoketest", action="store_true", help=help)
help = "Runs tests under Valgrind memcheck. Best used together with --keepalive."
@ -254,7 +255,9 @@ class Config:
self.num_workers = int(args.maxtasks / self.ompthreads / self.mpiranks)
self.workers = Semaphore(self.num_workers)
self.cp2k_root = Path(__file__).resolve().parent.parent
self.mpiexec = args.mpiexec.split()
self.mpiexec = args.mpiexec
if "{N}" not in self.mpiexec: # backwards compatibility
self.mpiexec = self.mpiexec.replace(" ", " -n {N} ", 1)
self.smoketest = args.smoketest
self.valgrind = args.valgrind
self.keepalive = args.keepalive
@ -319,7 +322,7 @@ class Config:
if self.valgrind:
cmd = ["valgrind", "--error-exitcode=42", "--exit-on-first-error=yes"] + cmd
if self.use_mpi:
cmd = [self.mpiexec[0], "-n", str(self.mpiranks)] + self.mpiexec[1:] + cmd
cmd = self.mpiexec.format(N=self.mpiranks).split() + cmd
if self.debug:
print(f"Creating subprocess: {cmd} {args}")
return asyncio.create_subprocess_exec(