Skip to content
Snippets Groups Projects
Commit bb3ad08d authored by Damian Alvarez's avatar Damian Alvarez
Browse files

To make sure that mpicc (and family) actually uses intel compilers

parent 0174fb7d
No related branches found
No related tags found
No related merge requests found
...@@ -214,13 +214,13 @@ def parse_hook(ec, *args, **kwargs): ...@@ -214,13 +214,13 @@ def parse_hook(ec, *args, **kwargs):
installation_vetoer(ec) installation_vetoer(ec)
# Process compiler options # Process compiler options
ec = inject_compiler_features(ec) ec = inject_compiler_tweaks(ec)
# Process MPI options # Process MPI options
ec = inject_mpi_features(ec) ec = inject_mpi_tweaks(ec)
# Process UCX options # Process UCX options
ec = inject_ucx_features(ec) ec = inject_ucx_tweaks(ec)
# Change module name if applicable # Change module name if applicable
ec = inject_modaltsoftname(ec) ec = inject_modaltsoftname(ec)
...@@ -379,7 +379,7 @@ def inject_modaltsoftname(ec): ...@@ -379,7 +379,7 @@ def inject_modaltsoftname(ec):
return ec return ec
def inject_ucx_features(ec): def inject_ucx_tweaks(ec):
# UCX require to load UCX-settings # UCX require to load UCX-settings
ec_dict = ec.asdict() ec_dict = ec.asdict()
if ec.name in 'UCX' and install_path().lower().startswith('/p/software'): if ec.name in 'UCX' and install_path().lower().startswith('/p/software'):
...@@ -400,8 +400,11 @@ end ...@@ -400,8 +400,11 @@ end
return ec return ec
def inject_mpi_features(ec): def inject_mpi_tweaks(ec):
ec_dict = ec.asdict() ec_dict = ec.asdict()
if ec.name == 'impi':
ec['set_mpi_wrappers_all'] = 'True'
ec.log.info("[parse hook] Injecting set_mpi_wrappers_all = True ")
# MPIs are a family (in the Lmod sense) and require to load mpi-settings # MPIs are a family (in the Lmod sense) and require to load mpi-settings
if ec.name in SUPPORTED_MPIS and install_path().lower().startswith('/p/software'): if ec.name in SUPPORTED_MPIS and install_path().lower().startswith('/p/software'):
key = "modluafooter" key = "modluafooter"
...@@ -422,7 +425,7 @@ family("mpi") ...@@ -422,7 +425,7 @@ family("mpi")
return ec return ec
def inject_compiler_features(ec): def inject_compiler_tweaks(ec):
ec_dict = ec.asdict() ec_dict = ec.asdict()
# Compilers are are a family (in the Lmod sense) # Compilers are are a family (in the Lmod sense)
if ec.name in SUPPORTED_COMPILERS: if ec.name in SUPPORTED_COMPILERS:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment