Skip to content

Commit 8d12bb2

Browse files
ggouaillardetggouaillardet
authored
Merge pull request #6408 from ggouaillardet/topic/orte_cleanup
Misc ORTE related cleanups
2 parents 18f679e + ad114be commit 8d12bb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+284
-276
lines changed

‎autogen.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# Copyright (c) 2013 Mellanox Technologies, Inc.
66
# All rights reserved.
77
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
8-
# Copyright (c) 2015-2016 Research Organization for Information Science
9-
# and Technology (RIST). All rights reserved.
8+
# Copyright (c) 2015-2019 Research Organization for Information Science
9+
# and Technology (RIST). All rights reserved.
1010
# Copyright (c) 2015 IBM Corporation. All rights reserved.
1111
#
1212
# $COPYRIGHT$
@@ -1347,7 +1347,7 @@ sub in_tarball {
13471347
push(@{$projects}, { name => "ompi", dir => "ompi", need_base => 1 })
13481348
if (!$no_ompi_arg);
13491349
push(@{$projects}, { name => "oshmem", dir => "oshmem", need_base => 1 })
1350-
if (!$no_ompi_arg && !$no_orte_arg && !$no_oshmem_arg);
1350+
if (!$no_ompi_arg && !$no_oshmem_arg);
13511351
push(@{$projects}, { name => "orcm", dir => "orcm", need_base => 1 })
13521352
if (-e "orcm");
13531353

‎ompi/mca/rte/orte/Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# All rights reserved.
44
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
55
# Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
6+
# Copyright (c) 2019 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
68
# $COPYRIGHT$
79
#
810
# Additional copyrights may follow
@@ -31,6 +33,7 @@ libmca_rte_orte_la_LIBADD = $(top_builddir)/orte/lib@ORTE_LIB_PREFIX@open-rte.la
3133
man_pages = mpirun.1 mpiexec.1 ompi-clean.1 ompi-server.1
3234

3335
if OPAL_INSTALL_BINARIES
36+
if PROJECT_ORTE
3437
nodist_man_MANS = $(man_pages)
3538

3639
install-exec-hook:
@@ -45,6 +48,7 @@ uninstall-local:
4548
$(DESTDIR)$(bindir)/ompi-clean$(EXEEXT) \
4649
$(DESTDIR)$(bindir)/ompi-server$(EXEEXT)
4750

51+
endif # PROJECT_ORTE
4852
endif # OPAL_INSTALL_BINARIES
4953

5054
$(top_builddir)/orte/tools/orterun/orterun.1:

‎ompi/mca/rte/orte/configure.m4

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
#
33
# Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved.
44
# Copyright (c) 2013 Sandia National Laboratories. All rights reserved.
5-
#
65
# Copyright (c) 2017 Intel, Inc. All rights reserved.
6+
# Copyright (c) 2019 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -36,13 +37,16 @@ AC_DEFUN([MCA_ompi_rte_orte_POST_CONFIG],[
3637
AC_DEFUN([MCA_ompi_rte_orte_CONFIG],[
3738
AC_CONFIG_FILES([ompi/mca/rte/orte/Makefile])
3839

39-
# This will need to get more complicated when we can build against
40-
# an external ORTE.
41-
AC_ARG_WITH([orte],
42-
AC_HELP_STRING([--with-orte],
43-
[Use ORTE run-time environment (default: yes)]))
44-
AS_IF([test "$with_orte" != "no"],
45-
[$1],
46-
[AC_MSG_NOTICE([ORTE disabled by user])
47-
$2])
40+
m4_ifdef([project_orte],
41+
[# This will need to get more complicated when we can build against
42+
# an external ORTE.
43+
AC_ARG_WITH([orte],
44+
AC_HELP_STRING([--with-orte],
45+
[Use ORTE run-time environment (default: yes)]))
46+
AS_IF([test "$with_orte" != "no"],
47+
[$1],
48+
[AC_MSG_NOTICE([ORTE disabled by user])
49+
$2])
50+
],
51+
[$2])
4852
])

‎ompi/mca/rte/pmix/configure.m4

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
#
33
# Copyright (c) 2012 Los Alamos National Security, LLC. All rights reserved.
44
# Copyright (c) 2013 Sandia National Laboratories. All rights reserved.
5-
#
65
# Copyright (c) 2017 Intel, Inc. All rights reserved.
6+
# Copyright (c) 2019 Research Organization for Information Science
7+
# and Technology (RIST). All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -35,11 +36,13 @@ AC_DEFUN([MCA_ompi_rte_pmix_POST_CONFIG],[
3536
AC_DEFUN([MCA_ompi_rte_pmix_CONFIG],[
3637
AC_CONFIG_FILES([ompi/mca/rte/pmix/Makefile])
3738

38-
AC_ARG_WITH([ompi-pmix-rte],
39-
AC_HELP_STRING([--with-ompi-pmix-rte],
40-
[Use PMIx as the OMPI run-time environment (default: no)]))
41-
AS_IF([test "$with_ompi_pmix_rte" == "yes"],
42-
[$1
43-
AC_MSG_NOTICE([PMIx RTE selected by user])],
44-
[$2])
39+
m4_ifdef([project_orte],
40+
[AC_ARG_WITH([ompi-pmix-rte],
41+
AC_HELP_STRING([--with-ompi-pmix-rte],
42+
[Use PMIx as the OMPI run-time environment (default: no)]))
43+
AS_IF([test "$with_ompi_pmix_rte" == "yes"],
44+
[$1
45+
AC_MSG_NOTICE([PMIx RTE selected by user])],
46+
[$2])],
47+
[$1])
4548
])

‎ompi/mca/rte/pmix/rte_pmix_module.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
1111
* Copyright (c) 2018 Triad National Security, LLC. All rights
1212
* reserved.
13+
* Copyright (c) 2019 Research Organization for Information Science
14+
* and Technology (RIST). All rights reserved.
1315
* $COPYRIGHT$
1416
*/
1517
#include "ompi_config.h"
@@ -758,12 +760,12 @@ int ompi_rte_init(int *pargc, char ***pargv)
758760
return OPAL_SUCCESS;
759761

760762
error:
761-
opal_show_help_finalize();
762763
if (OPAL_ERR_SILENT != ret ) {
763764
opal_show_help("help-ompi-rte-pmix.txt",
764765
"internal-failure",
765766
true, error, opal_strerror(ret), ret);
766767
}
768+
opal_finalize();
767769
return ret;
768770

769771
}

