Skip to content

Commit bed8141

Browse files
author
Sergey Oblomov
committed
COMMON/UCX: rewording of hooks suggestion
- also updated output macro Signed-off-by: Sergey Oblomov <[email protected]> (cherry picked from commit c319cf9)
1 parent 14c271f commit bed8141

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

opal/mca/common/ucx/common_ucx.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,8 @@ void opal_common_ucx_mca_proc_added(void)
136136
{
137137
#if HAVE_DECL_UCM_TEST_EVENTS
138138
static int warned = 0;
139-
static char *mem_hooks_suggestion = "Try to add command line agrument "
140-
"'--mca opal_common_ucx_opal_mem_hooks 1' to resolve "
141-
"this issue.";
139+
static char *mem_hooks_suggestion = "Pls try adding --mca opal_common_ucx_opal_mem_hooks 1 "
140+
"to mpirun/oshrun command line to resolve this issue.";
142141
ucs_status_t status;
143142

144143
if (!warned) {

opal/mca/common/ucx/common_ucx.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,11 @@ BEGIN_C_DECLS
3939
#define MCA_COMMON_UCX_QUOTE(_x) \
4040
_MCA_COMMON_UCX_QUOTE(_x)
4141

42-
#define MCA_COMMON_UCX_ERROR(...) \
43-
opal_output_verbose(0, opal_common_ucx.output, \
44-
__FILE__ ":" MCA_COMMON_UCX_QUOTE(__LINE__) \
45-
" Error: " __VA_ARGS__)
46-
47-
#define MCA_COMMON_UCX_WARN(...) \
48-
opal_output_verbose(0, opal_common_ucx.output, \
49-
__FILE__ ":" MCA_COMMON_UCX_QUOTE(__LINE__) \
50-
" Warning: " __VA_ARGS__)
42+
#define MCA_COMMON_UCX_ERROR(...) \
43+
MCA_COMMON_UCX_VERBOSE(0, " Error: " __VA_ARGS__)
44+
45+
#define MCA_COMMON_UCX_WARN(...) \
46+
MCA_COMMON_UCX_VERBOSE(0, " Warning: " __VA_ARGS__)
5147

5248
#define MCA_COMMON_UCX_VERBOSE(_level, ... ) \
5349
if (((_level) <= MCA_COMMON_UCX_MAX_VERBOSE) && \

0 commit comments

Comments
 (0)