Skip to content

Commit d349b1a

Browse files
ggouaillardetggouaillardet
committed
pmix: remove the MCA framework
pmix is now a first class citizen and hence do not need to be part of a MCA framework anymore Refs. #12282 Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 9d69edb commit d349b1a

Some content is hidden

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

67 files changed

+269
-418
lines changed

‎ompi/communicator/comm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
1919
* Copyright (c) 2012-2016 Los Alamos National Security, LLC.
2020
* All rights reserved.
21-
* Copyright (c) 2014-2017 Research Organization for Information Science
21+
* Copyright (c) 2014-2024 Research Organization for Information Science
2222
* and Technology (RIST). All rights reserved.
2323
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
2424
* Copyright (c) 2015 Mellanox Technologies. All rights reserved.
@@ -40,7 +40,7 @@
4040

4141
#include "ompi/constants.h"
4242
#include "opal/mca/hwloc/base/base.h"
43-
#include "opal/mca/pmix/pmix-internal.h"
43+
#include "opal/pmix/pmix-internal.h"
4444
#include "opal/util/string_copy.h"
4545

4646
#include "ompi/proc/proc.h"

‎ompi/communicator/comm_cid.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* reserved.
1919
* Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
2020
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
21-
* Copyright (c) 2014-2023 Research Organization for Information Science
21+
* Copyright (c) 2014-2024 Research Organization for Information Science
2222
* and Technology (RIST). All rights reserved.
2323
* Copyright (c) 2016 IBM Corporation. All rights reserved.
2424
* Copyright (c) 2017 Mellanox Technologies. All rights reserved.
@@ -36,8 +36,7 @@
3636

3737
#include "ompi_config.h"
3838

39-
#include "opal/mca/pmix/base/base.h"
40-
#include "opal/mca/pmix/pmix-internal.h"
39+
#include "opal/pmix/pmix-internal.h"
4140
#include "opal/util/printf.h"
4241
#include "opal/util/show_help.h"
4342

‎ompi/communicator/comm_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* Copyright (c) 2011-2013 Inria. All rights reserved.
2020
* Copyright (c) 2011-2013 Universite Bordeaux 1
2121
* All rights reserved.
22-
* Copyright (c) 2015-2017 Research Organization for Information Science
22+
* Copyright (c) 2015-2024 Research Organization for Information Science
2323
* and Technology (RIST). All rights reserved.
2424
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
2525
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
@@ -41,7 +41,7 @@
4141
#include "opal/util/bit_ops.h"
4242
#include "opal/util/info_subscriber.h"
4343
#include "opal/util/string_copy.h"
44-
#include "opal/mca/pmix/pmix-internal.h"
44+
#include "opal/pmix/pmix-internal.h"
4545
#include "ompi/constants.h"
4646
#include "ompi/mca/pml/pml.h"
4747
#include "ompi/mca/coll/base/base.h"

‎ompi/dpm/dpm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* reserved.
1818
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1919
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
20-
* Copyright (c) 2014-2020 Research Organization for Information Science
20+
* Copyright (c) 2014-2024 Research Organization for Information Science
2121
* and Technology (RIST). All rights reserved.
2222
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
2323
* Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
@@ -53,7 +53,6 @@
5353
#include "opal/util/show_help.h"
5454
#include "opal/util/printf.h"
5555
#include "opal/mca/hwloc/base/base.h"
56-
#include "opal/mca/pmix/base/base.h"
5756

5857
#include "ompi/communicator/communicator.h"
5958
#include "ompi/group/group.h"

‎ompi/errhandler/errhandler.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2008-2020 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
1515
* Copyright (c) 2010-2012 Oak Ridge National Labs. All rights reserved.
16-
* Copyright (c) 2015 Research Organization for Information Science
16+
* Copyright (c) 2015-2024 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
1919
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
@@ -35,7 +35,7 @@
3535
#include "ompi/errhandler/errhandler.h"
3636
#include "ompi/errhandler/errhandler_predefined.h"
3737
#include "opal/class/opal_pointer_array.h"
38-
#include "opal/mca/pmix/pmix-internal.h"
38+
#include "opal/pmix/pmix-internal.h"
3939
#include "opal/util/string_copy.h"
4040
#include "opal/mca/backtrace/backtrace.h"
4141
#include "ompi/runtime/mpiruntime.h"

