From 62cda8f949044019319addb5ff8a74845a87a93f Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Wed, 6 Mar 2024 09:25:00 +0100 Subject: [PATCH] Put "multi-gpu-wrapper" script in BINDIR and prefix by FLAVOR --- tools/Python/mcrun/CMakeLists.txt | 1 + tools/Python/mcrun/mccode.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Python/mcrun/CMakeLists.txt b/tools/Python/mcrun/CMakeLists.txt index 583c9fada4..b60db3f74b 100644 --- a/tools/Python/mcrun/CMakeLists.txt +++ b/tools/Python/mcrun/CMakeLists.txt @@ -137,5 +137,6 @@ if(NOT WINDOWS) install( PROGRAMS "${PROJECT_SOURCE_DIR}/acc_gpu_bind" DESTINATION ${DEST_BINDIR} + RENAME "${FLAVOR}-acc_gpu_bind" ) endif() diff --git a/tools/Python/mcrun/mccode.py b/tools/Python/mcrun/mccode.py index 95271def14..58d1871071 100755 --- a/tools/Python/mcrun/mccode.py +++ b/tools/Python/mcrun/mccode.py @@ -306,7 +306,7 @@ def runMPI(self, args, pipe=False, override_mpi=None): if self.options.machines: mpi_flags = mpi_flags + ['-machinefile', self.options.machines] if self.options.openacc and not os.name == 'nt': - mpi_flags = mpi_flags + [mccode_config.configuration['MCCODE_LIB_DIR'] + '/bin/acc_gpu_bind'] + mpi_flags = mpi_flags + [mccode_config.directories['bindir'] + '/' + mccode_config.configuration['MCCODE'] + '-acc_gpu_bind'] args = mpi_flags + [self.binpath] + args return Process(binpath).run(args, pipe=pipe)