Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Protect against PMIx v4.1.1-only definitions #1137

Merged
merged 1 commit into from
Nov 2, 2021
Merged

Protect against PMIx v4.1.1-only definitions #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ version 1.0.
+**** NOTE: As of v2.0.1, PRRTE no longer has a dependency on "pandoc"
+**** for building and installing man pages.

PR #1137: Protect against PMIx v4.1.1-only definitions
PR #1135: Final update v2.0.1 for rc3
- Show MCA base params in prte_info
- Silence variety of warnings
Expand Down
4 changes: 2 additions & 2 deletions config/prte_setup_pmix.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ AC_DEFUN([PRTE_CHECK_PMIX],[
AS_IF([test "x`ls $pmix_ext_install_dir/include/pmix_version.h 2> /dev/null`" = "x"],
[AC_MSG_RESULT([not found - assuming pre-v2.0])
AC_MSG_WARN([PRTE does not support PMIx versions])
AC_MSG_WARN([less than v4.01 as only PMIx-based tools can])
AC_MSG_WARN([less than v4.1.0 as only PMIx-based tools can])
AC_MSG_WARN([can connect to the server.])
AC_MSG_ERROR([Please select a newer version and configure again])],
[AC_MSG_RESULT([found])
Expand Down Expand Up @@ -156,7 +156,7 @@ AC_DEFUN([PRTE_CHECK_PMIX],[

AS_IF([test "$prte_external_pmix_version_found" = "0"],
[AC_MSG_WARN([PRTE does not support PMIx versions])
AC_MSG_WARN([less than v4.1 as only PMIx-based tools can])
AC_MSG_WARN([less than v4.1.0 as only PMIx-based tools can])
AC_MSG_WARN([can connect to the server.])
AC_MSG_ERROR([Please select a newer version and configure again])])

Expand Down
11 changes: 11 additions & 0 deletions src/pmix/pmix-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,17 @@ PRTE_EXPORT int prte_pmix_register_cleanup(char *path, bool directory, bool igno
#define PMIX_ERROR_LOG(r) \
prte_output(0, "[%s:%d] PMIx Error: %s", __FILE__, __LINE__, PMIx_Error_string((r)))

#ifndef PMIX_DATA_BUFFER_STATIC_INIT
#define PMIX_DATA_BUFFER_STATIC_INIT \
{ \
.base_ptr = NULL, \
.pack_ptr = NULL, \
.unpack_ptr = NULL, \
.bytes_allocated = 0, \
.bytes_used = 0 \
}
#endif

END_C_DECLS

#endif
2 changes: 2 additions & 0 deletions src/prted/pmix/pmix_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,7 @@ int pmix_server_init(void)
}
}

#ifdef PMIX_SINGLETON
/* if we were started to support a singleton, then let the server library know */
if (NULL != prte_pmix_server_globals.singleton) {
PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SINGLETON,
Expand All @@ -685,6 +686,7 @@ int pmix_server_init(void)
return rc;
}
}
#endif

/* if we are the MASTER, then we are the scheduler
* as well as a gateway */
Expand Down