Compare commits

..

2 Commits

Author SHA1 Message Date
0de6c6b8f9 spec: prerelase 0.91 for testing removal of mcexec -n option
Change-Id: I2b18b5fefec570bfb7a4aa0823fe97d9ea93e208
2020-08-12 13:12:06 +09:00
5ffad78b87 mcexec: use FLIB_NUM_PROCESS_ON_NODE when -n not specified (Fugaku specific)
Change-Id: I1668fecfac692d56076dd10e6e03fbf992e323ec
2020-08-12 07:30:11 +09:00
2 changed files with 11 additions and 3 deletions

View File

@ -10,7 +10,7 @@ project(mckernel C ASM)
set(MCKERNEL_VERSION "1.7.0")
# See "Fedora Packaging Guidlines -- Versioning"
set(MCKERNEL_RELEASE "0.9")
set(MCKERNEL_RELEASE "0.91")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
# for rpmbuild

View File

@ -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);
}