‎oshmem/include/oshmem/constants.h

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
* Copyright (c) 2013 Mellanox Technologies, Inc.
33
* All rights reserved.
4+
* Copyright (c) 2019 Research Organization for Information Science
5+
* and Technology (RIST). All rights reserved.
46
* $COPYRIGHT$
57
*
68
* Additional copyrights may follow
@@ -11,60 +13,61 @@
1113
#ifndef OSHMEM_CONSTANTS_H
1214
#define OSHMEM_CONSTANTS_H
1315

14-
#include "orte/constants.h"
16+
#include "opal/constants.h"
17+
1518
#include "oshmem/include/shmem.h"
1619

1720

18-
#define OSHMEM_ERR_BASE ORTE_ERR_MAX
21+
#define OSHMEM_ERR_BASE OPAL_ERR_MAX
1922

2023
/* error codes */
2124
enum {
22-
/* Error codes inherited from ORTE/OPAL. Still enum values so
25+
/* Error codes inherited from OPAL. Still enum values so
2326
that we might get nice debugger help */
24-
OSHMEM_SUCCESS = ORTE_SUCCESS,
25-
26-
OSHMEM_ERROR = ORTE_ERROR,
27-
OSHMEM_ERR_OUT_OF_RESOURCE = ORTE_ERR_OUT_OF_RESOURCE,
28-
OSHMEM_ERR_TEMP_OUT_OF_RESOURCE = ORTE_ERR_TEMP_OUT_OF_RESOURCE,
29-
OSHMEM_ERR_RESOURCE_BUSY = ORTE_ERR_RESOURCE_BUSY,
30-
OSHMEM_ERR_BAD_PARAM = ORTE_ERR_BAD_PARAM,
31-
OSHMEM_ERR_FATAL = ORTE_ERR_FATAL,
32-
OSHMEM_ERR_NOT_IMPLEMENTED = ORTE_ERR_NOT_IMPLEMENTED,
33-
OSHMEM_ERR_NOT_SUPPORTED = ORTE_ERR_NOT_SUPPORTED,
34-
OSHMEM_ERR_INTERUPTED = ORTE_ERR_INTERUPTED,
35-
OSHMEM_ERR_WOULD_BLOCK = ORTE_ERR_WOULD_BLOCK,
36-
OSHMEM_ERR_IN_ERRNO = ORTE_ERR_IN_ERRNO,
37-
OSHMEM_ERR_UNREACH = ORTE_ERR_UNREACH,
38-
OSHMEM_ERR_NOT_FOUND = ORTE_ERR_NOT_FOUND,
39-
OSHMEM_EXISTS = ORTE_EXISTS, /* indicates that the specified object already exists */
40-
OSHMEM_ERR_TIMEOUT = ORTE_ERR_TIMEOUT,
41-
OSHMEM_ERR_NOT_AVAILABLE = ORTE_ERR_NOT_AVAILABLE,
42-
OSHMEM_ERR_PERM = ORTE_ERR_PERM,
43-
OSHMEM_ERR_VALUE_OUT_OF_BOUNDS = ORTE_ERR_VALUE_OUT_OF_BOUNDS,
44-
OSHMEM_ERR_FILE_READ_FAILURE = ORTE_ERR_FILE_READ_FAILURE,
45-
OSHMEM_ERR_FILE_WRITE_FAILURE = ORTE_ERR_FILE_WRITE_FAILURE,
46-
OSHMEM_ERR_FILE_OPEN_FAILURE = ORTE_ERR_FILE_OPEN_FAILURE,
47-
48-
OSHMEM_ERR_RECV_LESS_THAN_POSTED = ORTE_ERR_RECV_LESS_THAN_POSTED,
49-
OSHMEM_ERR_RECV_MORE_THAN_POSTED = ORTE_ERR_RECV_MORE_THAN_POSTED,
50-
OSHMEM_ERR_NO_MATCH_YET = ORTE_ERR_NO_MATCH_YET,
51-
OSHMEM_ERR_BUFFER = ORTE_ERR_BUFFER,
52-
OSHMEM_ERR_REQUEST = ORTE_ERR_REQUEST,
53-
OSHMEM_ERR_NO_CONNECTION_ALLOWED = ORTE_ERR_NO_CONNECTION_ALLOWED,
54-
OSHMEM_ERR_CONNECTION_REFUSED = ORTE_ERR_CONNECTION_REFUSED ,
55-
OSHMEM_ERR_CONNECTION_FAILED = ORTE_ERR_CONNECTION_FAILED,
56-
OSHMEM_PACK_MISMATCH = ORTE_ERR_PACK_MISMATCH,
57-
OSHMEM_ERR_PACK_FAILURE = ORTE_ERR_PACK_FAILURE,
58-
OSHMEM_ERR_UNPACK_FAILURE = ORTE_ERR_UNPACK_FAILURE,
59-
OSHMEM_ERR_COMM_FAILURE = ORTE_ERR_COMM_FAILURE,
60-
OSHMEM_UNPACK_INADEQUATE_SPACE = ORTE_ERR_UNPACK_INADEQUATE_SPACE,
61-
OSHMEM_UNPACK_READ_PAST_END_OF_BUFFER = ORTE_ERR_UNPACK_READ_PAST_END_OF_BUFFER,
62-
OSHMEM_ERR_TYPE_MISMATCH = ORTE_ERR_TYPE_MISMATCH,
63-
OSHMEM_ERR_COMPARE_FAILURE = ORTE_ERR_COMPARE_FAILURE,
64-
OSHMEM_ERR_COPY_FAILURE = ORTE_ERR_COPY_FAILURE,
65-
OSHMEM_ERR_UNKNOWN_DATA_TYPE = ORTE_ERR_UNKNOWN_DATA_TYPE,
66-
OSHMEM_ERR_DATA_TYPE_REDEF = ORTE_ERR_DATA_TYPE_REDEF,
67-
OSHMEM_ERR_DATA_OVERWRITE_ATTEMPT = ORTE_ERR_DATA_OVERWRITE_ATTEMPT
27+
OSHMEM_SUCCESS = OPAL_SUCCESS,
28+
29+
OSHMEM_ERROR = OPAL_ERROR,
30+
OSHMEM_ERR_OUT_OF_RESOURCE = OPAL_ERR_OUT_OF_RESOURCE,
31+
OSHMEM_ERR_TEMP_OUT_OF_RESOURCE = OPAL_ERR_TEMP_OUT_OF_RESOURCE,
32+
OSHMEM_ERR_RESOURCE_BUSY = OPAL_ERR_RESOURCE_BUSY,
33+
OSHMEM_ERR_BAD_PARAM = OPAL_ERR_BAD_PARAM,
34+
OSHMEM_ERR_FATAL = OPAL_ERR_FATAL,
35+
OSHMEM_ERR_NOT_IMPLEMENTED = OPAL_ERR_NOT_IMPLEMENTED,
36+
OSHMEM_ERR_NOT_SUPPORTED = OPAL_ERR_NOT_SUPPORTED,
37+
OSHMEM_ERR_INTERUPTED = OPAL_ERR_INTERRUPTED,
38+
OSHMEM_ERR_WOULD_BLOCK = OPAL_ERR_WOULD_BLOCK,
39+
OSHMEM_ERR_IN_ERRNO = OPAL_ERR_IN_ERRNO,
40+
OSHMEM_ERR_UNREACH = OPAL_ERR_UNREACH,
41+
OSHMEM_ERR_NOT_FOUND = OPAL_ERR_NOT_FOUND,
42+
OSHMEM_EXISTS = OPAL_EXISTS, /* indicates that the specified object already exists */
43+
OSHMEM_ERR_TIMEOUT = OPAL_ERR_TIMEOUT,
44+
OSHMEM_ERR_NOT_AVAILABLE = OPAL_ERR_NOT_AVAILABLE,
45+
OSHMEM_ERR_PERM = OPAL_ERR_PERM,
46+
OSHMEM_ERR_VALUE_OUT_OF_BOUNDS = OPAL_ERR_VALUE_OUT_OF_BOUNDS,
47+
OSHMEM_ERR_FILE_READ_FAILURE = OPAL_ERR_FILE_READ_FAILURE,
48+
OSHMEM_ERR_FILE_WRITE_FAILURE = OPAL_ERR_FILE_WRITE_FAILURE,
49+
OSHMEM_ERR_FILE_OPEN_FAILURE = OPAL_ERR_FILE_OPEN_FAILURE,
50+
51+
OSHMEM_ERR_RECV_LESS_THAN_POSTED = (OSHMEM_ERR_BASE - 1),
52+
OSHMEM_ERR_RECV_MORE_THAN_POSTED = (OSHMEM_ERR_BASE - 2),
53+
OSHMEM_ERR_NO_MATCH_YET = (OSHMEM_ERR_BASE - 3),
54+
OSHMEM_ERR_BUFFER = OPAL_ERR_BUFFER,
55+
OSHMEM_ERR_REQUEST = (OSHMEM_ERR_BASE - 4),
56+
OSHMEM_ERR_NO_CONNECTION_ALLOWED = (OSHMEM_ERR_BASE - 5),
57+
OSHMEM_ERR_CONNECTION_REFUSED = (OSHMEM_ERR_BASE - 6),
58+
OSHMEM_ERR_CONNECTION_FAILED = OPAL_ERR_CONNECTION_FAILED,
59+
OSHMEM_PACK_MISMATCH = OPAL_ERR_PACK_MISMATCH,
60+
OSHMEM_ERR_PACK_FAILURE = OPAL_ERR_PACK_FAILURE,
61+
OSHMEM_ERR_UNPACK_FAILURE = OPAL_ERR_UNPACK_FAILURE,
62+
OSHMEM_ERR_COMM_FAILURE = OPAL_ERR_COMM_FAILURE,
63+
OSHMEM_UNPACK_INADEQUATE_SPACE = OPAL_ERR_UNPACK_INADEQUATE_SPACE,
64+
OSHMEM_UNPACK_READ_PAST_END_OF_BUFFER = OPAL_ERR_UNPACK_READ_PAST_END_OF_BUFFER,
65+
OSHMEM_ERR_TYPE_MISMATCH = OPAL_ERR_TYPE_MISMATCH,
66+
OSHMEM_ERR_COMPARE_FAILURE = (OSHMEM_ERR_BASE - 9),
67+
OSHMEM_ERR_COPY_FAILURE = (OSHMEM_ERR_BASE - 10),
68+
OSHMEM_ERR_UNKNOWN_DATA_TYPE = OPAL_ERR_UNKNOWN_DATA_TYPE,
69+
OSHMEM_ERR_DATA_TYPE_REDEF = OPAL_ERR_DATA_TYPE_REDEF,
70+
OSHMEM_ERR_DATA_OVERWRITE_ATTEMPT = OPAL_ERR_DATA_OVERWRITE_ATTEMPT
6871
};
6972