‎ompi/errhandler/errhandler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
1616
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1717
* reserved.
18-
* Copyright (c) 2016 Research Organization for Information Science
18+
* Copyright (c) 2016-2024 Research Organization for Information Science
1919
* and Technology (RIST). All rights reserved.
2020
* Copyright (c) 2018-2021 Triad National Security, LLC. All rights
2121
* reserved.
@@ -37,7 +37,7 @@
3737
#include "opal/prefetch.h"
3838
#include "opal/class/opal_object.h"
3939
#include "opal/class/opal_pointer_array.h"
40-
#include "opal/mca/pmix/pmix-internal.h"
40+
#include "opal/pmix/pmix-internal.h"
4141

4242
#include "ompi/runtime/mpiruntime.h"
4343
#include "ompi/runtime/params.h"

‎ompi/instance/instance.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* of Tennessee Research Foundation. All rights
88
* reserved.
99
* Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved.
10+
* Copyright (c) 2024 Research Organization for Information Science
11+
* and Technology (RIST). All rights reserved.
1012
* $COPYRIGHT$
1113
*
1214
* Additional copyrights may follow
@@ -51,12 +53,11 @@
5153
#include "ompi/mca/part/base/base.h"
5254
#include "ompi/mca/io/base/base.h"
5355
#include "ompi/mca/topo/base/base.h"
54-
#include "opal/mca/pmix/base/base.h"
5556

5657
#include "opal/mca/mpool/base/mpool_base_tree.h"
5758
#include "ompi/mca/pml/base/pml_base_bsend.h"
5859
#include "ompi/util/timings.h"
59-
#include "opal/mca/pmix/pmix-internal.h"
60+
#include "opal/pmix/pmix-internal.h"
6061

6162
ompi_predefined_instance_t ompi_mpi_instance_null = {{{{0}}}};
6263

‎ompi/interlib/interlib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
15-
* Copyright (c) 2015 Research Organization for Information Science
15+
* Copyright (c) 2015-2024 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
1717
* Copyright (c) 2015-2020 Intel, Inc. All rights reserved.
1818
* Copyright (c) 2017 IBM Corporation. All rights reserved.
@@ -30,7 +30,7 @@
3030

3131
#include <string.h>
3232

33-
#include "opal/mca/pmix/pmix-internal.h"
33+
#include "opal/pmix/pmix-internal.h"
3434
#include "opal/util/proc.h"
3535
#include "ompi/runtime/ompi_rte.h"
3636
#include "ompi/interlib/interlib.h"

‎ompi/mca/mtl/ofi/mtl_ofi_compat.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
* Copyright (c) 2015-2020 Intel, Inc. All rights reserved.
33
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
4+
* Copyright (c) 2024 Research Organization for Information Science
5+
* and Technology (RIST). All rights reserved.
46
* $COPYRIGHT$
57
*
68
* Additional copyrights may follow
@@ -20,7 +22,7 @@
2022

2123
#if (OPAL_MAJOR_VERSION >= 2)
2224

23-
#include "opal/mca/pmix/pmix-internal.h"
25+
#include "opal/pmix/pmix-internal.h"
2426

2527
#define OFI_COMPAT_MODEX_RECV(ret, mtl_version, proc, ep_name, size) \
2628
OPAL_MODEX_RECV((ret), (mtl_version), &(proc)->super.proc_name, (ep_name), (size));

‎ompi/mca/mtl/portals4/mtl_portals4.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
* All rights reserved.
1212
* Copyright (c) 2010-2019 Sandia National Laboratories. All rights reserved.
1313
* Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
14+
* Copyright (c) 2024 Research Organization for Information Science
15+
* and Technology (RIST). All rights reserved.
1416
* $COPYRIGHT$
1517
*
1618
* Additional copyrights may follow
@@ -26,7 +28,7 @@
2628
#include "ompi/proc/proc.h"
2729
#include "ompi/mca/mtl/mtl.h"
2830
#include "opal/class/opal_list.h"
29-
#include "opal/mca/pmix/pmix-internal.h"
31+
#include "opal/pmix/pmix-internal.h"
3032

