Skip to content

Commit d83d2be

Browse files
author
Ralph Castain
authored
Merge pull request #4758 from rhc54/topic/sync
Refresh ORTE PMIx support
2 parents ebffade + a17df81 commit d83d2be

File tree

126 files changed

+4423
-1164
lines changed

Some content is hidden

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

126 files changed

+4423
-1164
lines changed

‎opal/mca/pmix/base/base.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
2+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
33
* $COPYRIGHT$
44
*
55
* Additional copyrights may follow

‎opal/mca/pmix/base/help-pmix-base.txt‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
55
# reserved.
66
#
7+
# Copyright (c) 2016-2018 Intel, Inc. All rights reserved.
78
# $COPYRIGHT$
89
#
910
# Additional copyrights may follow
@@ -14,7 +15,23 @@
1415
#
1516
[pmix2-init-failed]
1617
PMI2_Init failed to intialize. Return code: %d
17-
18+
#
1819
[pmix2-init-returned-bad-values]
1920
PMI2_Init was intialized but negative values for job size and/or
2021
rank was returned.
22+
#
23+
[old-pmix]
24+
A version of PMIx was detected that is too old:
25+
26+
Version: %s
27+
Min version: %s
28+
29+
Please reconfigure against an updated version of PMIx.
30+
#
31+
[incorrect-pmix]
32+
An unexpected version of PMIx was loaded:
33+
34+
Detected: %s
35+
Expected: %s
36+
37+
Please check the library path and reconfigure if required.

‎opal/mca/pmix/ext1x/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
2+
# Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
33
# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
44
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.
55
# All rights reserved.

‎opal/mca/pmix/ext1x/configure.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1414
# All rights reserved.
1515
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
16-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
16+
# Copyright (c) 2013-2018 Intel, Inc. All rights reserved.
1717
# Copyright (c) 2015-2017 Research Organization for Information Science
1818
# and Technology (RIST). All rights reserved.
1919
# Copyright (c) 2014-2015 Mellanox Technologies, Inc.

‎opal/mca/pmix/ext1x/pmix1x.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
3+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
44
* Copyright (c) 2014-2017 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.
@@ -48,8 +48,13 @@
4848

4949
static const char *pmix1_get_nspace(opal_jobid_t jobid);
5050
static void pmix1_register_jobid(opal_jobid_t jobid, const char *nspace);
51+
static bool legacy_get(void)
52+
{
53+
return true;
54+
}
5155

5256
const opal_pmix_base_module_t opal_pmix_ext1x_module = {
57+
.legacy_get = legacy_get,
5358
/* client APIs */
5459
.init = pmix1_client_init,
5560
.finalize = pmix1_client_finalize,

‎opal/mca/pmix/ext1x/pmix1x.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
2+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
33
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.
44
* All rights reserved.
55
* Copyright (c) 2016-2017 Research Organization for Information Science

‎opal/mca/pmix/ext1x/pmix1x_client.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
3+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
44
* Copyright (c) 2014-2017 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.

‎opal/mca/pmix/ext1x/pmix1x_component.c‎

Lines changed: 36 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
2+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
33
* Copyright (c) 2014-2017 Research Organization for Information Science
44
* and Technology (RIST). All rights reserved.
55
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
@@ -21,6 +21,7 @@
2121
#include "opal/constants.h"
2222
#include "opal/class/opal_list.h"
2323
#include "opal/util/proc.h"
24+
#include "opal/util/show_help.h"
2425
#include "opal/mca/pmix/pmix.h"
2526
#include "pmix1x.h"
2627

@@ -45,39 +46,48 @@ static int external_component_query(mca_base_module_t **module, int *priority);
4546

4647
mca_pmix_ext1x_component_t mca_pmix_ext1x_component = {
4748
{
48-
/* First, the mca_component_t struct containing meta information
49-
about the component itself */
49+
/* First, the mca_component_t struct containing meta information
50+
* about the component itself */
5051

51-
.base_version = {
52-
/* Indicate that we are a pmix v1.1.0 component (which also
53-
implies a specific MCA version) */
52+
.base_version = {
53+
/* Indicate that we are a pmix v1.1.0 component (which also
54+
* implies a specific MCA version) */
5455

55-
OPAL_PMIX_BASE_VERSION_2_0_0,
56+
OPAL_PMIX_BASE_VERSION_2_0_0,
5657

57-
/* Component name and version */
58+
/* Component name and version */
5859

59-
.mca_component_name = "ext1x",
60-
MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION,
61-
OPAL_RELEASE_VERSION),
60+
.mca_component_name = "ext1x",
61+
MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION,
62+
OPAL_RELEASE_VERSION),
6263

63-
/* Component open and close functions */
64+
/* Component open and close functions */
6465

65-
.mca_open_component = external_open,
66-
.mca_close_component = external_close,
67-
.mca_query_component = external_component_query,
68-
},
69-
/* Next the MCA v1.0.0 component meta data */
70-
.base_data = {
71-
/* The component is checkpoint ready */
72-
MCA_BASE_METADATA_PARAM_CHECKPOINT
73-
}
66+
.mca_open_component = external_open,
67+
.mca_close_component = external_close,
68+
.mca_query_component = external_component_query,
69+
},
70+
/* Next the MCA v1.0.0 component meta data */
71+
.base_data = {
72+
/* The component is checkpoint ready */
73+
MCA_BASE_METADATA_PARAM_CHECKPOINT
74+
}
7475
},
7576
.native_launch = false
7677
};
7778

7879
static int external_open(void)
7980
{
81+
const char *version;
82+
8083
OBJ_CONSTRUCT(&mca_pmix_ext1x_component.jobids, opal_list_t);
84+
85+
version = PMIx_Get_version();
86+
if (0 != strncmp(version, "1.2", 3)) {
87+
opal_show_help("help-pmix-base.txt",
88+
"old-pmix", true, version, "v1.2");
89+
return OPAL_ERROR;
90+
}
8191
return OPAL_SUCCESS;
8292
}
8393

@@ -94,12 +104,12 @@ static int external_component_query(mca_base_module_t **module, int *priority)
94104

95105
/* see if a PMIx server is present */
96106
if (NULL != (t = getenv("PMIX_SERVER_URI")) ||
97-
NULL != (id = getenv("PMIX_ID"))) {
98-
/* if PMIx is present, then we are a client and need to use it */
99-
*priority = 100;
107+
NULL != (id = getenv("PMIX_ID"))) {
108+
/* if PMIx is present, then we are a client and need to use it */
109+
*priority = 100;
100110
} else {
101-
/* we could be a server, so we still need to be considered */
102-
*priority = 5;
111+
/* we could be a server, so we still need to be considered */
112+
*priority = 5;
103113
}
104114
*module = (mca_base_module_t *)&opal_pmix_ext1x_module;
105115
return OPAL_SUCCESS;

‎opal/mca/pmix/ext1x/pmix1x_server_north.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
3+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
44
* Copyright (c) 2014-2017 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* Copyright (c) 2014-2015 Mellanox Technologies, Inc.

‎opal/mca/pmix/ext1x/pmix1x_server_south.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
3+
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
44
* Copyright (c) 2014-2017 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.

0 commit comments

Comments
 (0)