Skip to content

Commit

Permalink
Merge pull request #3122 from branfosj/20240131181405_new_pr_imkl
Browse files Browse the repository at this point in the history
replace `run_cmd` with `run_shell_cmd` in custom easyblock for imkl (`imkl.py`)
  • Loading branch information
jfgrimm authored Feb 9, 2024
2 parents e3213bd + 711b44f commit d2226c9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions easybuild/easyblocks/i/imkl.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
from easybuild.tools.config import build_option
from easybuild.tools.filetools import apply_regex_substitutions, change_dir, mkdir, move_file, remove_dir, write_file
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_cmd
from easybuild.tools.run import run_shell_cmd
from easybuild.tools.systemtools import get_shared_lib_ext


Expand Down Expand Up @@ -298,8 +298,8 @@ def build_mkl_fftw_interfaces(self, libdir):
self.log.info("Changed to interface %s directory %s", lib, intdir)

fullcmd = "%s %s" % (cmd, ' '.join(buildopts + extraopts))
res = run_cmd(fullcmd, log_all=True, simple=True)
if not res:
res = run_shell_cmd(fullcmd)
if res.exit_code:
raise EasyBuildError("Building %s (flags: %s, fullcmd: %s) failed", lib, flags, fullcmd)

for fn in os.listdir(tmpbuild):
Expand Down Expand Up @@ -344,8 +344,8 @@ def build_mkl_flexiblas(self, flexiblasdir):
'intel_thread parallel=intel SYSTEM_LIBS="-lm -ldl -L%s"' % compilerdir]]

for cmd in cmds:
res = run_cmd(cmd, log_all=True, simple=True)
if not res:
res = run_shell_cmd(cmd)
if res.exit_code:
raise EasyBuildError("Building FlexiBLAS-compatible library (cmd: %s) failed", cmd)

def post_install_step(self):
Expand All @@ -359,7 +359,7 @@ def post_install_step(self):
if os.path.exists(examples_subdir):
cwd = change_dir(examples_subdir)
for examples_tarball in glob.glob('examples_*.tgz'):
run_cmd("tar xvzf %s -C ." % examples_tarball)
run_shell_cmd("tar xvzf %s -C ." % examples_tarball)
change_dir(cwd)

# reload the dependencies
Expand Down

0 comments on commit d2226c9

Please sign in to comment.