Cleanup pmix selection check

Ralph Castain · Ralph Castain · commit 55cefedf9b8d · 2018-07-25T16:11:32.000-07:00
Allow for versions &gt; 3

Signed-off-by: Ralph Castain &lt;rhc@open-mpi.org&gt;
diff --git a/opal/mca/pmix/ext2x/ext2x_component.c b/opal/mca/pmix/ext2x/ext2x_component.c
@@ -118,12 +118,12 @@ static int external_open(void)
     OBJ_CONSTRUCT(&mca_pmix_ext2x_component.dmdx, opal_list_t);
 
     version = PMIx_Get_version();
-    if ('2' != version[0]) {
+    if ('2' >= version[0]) {
         opal_show_help("help-pmix-base.txt",
                        "incorrect-pmix", true, version, "v2.x");
         return OPAL_ERROR;
     }
-    if (0 == strncmp(version, "2.1", 3)) {
+    if (0 != strncmp(version, "2.0", 3)) {
         mca_pmix_ext2x_component.legacy_get = false;
     }
 
diff --git a/opal/mca/pmix/pmix3x/pmix3x_component.c b/opal/mca/pmix/pmix3x/pmix3x_component.c
@@ -118,7 +118,7 @@ static int external_open(void)
     OBJ_CONSTRUCT(&mca_pmix_pmix3x_component.dmdx, opal_list_t);
 
     version = PMIx_Get_version();
-    if ('3' != version[0]) {
+    if ('3' >= version[0]) {
         opal_show_help("help-pmix-base.txt",
                        "incorrect-pmix", true, version, "v3.x");
         return OPAL_ERROR;

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,12 @@ static int external_open(void)`
`118`	`118`	`OBJ_CONSTRUCT(&mca_pmix_ext2x_component.dmdx, opal_list_t);`
`119`	`119`
`120`	`120`	`version = PMIx_Get_version();`
`121`		`- if ('2' != version[0]) {`
	`121`	`+ if ('2' >= version[0]) {`
`122`	`122`	`opal_show_help("help-pmix-base.txt",`
`123`	`123`	`"incorrect-pmix", true, version, "v2.x");`
`124`	`124`	`return OPAL_ERROR;`
`125`	`125`	`}`
`126`		`- if (0 == strncmp(version, "2.1", 3)) {`
	`126`	`+ if (0 != strncmp(version, "2.0", 3)) {`
`127`	`127`	`mca_pmix_ext2x_component.legacy_get = false;`
`128`	`128`	`}`
`129`	`129`