-
-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #182 from minrk/mpiexec-timeout
backport patch fixing MPIEXEC_TIMEOUT support
- Loading branch information
Showing
3 changed files
with
51 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
From 5e3e8bf91d47db5134d73004a12dbe16984a461c Mon Sep 17 00:00:00 2001 | ||
From: Min RK <benjaminrk@gmail.com> | ||
Date: Tue, 1 Oct 2024 11:49:36 +0200 | ||
Subject: [PATCH] 3.0: fix support for MPIEXEC_TIMEOUT | ||
|
||
linter fix for comparison of int to uint resulted in MPIEXEC_TIMEOUT env being ignored | ||
|
||
--- | ||
src/tools/prte/prte.c | 8 ++++---- | ||
1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/3rd-party/prrte/src/tools/prte/prte.c b/3rd-party/prrte/src/tools/prte/prte.c | ||
index 62ff748566..5c1b7473cc 100644 | ||
--- a/3rd-party/prrte/src/tools/prte/prte.c | ||
+++ b/3rd-party/prrte/src/tools/prte/prte.c | ||
@@ -256,7 +256,7 @@ int main(int argc, char *argv[]) | ||
pmix_info_t *iptr, *iptr2, info; | ||
pmix_status_t ret; | ||
bool flag; | ||
- size_t n, m, ninfo, param_len; | ||
+ size_t n, ninfo, param_len; | ||
pmix_app_t *papps; | ||
size_t napps; | ||
mylock_t mylock; | ||
@@ -1085,11 +1085,11 @@ int main(int argc, char *argv[]) | ||
opt = pmix_cmd_line_get_param(&results, PRTE_CLI_TIMEOUT); | ||
if (NULL != opt || NULL != (timeoutenv = getenv("MPIEXEC_TIMEOUT"))) { | ||
if (NULL != timeoutenv) { | ||
- m = strtoul(timeoutenv, NULL, 10); | ||
+ i = strtol(timeoutenv, NULL, 10); | ||
/* both cannot be present, or they must agree */ | ||
if (NULL != opt) { | ||
- n = strtoul(opt->values[0], NULL, 10); | ||
- if (m != n) { | ||
+ n = strtol(opt->values[0], NULL, 10); | ||
+ if (i != (int)n) { | ||
pmix_show_help("help-prun.txt", "prun:timeoutconflict", false, | ||
prte_tool_basename, n, timeoutenv); | ||
PRTE_UPDATE_EXIT_STATUS(1); | ||
-- | ||
2.45.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters