Skip to content

Commit

Permalink
Merge pull request #3198 from branfosj/20240209144833_new_pr_nvhpc
Browse files Browse the repository at this point in the history
replace `run_cmd` with `run_shell_cmd` in custom easyblock for NVHPC (`nvhpc.py`)
  • Loading branch information
boegel authored Feb 12, 2024
2 parents e357013 + 994391b commit 219a1c9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions easybuild/easyblocks/n/nvhpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 219a1c9

Please sign in to comment.