From 5b25fe34d470f90c0552a9f35744c81ecf8041db Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 20 Dec 2024 19:28:45 -0700 Subject: [PATCH] All PRRTE master to build against PMIx v5 Signed-off-by: Ralph Castain --- src/mca/grpcomm/direct/grpcomm_direct.c | 3 ++- src/mca/grpcomm/direct/grpcomm_direct.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mca/grpcomm/direct/grpcomm_direct.c b/src/mca/grpcomm/direct/grpcomm_direct.c index 71c137bdf9..c8b5f951cd 100644 --- a/src/mca/grpcomm/direct/grpcomm_direct.c +++ b/src/mca/grpcomm/direct/grpcomm_direct.c @@ -70,13 +70,14 @@ static int init(void) PRTE_RML_RECV(PRTE_NAME_WILDCARD, PRTE_RML_TAG_FENCE_RELEASE, PRTE_RML_PERSISTENT, prte_grpcomm_direct_fence_release, NULL); +#if PMIX_NUMERIC_VERSION >= 0x00060000 /* group receives */ PRTE_RML_RECV(PRTE_NAME_WILDCARD, PRTE_RML_TAG_GROUP, PRTE_RML_PERSISTENT, prte_grpcomm_direct_grp_recv, NULL); PRTE_RML_RECV(PRTE_NAME_WILDCARD, PRTE_RML_TAG_GROUP_RELEASE, PRTE_RML_PERSISTENT, prte_grpcomm_direct_grp_release, NULL); - +#endif return PRTE_SUCCESS; } diff --git a/src/mca/grpcomm/direct/grpcomm_direct.h b/src/mca/grpcomm/direct/grpcomm_direct.h index ed334e7309..41fd90b7fd 100644 --- a/src/mca/grpcomm/direct/grpcomm_direct.h +++ b/src/mca/grpcomm/direct/grpcomm_direct.h @@ -193,6 +193,8 @@ int prte_grpcomm_direct_group(pmix_group_operation_t op, char *grpid, const pmix_info_t directives[], size_t ndirs, pmix_info_cbfunc_t cbfunc, void *cbdata); +#if PMIX_NUMERIC_VERSION >= 0x00060000 + PRTE_MODULE_EXPORT extern void prte_grpcomm_direct_grp_recv(int status, pmix_proc_t *sender, pmix_data_buffer_t *buffer, @@ -264,6 +266,7 @@ static inline void print_signature(prte_grpcomm_direct_group_signature_t *sig) pmix_output(0, "%s", tmp); free(tmp); } +#endif END_C_DECLS