From 994391ba89d68ed473270172d0c988158a7e8c67 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Fri, 9 Feb 2024 14:48:34 +0000 Subject: [PATCH] replace `run_cmd` with `run_shell_cmd` in custom easyblock for NVHPC (`nvhpc.py`) --- easybuild/easyblocks/n/nvhpc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/easybuild/easyblocks/n/nvhpc.py b/easybuild/easyblocks/n/nvhpc.py index 6efc018a93..5da5bdf6cf 100644 --- a/easybuild/easyblocks/n/nvhpc.py +++ b/easybuild/easyblocks/n/nvhpc.py @@ -44,7 +44,7 @@ from easybuild.easyblocks.generic.packedbinary import PackedBinary from easybuild.framework.easyconfig import CUSTOM from easybuild.tools.filetools import adjust_permissions, write_file -from easybuild.tools.run import run_cmd +from easybuild.tools.run import run_shell_cmd from easybuild.tools.modules import get_software_root, get_software_version from easybuild.tools.config import build_option from easybuild.tools.build_log import EasyBuildError, print_warning @@ -154,7 +154,7 @@ def install_step(self): 'NVHPC_STDPAR_CUDACC': str(default_compute_capability), # 70, 80; single value, no list! } cmd = "%s ./install" % ' '.join(['%s=%s' % x for x in sorted(nvhpc_env_vars.items())]) - run_cmd(cmd, log_all=True, simple=True) + run_shell_cmd(cmd) # make sure localrc uses GCC in PATH, not always the system GCC, and does not use a system g77 but gfortran install_abs_subdir = os.path.join(self.installdir, self.nvhpc_install_subdir) @@ -168,7 +168,7 @@ def install_step(self): cmd = "%s -x %s" % (makelocalrc_filename, compilers_subdir) else: cmd = "%s -x %s -g77 /" % (makelocalrc_filename, compilers_subdir) - run_cmd(cmd, log_all=True, simple=True) + run_shell_cmd(cmd) # If an OS libnuma is NOT found, makelocalrc creates symbolic links to libpgnuma.so # If we use the EB libnuma, delete those symbolic links to ensure they are not used