3133
#include "mtl_portals4.h"
3234
#include "mtl_portals4_recv_short.h"

‎ompi/mca/mtl/portals4/mtl_portals4_component.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* reserved.
1717
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
1818
* All Rights reserved.
19+
* Copyright (c) 2024 Research Organization for Information Science
20+
* and Technology (RIST). All rights reserved.
1921
* $COPYRIGHT$
2022
*
2123
* Additional copyrights may follow
@@ -27,7 +29,7 @@
2729

2830
#include "opal/util/event.h"
2931
#include "opal/util/output.h"
30-
#include "opal/mca/pmix/pmix-internal.h"
32+
#include "opal/pmix/pmix-internal.h"
3133

3234
#include "mtl_portals4.h"
3335
#include "mtl_portals4_request.h"

‎ompi/mca/mtl/psm2/mtl_psm2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2013-2020 Intel, Inc. All rights reserved.
1515
* Copyright (c) 2014 Los Alamos National Security, LLC. All rights
1616
* reserved.
17-
* Copyright (c) 2016 Research Organization for Information Science
17+
* Copyright (c) 2016-2024 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
1919
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
2020
*
@@ -27,7 +27,7 @@
2727

2828
#include "ompi_config.h"
2929

30-
#include "opal/mca/pmix/pmix-internal.h"
30+
#include "opal/pmix/pmix-internal.h"
3131
#include "ompi/mca/mtl/mtl.h"
3232
#include "ompi/mca/mtl/base/mtl_base_datatype.h"
3333
#include "opal/util/show_help.h"

‎ompi/mca/part/base/part_base_select.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved
1616
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1717
* Copyright (c) 2020 Sandia National Laboratories. All rights reserved.
18+
* Copyright (c) 2024 Research Organization for Information Science
19+
* and Technology (RIST). All rights reserved.
1820
* $COPYRIGHT$
1921
*
2022
* Additional copyrights may follow
@@ -33,7 +35,7 @@
3335
#include "ompi/mca/mca.h"
3436
#include "opal/mca/base/base.h"
3537
#include "opal/runtime/opal.h"
36-
#include "opal/mca/pmix/pmix-internal.h"
38+
#include "opal/pmix/pmix-internal.h"
3739

3840
#include "ompi/constants.h"
3941
#include "ompi/mca/part/part.h"

‎ompi/mca/pml/base/pml_base_select.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Copyright (c) 2020-2022 Amazon.com, Inc. or its affiliates. All Rights
1818
* Copyright (c) 2018-2020 Triad National Security, LLC. All rights
1919
* reserved.
20+
* Copyright (c) 2024 Research Organization for Information Science
21+
* and Technology (RIST). All rights reserved.
2022
* $COPYRIGHT$
2123
*
2224
* Additional copyrights may follow
@@ -35,7 +37,7 @@
3537
#include "ompi/mca/mca.h"
3638
#include "opal/mca/base/base.h"
3739
#include "opal/runtime/opal.h"
38-
#include "opal/mca/pmix/pmix-internal.h"
40+
#include "opal/pmix/pmix-internal.h"
3941

4042
#include "ompi/constants.h"
4143
#include "ompi/instance/instance.h"

‎ompi/mca/pml/ob1/pml_ob1.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
* reserved.
2828
* Copyright (c) 2022 IBM Corporation. All rights reserved
2929
* Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved.
30+
* Copyright (c) 2024 Research Organization for Information Science
31+
* and Technology (RIST). All rights reserved.
3032
* $COPYRIGHT$
3133
*
3234
* Additional copyrights may follow
@@ -51,7 +53,7 @@
5153
#include "ompi/mca/pml/base/base.h"
5254
#include "ompi/mca/bml/base/base.h"
5355
#include "ompi/errhandler/errhandler.h"
54-
#include "opal/mca/pmix/pmix-internal.h"
56+
#include "opal/pmix/pmix-internal.h"
5557
#include "ompi/runtime/ompi_spc.h"
5658

5759
#include "pml_ob1.h"

