From 5ffad78b87b438e6ee397c27e47fc04f294ec161 Mon Sep 17 00:00:00 2001 From: Balazs Gerofi Date: Wed, 12 Aug 2020 07:27:00 +0900 Subject: [PATCH] mcexec: use FLIB_NUM_PROCESS_ON_NODE when -n not specified (Fugaku specific) Change-Id: I1668fecfac692d56076dd10e6e03fbf992e323ec --- executer/user/mcexec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/executer/user/mcexec.c b/executer/user/mcexec.c index b86c797d..eb3961da 100644 --- a/executer/user/mcexec.c +++ b/executer/user/mcexec.c @@ -2444,6 +2444,13 @@ int main(int argc, char **argv) } } + /* Fugaku: use FLIB_NUM_PROCESS_ON_NODE if -n is not specified */ + if (getenv("FLIB_NUM_PROCESS_ON_NODE") && nr_processes == 0) { + nr_processes = atoi(getenv("FLIB_NUM_PROCESS_ON_NODE")); + __dprintf("%s: using FLIB_NUM_PROCESS_ON_NODE: %d\n", + __func__, nr_processes); + } + if (nr_processes > ncpu) { fprintf(stderr, "error: nr_processes can't exceed nr. of CPUs\n"); return EINVAL; @@ -2572,9 +2579,10 @@ int main(int argc, char **argv) desc->cpu = target_core; desc->process_rank = process_rank; + /* Fugaku specific: Fujitsu node-local rank */ - if (getenv("PLE_RANK_ON_NODE")) { - desc->process_rank = atoi(getenv("PLE_RANK_ON_NODE")); + if (getenv("FLIB_RANK_ON_NODE")) { + desc->process_rank = atoi(getenv("FLIB_RANK_ON_NODE")); __dprintf("%s: rank: %d, target CPU: %d\n", __func__, desc->process_rank, desc->cpu); }