Skip to content

Commit 9831145

Browse files
author
Ralph Castain
authored
Merge pull request #5427 from rhc54/topic/px
Remove the PMIx ext4x component
2 parents 9a5fd48 + 4a596d3 commit 9831145

File tree

11 files changed

+3
-6293
lines changed

11 files changed

+3
-6293
lines changed

config/opal_check_pmi.m4

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -338,25 +338,11 @@ AC_DEFUN([OPAL_CHECK_PMIX],[
338338
# if it does exist, then we need to parse it to find
339339
# the actual release series
340340
AS_IF([test "$opal_external_pmix_version_found" = "0"],
341-
[AC_MSG_CHECKING([version 4x])
341+
[AC_MSG_CHECKING([version 3x or above])
342342
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
343343
#include <pmix_version.h>
344-
#if (PMIX_VERSION_MAJOR != 4L)
345-
#error "not version 4"
346-
#endif
347-
], [])],
348-
[AC_MSG_RESULT([found])
349-
opal_external_pmix_version=4x
350-
opal_external_pmix_version_found=1
351-
opal_external_pmix_happy=yes],
352-
[AC_MSG_RESULT([not found])])])
353-
354-
AS_IF([test "$opal_external_pmix_version_found" = "0"],
355-
[AC_MSG_CHECKING([version 3x])
356-
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
357-
#include <pmix_version.h>
358-
#if (PMIX_VERSION_MAJOR != 3L)
359-
#error "not version 3"
344+
#if (PMIX_VERSION_MAJOR < 3L)
345+
#error "not version 3 or above"
360346
#endif
361347
], [])],
362348
[AC_MSG_RESULT([found])

opal/mca/pmix/ext4x/Makefile.am

Lines changed: 0 additions & 54 deletions
This file was deleted.

opal/mca/pmix/ext4x/configure.m4

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)