7073

‎oshmem/info/info.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright (c) 2015 Mellanox Technologies, Inc.
33
* All rights reserved.
44
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
5+
* Copyright (c) 2019 Research Organization for Information Science
6+
* and Technology (RIST). All rights reserved.
57
* $COPYRIGHT$
68
*
79
* Additional copyrights may follow
@@ -15,13 +17,13 @@
1517
#include <string.h>
1618
#include <errno.h>
1719

18-
#include "orte/runtime/orte_globals.h"
19-
#include "orte/util/show_help.h"
20-
2120
#include "opal/util/opal_environ.h"
21+
#include "opal/util/show_help.h"
2222
#include "opal/util/output.h"
2323
#include "opal/util/printf.h"
2424

25+
#include "ompi/mca/rte/rte.h"
26+
2527
#include "oshmem/version.h"
2628
#include "oshmem/constants.h"
2729
#include "oshmem/info/info.h"
@@ -65,15 +67,15 @@ int oshmem_info_init(void)
6567
goto out;
6668
}
6769
}
68-
if (oshmem_shmem_info_env.print_version && 0 == ORTE_PROC_MY_NAME->vpid) {
70+
if (oshmem_shmem_info_env.print_version && 0 == OMPI_PROC_MY_NAME->vpid) {
6971
char version[OSHMEM_MAX_LIBRARY_VERSION_STRING];
7072
int len;
7173

7274
ret = oshmem_info_get_library_version(version, &len);
7375
if (OSHMEM_SUCCESS != ret || 0 == len) {
7476
goto out;
7577
}
76-
orte_show_help("help-shmem-runtime.txt",
78+
opal_show_help("help-shmem-runtime.txt",
7779
"oshmem_init:print-version",
7880
true,
7981
version);
@@ -85,8 +87,8 @@ int oshmem_info_init(void)
8587
goto out;
8688
}
8789
}
88-
if (oshmem_shmem_info_env.print_info && 0 == ORTE_PROC_MY_NAME->vpid) {
89-
orte_show_help("help-shmem-runtime.txt",
90+
if (oshmem_shmem_info_env.print_info && 0 == OMPI_PROC_MY_NAME->vpid) {
91+
opal_show_help("help-shmem-runtime.txt",
9092
"oshmem_init:print-info",
9193
true,
9294
OSHMEM_ENV_VERSION,

‎oshmem/mca/memheap/base/memheap_base_mkey.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/*
33
* Copyright (c) 2013-2015 Mellanox Technologies, Inc.
44
* All rights reserved.
5-
* Copyright (c) 2015-2016 Research Organization for Information Science
6-
* and Technology (RIST). All rights reserved.
5+
* Copyright (c) 2015-2019 Research Organization for Information Science
6+
* and Technology (RIST). All rights reserved.
77
* Copyright (c) 2015 Intel, Inc. All rights reserved.
88
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
99
* reserved.
@@ -202,7 +202,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
202202
MEMHEAP_VERBOSE(5, "unpacking %d of %d", cnt, OPAL_UINT8);
203203
rc = opal_dss.unpack(buffer, &msg_type, &cnt, OPAL_UINT8);
204204
if (OPAL_SUCCESS != rc) {
205-
ORTE_ERROR_LOG(rc);
205+
OMPI_ERROR_LOG(rc);
206206
goto send_fail;
207207
}
208208

@@ -219,7 +219,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
219219
msg = OBJ_NEW(opal_buffer_t);
220220
if (!msg) {
221221
MEMHEAP_ERROR("failed to get msg buffer");
222-
ORTE_ERROR_LOG(rc);
222+
OMPI_ERROR_LOG(rc);
223223
return;
224224
}
225225

@@ -234,7 +234,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
234234
rc = send_buffer(source_pe, msg);
235235
if (MPI_SUCCESS != rc) {
236236
MEMHEAP_ERROR("FAILED to send rml message %d", rc);
237-
ORTE_ERROR_LOG(rc);
237+
OMPI_ERROR_LOG(rc);
238238
goto send_fail;
239239
}
240240
break;
@@ -264,7 +264,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
264264
send_fail: msg = OBJ_NEW(opal_buffer_t);
265265
if (!msg) {
266266
MEMHEAP_ERROR("failed to get msg buffer");
267-
ORTE_ERROR_LOG(rc);
267+
OMPI_ERROR_LOG(rc);
268268
return;
269269
}
270270
msg_type = MEMHEAP_RKEY_RESP_FAIL;
@@ -273,7 +273,7 @@ static void do_recv(int source_pe, opal_buffer_t* buffer)
273273
rc = send_buffer(source_pe, msg);
274274
if (MPI_SUCCESS != rc) {
275275
MEMHEAP_ERROR("FAILED to send rml message %d", rc);
276-
ORTE_ERROR_LOG(rc);
276+
OMPI_ERROR_LOG(rc);
277277
}
278278

279279
}
@@ -340,14 +340,14 @@ static int oshmem_mkey_recv_cb(void)
340340
tmp_buf = malloc(size);
341341
if (NULL == tmp_buf) {
342342
MEMHEAP_ERROR("not enough memory");
343-
ORTE_ERROR_LOG(0);
343+
OMPI_ERROR_LOG(0);
344344
return n;
345345
} else {
346346
memcpy(tmp_buf, (void*)&r->buf, size);
347347
msg = OBJ_NEW(opal_buffer_t);
348348
if (NULL == msg) {
349349
MEMHEAP_ERROR("not enough memory");
350-
ORTE_ERROR_LOG(0);
350+
OMPI_ERROR_LOG(0);
351351
free(tmp_buf);
352352
return n;
353353
}
@@ -366,7 +366,7 @@ static int oshmem_mkey_recv_cb(void)
366366
rc = PMPI_Start(&r->recv_req);
367367
if (MPI_SUCCESS != rc) {
368368
MEMHEAP_ERROR("Failed to post recv request %d", rc);
369-
ORTE_ERROR_LOG(rc);
369+
OMPI_ERROR_LOG(rc);
370370
return n;
371371
}
372372
opal_list_append(&memheap_oob.req_list, &r->super);

0 commit comments

Comments
 (0)