Skip to content

Commit ee6fca8

Browse files
authored
Merge pull request #2087 from willend/main
Implement env var to override mpirun setting
2 parents 14368cd + 3aaea80 commit ee6fca8

File tree

3 files changed

+5
-273
lines changed

3 files changed

+5
-273
lines changed

tools/Python/mccodelib/mccode_config.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

tools/Python/mccodelib/mccode_config.py

Lines changed: 0 additions & 232 deletions
This file was deleted.

tools/Python/mccodelib/mccode_config.py.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ def check_env_vars():
2121
MCCODE_CFLAGS_OVERRIDE = configuration["MCCODE"].upper() + '_CFLAGS_OVERRIDE'
2222
MCCODE_CC_OVERRIDE = configuration["MCCODE"].upper() + '_CC_OVERRIDE'
2323
MCCODE_MPICC_OVERRIDE = configuration["MCCODE"].upper() + '_MPICC_OVERRIDE'
24+
MCCODE_MPIRUN_OVERRIDE = configuration["MCCODE"].upper() + '_MPIRUN_OVERRIDE'
2425

25-
# MCCODE_LIB_DIR
26+
# MCCODE_LIB_DIR
2627
if os.getenv(MCCODE_OVERRIDE) is not None:
2728
configuration['MCCODE_LIB_DIR'] = os.getenv(MCCODE_OVERRIDE)
2829
# CFLAGS
@@ -34,6 +35,9 @@ def check_env_vars():
3435
# MPICC
3536
if os.getenv(MCCODE_MPICC_OVERRIDE) is not None:
3637
compilation['MPICC'] = os.getenv(MCCODE_MPICC_OVERRIDE)
38+
# MPIRUN
39+
if os.getenv(MCCODE_MPIRUN_OVERRIDE) is not None:
40+
compilation['MPIRUN'] = os.getenv(MCCODE_MPIRUN_OVERRIDE)
3741

3842
def load_config(path=None):
3943
''' loads a json user config to the dictionaries in this module '''

0 commit comments

Comments
 (0)