‎ompi/mca/pml/ucx/pml_ucx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2016-2021 The University of Tennessee and The University
44
* of Tennessee Research Foundation. All rights
55
* reserved.
6-
* Copyright (c) 2018-2019 Research Organization for Information Science
6+
* Copyright (c) 2018-2024 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
88
* Copyright (c) 2018-2022 IBM Corporation. All rights reserved.
99
* Copyright (c) 2019 Intel, Inc. All rights reserved.
@@ -19,7 +19,7 @@
1919
#include "pml_ucx.h"
2020

2121
#include "opal/runtime/opal.h"
22-
#include "opal/mca/pmix/pmix-internal.h"
22+
#include "opal/pmix/pmix-internal.h"
2323
#include "ompi/attribute/attribute.h"
2424
#include "ompi/message/message.h"
2525
#include "ompi/runtime/ompi_spc.h"

‎ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2011-2018 Inria. All rights reserved.
77
* Copyright (c) 2011-2018 Bordeaux Polytechnic Institute
88
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
9-
* Copyright (c) 2015-2017 Research Organization for Information Science
9+
* Copyright (c) 2015-2024 Research Organization for Information Science
1010
* and Technology (RIST). All rights reserved.
1111
* Copyright (c) 2016 Los Alamos National Security, LLC. All rights
1212
* reserved.
@@ -34,7 +34,7 @@
3434

3535
#include "ompi/mca/pml/pml.h"
3636

37-
#include "opal/mca/pmix/pmix-internal.h"
37+
#include "opal/pmix/pmix-internal.h"
3838

3939
/* #define __DEBUG__ 1 */
4040

‎ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
88
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
99
* Copyright (c) 2022 IBM Corporation. All rights reserved
10+
* Copyright (c) 2024 Research Organization for Information Science
11+
* and Technology (RIST). All rights reserved.
1012
* $COPYRIGHT$
1113
*
1214
* Additional copyrights may follow
@@ -16,7 +18,7 @@
1618

1719
#include "ompi_config.h"
1820
#include "vprotocol_pessimist_eventlog.h"
19-
#include "opal/mca/pmix/pmix-internal.h"
21+
#include "opal/pmix/pmix-internal.h"
2022
#include "opal/util/printf.h"
2123
#include "ompi/dpm/dpm.h"
2224

‎ompi/mpi/c/lookup_name.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1414
* reserved.
1515
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
16-
* Copyright (c) 2015 Research Organization for Information Science
16+
* Copyright (c) 2015-2024 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2015-2018 Cisco Systems, Inc. All rights reserved
1919
* $COPYRIGHT$
@@ -26,7 +26,7 @@
2626
#include "ompi_config.h"
2727

2828
#include "opal/class/opal_list.h"
29-
#include "opal/mca/pmix/pmix-internal.h"
29+
#include "opal/pmix/pmix-internal.h"
3030
#include "opal/util/show_help.h"
3131
#include "opal/util/string_copy.h"
3232

‎ompi/mpi/c/publish_name.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2013 Los Alamos National Security, LLC. All rights
1414
* reserved.
1515
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
16-
* Copyright (c) 2015 Research Organization for Information Science
16+
* Copyright (c) 2015-2024 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1919
* $COPYRIGHT$
@@ -26,7 +26,7 @@
2626
#include <stdio.h>
2727

2828
#include "opal/class/opal_list.h"
29-
#include "opal/mca/pmix/pmix-internal.h"
29+
#include "opal/pmix/pmix-internal.h"
3030
#include "opal/util/show_help.h"
3131

3232
#include "ompi/mpi/c/bindings.h"

‎ompi/mpi/c/unpublish_name.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights
1414
* reserved.
1515
* Copyright (c) 2015-2019 Intel, Inc. All rights reserved.
16-
* Copyright (c) 2015 Research Organization for Information Science
16+
* Copyright (c) 2015-2024 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1919
* $COPYRIGHT$
@@ -26,7 +26,7 @@
2626
#include <stdio.h>
2727

2828
#include "opal/class/opal_list.h"
29-
#include "opal/mca/pmix/pmix-internal.h"
29+
#include "opal/pmix/pmix-internal.h"
3030
#include "opal/util/argv.h"
3131
#include "opal/util/show_help.h"
3232

0 commit comments

Comments
 (0)