From 48cf38d01e7371a0f33311edfa2f9fd51883877f Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Mon, 5 Feb 2024 23:00:42 +0900 Subject: [PATCH] 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. open-mpi/ompi#12282 Signed-off-by: Gilles Gouaillardet --- ompi/communicator/comm.c | 4 +- ompi/communicator/comm_cid.c | 5 +- ompi/communicator/comm_init.c | 4 +- ompi/dpm/dpm.c | 3 +- ompi/errhandler/errhandler.c | 4 +- ompi/errhandler/errhandler.h | 4 +- ompi/instance/instance.c | 5 +- ompi/interlib/interlib.c | 4 +- ompi/mca/mtl/ofi/mtl_ofi_compat.h | 4 +- ompi/mca/mtl/portals4/mtl_portals4.c | 4 +- .../mca/mtl/portals4/mtl_portals4_component.c | 4 +- ompi/mca/mtl/psm2/mtl_psm2.c | 4 +- ompi/mca/part/base/part_base_select.c | 4 +- ompi/mca/pml/base/pml_base_select.c | 4 +- ompi/mca/pml/ob1/pml_ob1.c | 4 +- ompi/mca/pml/ucx/pml_ucx.c | 4 +- .../topo_treematch_dist_graph_create.c | 4 +- .../pessimist/vprotocol_pessimist_eventlog.c | 4 +- ompi/mpi/c/lookup_name.c | 4 +- ompi/mpi/c/publish_name.c | 4 +- ompi/mpi/c/unpublish_name.c | 4 +- ompi/proc/proc.c | 4 +- ompi/proc/proc.h | 4 +- ompi/runtime/ompi_mpi_finalize.c | 4 +- ompi/runtime/ompi_mpi_init.c | 3 +- ompi/runtime/ompi_mpi_params.c | 3 +- ompi/runtime/ompi_rte.c | 3 +- ompi/runtime/ompi_rte.h | 4 +- opal/Makefile.am | 5 +- opal/mca/btl/ofi/btl_ofi.h | 4 +- opal/mca/btl/portals4/btl_portals4.c | 4 +- .../mca/btl/portals4/btl_portals4_component.c | 4 +- opal/mca/btl/sm/btl_sm.h | 4 +- opal/mca/btl/smcuda/btl_smcuda.c | 3 +- opal/mca/btl/tcp/btl_tcp_component.c | 4 +- opal/mca/btl/tcp/btl_tcp_proc.c | 4 +- opal/mca/btl/uct/btl_uct.h | 4 +- opal/mca/btl/ugni/btl_ugni.h | 4 +- opal/mca/btl/ugni/btl_ugni_add_procs.c | 4 +- opal/mca/btl/ugni/btl_ugni_endpoint.c | 4 +- opal/mca/btl/ugni/btl_ugni_init.c | 4 +- opal/mca/btl/usnic/btl_usnic_compat.h | 4 +- opal/mca/common/ucx/common_ucx.c | 4 +- opal/mca/common/ucx/common_ucx_wpool.c | 13 +- opal/mca/hwloc/base/hwloc_base_util.c | 4 +- opal/mca/pmix/Makefile.am | 28 ----- opal/mca/pmix/autogen.options | 14 --- opal/mca/pmix/base/Makefile.am | 18 --- opal/mca/pmix/base/base.h | 51 -------- opal/mca/pmix/base/pmix_base_frame.c | 117 ------------------ opal/mca/pmix/base/static-components.h | 16 --- opal/mca/pmix/configure.m4 | 29 ----- opal/mca/pmix/pmix-3rdparty.h | 30 ----- .../reachable/weighted/reachable_weighted.h | 4 +- opal/mca/smsc/cma/smsc_cma_module.c | 4 +- opal/mca/smsc/knem/smsc_knem_module.c | 4 +- opal/mca/smsc/xpmem/smsc_xpmem_module.c | 4 +- opal/pmix/Makefile.am | 19 +++ opal/pmix/help-pmix-base.txt | 37 ++++++ opal/{mca => }/pmix/pmix-internal.h | 31 ++--- .../pmix/base/pmix_base_fns.c => pmix/pmix.c} | 55 +++++++- opal/runtime/opal_init.c | 6 +- opal/runtime/opal_init_core.c | 3 +- opal/runtime/opal_params.c | 19 ++- opal/util/proc.c | 4 +- opal/util/proc.h | 4 +- oshmem/mca/memheap/base/memheap_base_mkey.c | 4 +- 67 files changed, 270 insertions(+), 418 deletions(-) delete mode 100644 opal/mca/pmix/Makefile.am delete mode 100644 opal/mca/pmix/autogen.options delete mode 100644 opal/mca/pmix/base/Makefile.am delete mode 100644 opal/mca/pmix/base/base.h delete mode 100644 opal/mca/pmix/base/pmix_base_frame.c delete mode 100644 opal/mca/pmix/base/static-components.h delete mode 100644 opal/mca/pmix/configure.m4 delete mode 100644 opal/mca/pmix/pmix-3rdparty.h create mode 100644 opal/pmix/Makefile.am create mode 100644 opal/pmix/help-pmix-base.txt rename opal/{mca => }/pmix/pmix-internal.h (98%) rename opal/{mca/pmix/base/pmix_base_fns.c => pmix/pmix.c} (91%) diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c index 84e89a65fe8..a524239618c 100644 --- a/ompi/communicator/comm.c +++ b/ompi/communicator/comm.c @@ -18,7 +18,7 @@ * Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2012-2016 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies. All rights reserved. @@ -40,7 +40,7 @@ #include "ompi/constants.h" #include "opal/mca/hwloc/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/string_copy.h" #include "ompi/proc/proc.h" diff --git a/ompi/communicator/comm_cid.c b/ompi/communicator/comm_cid.c index be022b8f470..79ce21a51a7 100644 --- a/ompi/communicator/comm_cid.c +++ b/ompi/communicator/comm_cid.c @@ -18,7 +18,7 @@ * reserved. * Copyright (c) 2012 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2023 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 IBM Corporation. All rights reserved. * Copyright (c) 2017 Mellanox Technologies. All rights reserved. @@ -36,8 +36,7 @@ #include "ompi_config.h" -#include "opal/mca/pmix/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/printf.h" #include "opal/util/show_help.h" diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c index 20e1fdde876..d285138ed33 100644 --- a/ompi/communicator/comm_init.c +++ b/ompi/communicator/comm_init.c @@ -19,7 +19,7 @@ * Copyright (c) 2011-2013 Inria. All rights reserved. * Copyright (c) 2011-2013 Universite Bordeaux 1 * All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. @@ -41,7 +41,7 @@ #include "opal/util/bit_ops.h" #include "opal/util/info_subscriber.h" #include "opal/util/string_copy.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/constants.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/coll/base/base.h" diff --git a/ompi/dpm/dpm.c b/ompi/dpm/dpm.c index 25f60586893..d97e122d4d2 100644 --- a/ompi/dpm/dpm.c +++ b/ompi/dpm/dpm.c @@ -17,7 +17,7 @@ * reserved. * Copyright (c) 2013-2020 Intel, Inc. All rights reserved. * Copyright (c) 2013-2017 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2020 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2021-2022 Nanook Consulting. All rights reserved. @@ -53,7 +53,6 @@ #include "opal/util/show_help.h" #include "opal/util/printf.h" #include "opal/mca/hwloc/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "ompi/communicator/communicator.h" #include "ompi/group/group.h" diff --git a/ompi/errhandler/errhandler.c b/ompi/errhandler/errhandler.c index c5c31720ee1..c15005038a8 100644 --- a/ompi/errhandler/errhandler.c +++ b/ompi/errhandler/errhandler.c @@ -13,7 +13,7 @@ * Copyright (c) 2008-2020 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2010-2012 Oak Ridge National Labs. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. @@ -35,7 +35,7 @@ #include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errhandler_predefined.h" #include "opal/class/opal_pointer_array.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/string_copy.h" #include "opal/mca/backtrace/backtrace.h" #include "ompi/runtime/mpiruntime.h" diff --git a/ompi/errhandler/errhandler.h b/ompi/errhandler/errhandler.h index 40909f3f140..f5f341ba205 100644 --- a/ompi/errhandler/errhandler.h +++ b/ompi/errhandler/errhandler.h @@ -15,7 +15,7 @@ * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. * Copyright (c) 2016 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016 Research Organization for Information Science + * Copyright (c) 2016-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2018-2021 Triad National Security, LLC. All rights * reserved. @@ -37,7 +37,7 @@ #include "opal/prefetch.h" #include "opal/class/opal_object.h" #include "opal/class/opal_pointer_array.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/runtime/mpiruntime.h" #include "ompi/runtime/params.h" diff --git a/ompi/instance/instance.c b/ompi/instance/instance.c index d0f0d490de3..f95f97b860a 100644 --- a/ompi/instance/instance.c +++ b/ompi/instance/instance.c @@ -7,6 +7,8 @@ * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,12 +53,11 @@ #include "ompi/mca/part/base/base.h" #include "ompi/mca/io/base/base.h" #include "ompi/mca/topo/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "opal/mca/mpool/base/mpool_base_tree.h" #include "ompi/mca/pml/base/pml_base_bsend.h" #include "ompi/util/timings.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" ompi_predefined_instance_t ompi_mpi_instance_null = {{{{0}}}}; diff --git a/ompi/interlib/interlib.c b/ompi/interlib/interlib.c index 255346949c7..4f5a1942d58 100644 --- a/ompi/interlib/interlib.c +++ b/ompi/interlib/interlib.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2008-2012 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2020 Intel, Inc. All rights reserved. * Copyright (c) 2017 IBM Corporation. All rights reserved. @@ -30,7 +30,7 @@ #include -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/proc.h" #include "ompi/runtime/ompi_rte.h" #include "ompi/interlib/interlib.h" diff --git a/ompi/mca/mtl/ofi/mtl_ofi_compat.h b/ompi/mca/mtl/ofi/mtl_ofi_compat.h index a53e4639a5d..a2e6bc1006f 100644 --- a/ompi/mca/mtl/ofi/mtl_ofi_compat.h +++ b/ompi/mca/mtl/ofi/mtl_ofi_compat.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015-2020 Intel, Inc. All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -20,7 +22,7 @@ #if (OPAL_MAJOR_VERSION >= 2) -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #define OFI_COMPAT_MODEX_RECV(ret, mtl_version, proc, ep_name, size) \ OPAL_MODEX_RECV((ret), (mtl_version), &(proc)->super.proc_name, (ep_name), (size)); diff --git a/ompi/mca/mtl/portals4/mtl_portals4.c b/ompi/mca/mtl/portals4/mtl_portals4.c index 22bd95cf8f6..c215ad4bdfe 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4.c +++ b/ompi/mca/mtl/portals4/mtl_portals4.c @@ -11,6 +11,8 @@ * All rights reserved. * Copyright (c) 2010-2019 Sandia National Laboratories. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,7 +28,7 @@ #include "ompi/proc/proc.h" #include "ompi/mca/mtl/mtl.h" #include "opal/class/opal_list.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "mtl_portals4.h" #include "mtl_portals4_recv_short.h" diff --git a/ompi/mca/mtl/portals4/mtl_portals4_component.c b/ompi/mca/mtl/portals4/mtl_portals4_component.c index e9610940e44..8aa5a6bd643 100644 --- a/ompi/mca/mtl/portals4/mtl_portals4_component.c +++ b/ompi/mca/mtl/portals4/mtl_portals4_component.c @@ -16,6 +16,8 @@ * reserved. * Copyright (c) 2020 Amazon.com, Inc. or its affiliates. * All Rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -27,7 +29,7 @@ #include "opal/util/event.h" #include "opal/util/output.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "mtl_portals4.h" #include "mtl_portals4_request.h" diff --git a/ompi/mca/mtl/psm2/mtl_psm2.c b/ompi/mca/mtl/psm2/mtl_psm2.c index e6f222321fe..3e0c3efd7fc 100644 --- a/ompi/mca/mtl/psm2/mtl_psm2.c +++ b/ompi/mca/mtl/psm2/mtl_psm2.c @@ -14,7 +14,7 @@ * Copyright (c) 2013-2020 Intel, Inc. All rights reserved. * Copyright (c) 2014 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016 Research Organization for Information Science + * Copyright (c) 2016-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. * @@ -27,7 +27,7 @@ #include "ompi_config.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/mtl_base_datatype.h" #include "opal/util/show_help.h" diff --git a/ompi/mca/part/base/part_base_select.c b/ompi/mca/part/base/part_base_select.c index 71525aaec8a..ecf8750cb12 100644 --- a/ompi/mca/part/base/part_base_select.c +++ b/ompi/mca/part/base/part_base_select.c @@ -15,6 +15,8 @@ * Copyright (c) 2013-2014 Intel, Inc. All rights reserved * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2020 Sandia National Laboratories. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,7 +35,7 @@ #include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/runtime/opal.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/constants.h" #include "ompi/mca/part/part.h" diff --git a/ompi/mca/pml/base/pml_base_select.c b/ompi/mca/pml/base/pml_base_select.c index e66ec02b5e4..52cd64a905d 100644 --- a/ompi/mca/pml/base/pml_base_select.c +++ b/ompi/mca/pml/base/pml_base_select.c @@ -17,6 +17,8 @@ * Copyright (c) 2020-2022 Amazon.com, Inc. or its affiliates. All Rights * Copyright (c) 2018-2020 Triad National Security, LLC. All rights * reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,7 +37,7 @@ #include "ompi/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/runtime/opal.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/constants.h" #include "ompi/instance/instance.h" diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index e0516d16fe0..c5f4d6eb725 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -27,6 +27,8 @@ * reserved. * Copyright (c) 2022 IBM Corporation. All rights reserved * Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -51,7 +53,7 @@ #include "ompi/mca/pml/base/base.h" #include "ompi/mca/bml/base/base.h" #include "ompi/errhandler/errhandler.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/runtime/ompi_spc.h" #include "pml_ob1.h" diff --git a/ompi/mca/pml/ucx/pml_ucx.c b/ompi/mca/pml/ucx/pml_ucx.c index c1f9c6a7473..2f8e14b551d 100644 --- a/ompi/mca/pml/ucx/pml_ucx.c +++ b/ompi/mca/pml/ucx/pml_ucx.c @@ -3,7 +3,7 @@ * Copyright (c) 2016-2021 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2018-2019 Research Organization for Information Science + * Copyright (c) 2018-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2018-2022 IBM Corporation. All rights reserved. * Copyright (c) 2019 Intel, Inc. All rights reserved. @@ -19,7 +19,7 @@ #include "pml_ucx.h" #include "opal/runtime/opal.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/attribute/attribute.h" #include "ompi/message/message.h" #include "ompi/runtime/ompi_spc.h" diff --git a/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c b/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c index 785d8977142..c354c3d94f9 100644 --- a/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c +++ b/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c @@ -6,7 +6,7 @@ * Copyright (c) 2011-2018 Inria. All rights reserved. * Copyright (c) 2011-2018 Bordeaux Polytechnic Institute * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 Los Alamos National Security, LLC. All rights * reserved. @@ -34,7 +34,7 @@ #include "ompi/mca/pml/pml.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" /* #define __DEBUG__ 1 */ diff --git a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c index 29e82e7a51c..f0595ca6aa5 100644 --- a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c +++ b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_eventlog.c @@ -7,6 +7,8 @@ * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. * Copyright (c) 2022 IBM Corporation. All rights reserved + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -16,7 +18,7 @@ #include "ompi_config.h" #include "vprotocol_pessimist_eventlog.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/printf.h" #include "ompi/dpm/dpm.h" diff --git a/ompi/mpi/c/lookup_name.c b/ompi/mpi/c/lookup_name.c index 0633d05a90f..e15504678cf 100644 --- a/ompi/mpi/c/lookup_name.c +++ b/ompi/mpi/c/lookup_name.c @@ -13,7 +13,7 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2018 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ @@ -26,7 +26,7 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/show_help.h" #include "opal/util/string_copy.h" diff --git a/ompi/mpi/c/publish_name.c b/ompi/mpi/c/publish_name.c index 73c95ab9e04..218a7e4ece0 100644 --- a/ompi/mpi/c/publish_name.c +++ b/ompi/mpi/c/publish_name.c @@ -13,7 +13,7 @@ * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ @@ -26,7 +26,7 @@ #include #include "opal/class/opal_list.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/show_help.h" #include "ompi/mpi/c/bindings.h" diff --git a/ompi/mpi/c/unpublish_name.c b/ompi/mpi/c/unpublish_name.c index 800853df0da..136ffa93d38 100644 --- a/ompi/mpi/c/unpublish_name.c +++ b/ompi/mpi/c/unpublish_name.c @@ -13,7 +13,7 @@ * Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ @@ -26,7 +26,7 @@ #include #include "opal/class/opal_list.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/argv.h" #include "opal/util/show_help.h" diff --git a/ompi/proc/proc.c b/ompi/proc/proc.c index 080506925c6..1db083cf7e9 100644 --- a/ompi/proc/proc.c +++ b/ompi/proc/proc.c @@ -15,7 +15,7 @@ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2013-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2017 Mellanox Technologies. All rights reserved. * @@ -38,7 +38,7 @@ #include "opal/util/arch.h" #include "opal/util/show_help.h" #include "opal/mca/hwloc/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/argv.h" #include "ompi/proc/proc.h" diff --git a/ompi/proc/proc.h b/ompi/proc/proc.h index 028d1348d79..473ba49aad3 100644 --- a/ompi/proc/proc.h +++ b/ompi/proc/proc.h @@ -14,7 +14,7 @@ * reserved. * Copyright (c) 2010-2012 Oak Ridge National Labs. All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2016 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. * $COPYRIGHT$ @@ -40,7 +40,7 @@ #include "ompi/types.h" #include "opal/util/proc.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "ompi/runtime/ompi_rte.h" diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c index ad8a328dc55..c92be2cf2f8 100644 --- a/ompi/runtime/ompi_mpi_finalize.c +++ b/ompi/runtime/ompi_mpi_finalize.c @@ -17,7 +17,7 @@ * Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2011-2020 Sandia National Laboratories. All rights reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2016 Research Organization for Information Science + * Copyright (c) 2016-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. * Copyright (c) 2019-2022 Triad National Security, LLC. All rights @@ -58,7 +58,7 @@ #include "opal/mca/mpool/base/mpool_base_tree.h" #include "opal/mca/rcache/base/base.h" #include "opal/mca/allocator/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/timings.h" #include "mpi.h" #include "ompi/constants.h" diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c index 19c0999d163..3b58ce3bb21 100644 --- a/ompi/runtime/ompi_mpi_init.c +++ b/ompi/runtime/ompi_mpi_init.c @@ -18,7 +18,7 @@ * Copyright (c) 2011-2020 Sandia National Laboratories. All rights reserved. * Copyright (c) 2012-2013 Inria. All rights reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2021 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016-2018 Mellanox Technologies Ltd. All rights reserved. * @@ -65,7 +65,6 @@ #include "opal/mca/rcache/rcache.h" #include "opal/mca/mpool/base/base.h" #include "opal/mca/btl/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "opal/util/opal_environ.h" #include "ompi/constants.h" diff --git a/ompi/runtime/ompi_mpi_params.c b/ompi/runtime/ompi_mpi_params.c index c31e47e4af8..ccb002e3319 100644 --- a/ompi/runtime/ompi_mpi_params.c +++ b/ompi/runtime/ompi_mpi_params.c @@ -18,7 +18,7 @@ * Copyright (c) 2013-2019 Intel, Inc. All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2016-2021 Research Organization for Information Science + * Copyright (c) 2016-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2018-2021 Triad National Security, LLC. All rights * reserved. @@ -42,7 +42,6 @@ #include "ompi/runtime/params.h" #include "ompi/runtime/ompi_rte.h" -#include "opal/mca/pmix/base/base.h" #include "opal/util/argv.h" #include "opal/util/output.h" #include "opal/util/show_help.h" diff --git a/ompi/runtime/ompi_rte.c b/ompi/runtime/ompi_rte.c index 2a2d66bbc33..23c8006d81a 100644 --- a/ompi/runtime/ompi_rte.c +++ b/ompi/runtime/ompi_rte.c @@ -10,7 +10,7 @@ * Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2018-2023 Triad National Security, LLC. All rights * reserved. - * Copyright (c) 2019 Research Organization for Information Science + * Copyright (c) 2019-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2020 Amazon.com, Inc. or its affiliates. All Rights * reserved. @@ -48,7 +48,6 @@ #include "opal/util/show_help.h" #include "opal/util/string_copy.h" #include "opal/mca/hwloc/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "opal/mca/threads/tsd.h" #include "opal/class/opal_list.h" diff --git a/ompi/runtime/ompi_rte.h b/ompi/runtime/ompi_rte.h index 996fae9700b..889daabd5fa 100644 --- a/ompi/runtime/ompi_rte.h +++ b/ompi/runtime/ompi_rte.h @@ -4,7 +4,7 @@ * Copyright (c) 2013 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2019 Research Organization for Information Science + * Copyright (c) 2019-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2020-2022 Triad National Security, LLC. All rights * reserved. @@ -177,7 +177,7 @@ struct opal_proc_t; #include "opal/mca/threads/threads.h" #include "opal/util/proc.h" #include "opal/mca/hwloc/hwloc-internal.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" struct ompi_proc_t; struct ompi_communicator_t; diff --git a/opal/Makefile.am b/opal/Makefile.am index 1aad41b8ffb..98d2e072927 100644 --- a/opal/Makefile.am +++ b/opal/Makefile.am @@ -11,8 +11,8 @@ # All rights reserved. # Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015-2016 Intel, Inc. All rights reserved. -# Copyright (c) 2016 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2016-2024 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2020-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. # Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved. # $COPYRIGHT$ @@ -84,3 +84,4 @@ include memoryhooks/Makefile.am include runtime/Makefile.am include mca/Makefile.am include tools/Makefile.am +include pmix/Makefile.am diff --git a/opal/mca/btl/ofi/btl_ofi.h b/opal/mca/btl/ofi/btl_ofi.h index 0019065ecfe..69bc831205e 100644 --- a/opal/mca/btl/ofi/btl_ofi.h +++ b/opal/mca/btl/ofi/btl_ofi.h @@ -17,6 +17,8 @@ * All Rights reserved. * Copyright (c) 2022 Triad National Security, LLC. All rights * reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,7 +40,7 @@ #include "opal/mca/btl/base/btl_base_error.h" #include "opal/mca/btl/btl.h" #include "opal/mca/mpool/mpool.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/rcache/base/base.h" #include "opal/util/event.h" diff --git a/opal/mca/btl/portals4/btl_portals4.c b/opal/mca/btl/portals4/btl_portals4.c index 77f5e909cd5..abc579512de 100644 --- a/opal/mca/btl/portals4/btl_portals4.c +++ b/opal/mca/btl/portals4/btl_portals4.c @@ -15,6 +15,8 @@ * reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. * Copyright (c) 2014 Bull SAS. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,7 +35,7 @@ #include "opal/constants.h" #include "opal/datatype/opal_convertor.h" #include "opal/mca/btl/btl.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/proc.h" #include "btl_portals4.h" diff --git a/opal/mca/btl/portals4/btl_portals4_component.c b/opal/mca/btl/portals4/btl_portals4_component.c index 36671327c96..4995e87a93a 100644 --- a/opal/mca/btl/portals4/btl_portals4_component.c +++ b/opal/mca/btl/portals4/btl_portals4_component.c @@ -18,6 +18,8 @@ * Copyright (c) 2020 Google, LLC. All rights reserved. * Copyright (c) 2020 Amazon.com, Inc. or its affiliates. * All Rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -30,7 +32,7 @@ #include "opal/mca/btl/base/base.h" #include "opal/mca/btl/btl.h" #include "opal/mca/mpool/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/event.h" #include "opal/util/output.h" #include "opal/util/show_help.h" diff --git a/opal/mca/btl/sm/btl_sm.h b/opal/mca/btl/sm/btl_sm.h index 9c05788f05b..2c5b4635fb9 100644 --- a/opal/mca/btl/sm/btl_sm.h +++ b/opal/mca/btl/sm/btl_sm.h @@ -20,6 +20,8 @@ * Copyright (c) 2020 Google, LLC. All rights reserved. * * Copyright (c) 2019-2020 Intel, Inc. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -59,7 +61,7 @@ #include "opal/sys/atomic.h" #include "opal/util/proc.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" BEGIN_C_DECLS diff --git a/opal/mca/btl/smcuda/btl_smcuda.c b/opal/mca/btl/smcuda/btl_smcuda.c index 0709e8c138a..5e2b64742cb 100644 --- a/opal/mca/btl/smcuda/btl_smcuda.c +++ b/opal/mca/btl/smcuda/btl_smcuda.c @@ -16,7 +16,7 @@ * reserved. * Copyright (c) 2012-2023 NVIDIA Corporation. All rights reserved. * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2019 Intel, Inc. All rights reserved. * Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved. @@ -51,7 +51,6 @@ #include "opal/datatype/opal_convertor.h" #include "opal/mca/btl/btl.h" #include "opal/mca/hwloc/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "opal/mca/shmem/base/base.h" #include "opal/mca/shmem/shmem.h" #include "opal/sys/atomic.h" diff --git a/opal/mca/btl/tcp/btl_tcp_component.c b/opal/mca/btl/tcp/btl_tcp_component.c index 131d9c1fe53..87ec059ec2f 100644 --- a/opal/mca/btl/tcp/btl_tcp_component.c +++ b/opal/mca/btl/tcp/btl_tcp_component.c @@ -17,7 +17,7 @@ * reserved. * Copyright (c) 2013-2015 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. * Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved. @@ -65,7 +65,7 @@ #include "opal/mca/btl/base/btl_base_error.h" #include "opal/mca/btl/btl.h" #include "opal/mca/mpool/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/reachable/base/base.h" #include "opal/mca/threads/threads.h" #include "opal/util/argv.h" diff --git a/opal/mca/btl/tcp/btl_tcp_proc.c b/opal/mca/btl/tcp/btl_tcp_proc.c index fc038fde92a..01986763863 100644 --- a/opal/mca/btl/tcp/btl_tcp_proc.c +++ b/opal/mca/btl/tcp/btl_tcp_proc.c @@ -12,7 +12,7 @@ * All rights reserved. * Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved * Copyright (c) 2013-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2016 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2016 Los Alamos National Security, LLC. All rights * reserved. @@ -39,7 +39,7 @@ #include "opal/class/opal_hash_table.h" #include "opal/mca/btl/base/btl_base_error.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/reachable/base/base.h" #include "opal/util/arch.h" #include "opal/util/argv.h" diff --git a/opal/mca/btl/uct/btl_uct.h b/opal/mca/btl/uct/btl_uct.h index 85f9d9b33a8..6c1f4c9b9c5 100644 --- a/opal/mca/btl/uct/btl_uct.h +++ b/opal/mca/btl/uct/btl_uct.h @@ -16,6 +16,8 @@ * Copyright (c) 2019 Intel, Inc. All rights reserved. * Copyright (c) 2020 Amazon.com, Inc. or its affiliates. * All Rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,7 +40,7 @@ #include "opal/mca/btl/base/base.h" #include "opal/mca/btl/base/btl_base_error.h" #include "opal/mca/mpool/mpool.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/rcache/base/base.h" #include "opal/mca/threads/tsd.h" #include "opal/util/event.h" diff --git a/opal/mca/btl/ugni/btl_ugni.h b/opal/mca/btl/ugni/btl_ugni.h index d83cfe149fa..50ae20f6cb9 100644 --- a/opal/mca/btl/ugni/btl_ugni.h +++ b/opal/mca/btl/ugni/btl_ugni.h @@ -3,7 +3,7 @@ * Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2011 UT-Battelle, LLC. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. * $COPYRIGHT$ @@ -32,7 +32,7 @@ #include "opal/mca/btl/btl.h" #include "opal/mca/mpool/base/base.h" #include "opal/mca/mpool/mpool.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/rcache/base/base.h" #include "opal/mca/rcache/udreg/rcache_udreg.h" #include "opal/util/output.h" diff --git a/opal/mca/btl/ugni/btl_ugni_add_procs.c b/opal/mca/btl/ugni/btl_ugni_add_procs.c index ccf89a60b05..e70b1b7961f 100644 --- a/opal/mca/btl/ugni/btl_ugni_add_procs.c +++ b/opal/mca/btl/ugni/btl_ugni_add_procs.c @@ -5,6 +5,8 @@ * Copyright (c) 2011 UT-Battelle, LLC. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -19,7 +21,7 @@ #include "btl_ugni_smsg.h" #include "opal/include/opal/align.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #define INITIAL_GNI_EPS 1024 diff --git a/opal/mca/btl/ugni/btl_ugni_endpoint.c b/opal/mca/btl/ugni/btl_ugni_endpoint.c index 8d02b7a2ffa..7be67aecbb2 100644 --- a/opal/mca/btl/ugni/btl_ugni_endpoint.c +++ b/opal/mca/btl/ugni/btl_ugni_endpoint.c @@ -4,6 +4,8 @@ * reserved. * Copyright (c) 2011-2013 UT-Battelle, LLC. All rights reserved. * Copyright (c) 2017-2019 Intel, Inc. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -13,7 +15,7 @@ #include "btl_ugni_endpoint.h" #include "btl_ugni_smsg.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" static void mca_btl_ugni_ep_construct(mca_btl_base_endpoint_t *ep) { diff --git a/opal/mca/btl/ugni/btl_ugni_init.c b/opal/mca/btl/ugni/btl_ugni_init.c index 3a406ee87d2..6f19b6b9dd1 100644 --- a/opal/mca/btl/ugni/btl_ugni_init.c +++ b/opal/mca/btl/ugni/btl_ugni_init.c @@ -4,7 +4,7 @@ * reserved. * Copyright (c) 2011 UT-Battelle, LLC. All rights reserved. * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. * Copyright (c) 2021 Triad National Security, LLC. All rights @@ -22,7 +22,7 @@ #include "opal/class/opal_list.h" #include "opal/mca/hwloc/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/bit_ops.h" static inline int get_ptag(uint8_t *out_ptag) diff --git a/opal/mca/btl/usnic/btl_usnic_compat.h b/opal/mca/btl/usnic/btl_usnic_compat.h index 1a0f5b14e9d..66aeacff7cd 100644 --- a/opal/mca/btl/usnic/btl_usnic_compat.h +++ b/opal/mca/btl/usnic/btl_usnic_compat.h @@ -4,6 +4,8 @@ * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2018-2019 Intel, Inc. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,7 +28,7 @@ #include "opal/util/error.h" /* PMIX / modex stuff */ -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" /* Proc stuff */ #include "opal/util/proc.h" diff --git a/opal/mca/common/ucx/common_ucx.c b/opal/mca/common/ucx/common_ucx.c index 640c8baaa08..8466e38be06 100644 --- a/opal/mca/common/ucx/common_ucx.c +++ b/opal/mca/common/ucx/common_ucx.c @@ -2,7 +2,7 @@ /* * Copyright (C) Mellanox Technologies Ltd. 2018. ALL RIGHTS RESERVED. * Copyright (c) 2019 Intel, Inc. All rights reserved. - * Copyright (c) 2019 Research Organization for Information Science + * Copyright (c) 2019-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2021 Triad National Security, LLC. All rights * reserved. @@ -22,7 +22,7 @@ #include "common_ucx.h" #include "opal/mca/base/mca_base_framework.h" #include "opal/mca/base/mca_base_var.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/memoryhooks/memory.h" #include "opal/util/argv.h" #include "opal/util/printf.h" diff --git a/opal/mca/common/ucx/common_ucx_wpool.c b/opal/mca/common/ucx/common_ucx_wpool.c index ae290201710..50dc1237397 100644 --- a/opal/mca/common/ucx/common_ucx_wpool.c +++ b/opal/mca/common/ucx/common_ucx_wpool.c @@ -1,3 +1,14 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "opal_config.h" #include "common_ucx.h" @@ -5,7 +16,7 @@ #include "common_ucx_wpool_int.h" #include "opal/mca/base/mca_base_framework.h" #include "opal/mca/base/mca_base_var.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/memoryhooks/memory.h" #include "opal/util/proc.h" #include "opal/util/sys_limits.h" diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c index 7e43b476c09..16371d1cc25 100644 --- a/opal/mca/hwloc/base/hwloc_base_util.c +++ b/opal/mca/hwloc/base/hwloc_base_util.c @@ -14,7 +14,7 @@ * Copyright (c) 2012-2017 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (C) 2018 Mellanox Technologies, Ltd. * All rights reserved. @@ -50,7 +50,7 @@ #endif #include "opal/constants.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/threads/tsd.h" #include "opal/runtime/opal.h" #include "opal/util/argv.h" diff --git a/opal/mca/pmix/Makefile.am b/opal/mca/pmix/Makefile.am deleted file mode 100644 index 6fa5781f92a..00000000000 --- a/opal/mca/pmix/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2014-2019 Intel, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -EXTRA_DIST = autogen.options -dist_opaldata_DATA = - -# main library setup -noinst_LTLIBRARIES = libmca_pmix.la -libmca_pmix_la_SOURCES = - -# local files -headers = pmix-internal.h \ - pmix-3rdparty.h -libmca_pmix_la_SOURCES += $(headers) - -# Conditionally install the header files -if WANT_INSTALL_HEADERS -opaldir = $(opalincludedir)/$(subdir) -nobase_opal_HEADERS = $(headers) -endif - -include base/Makefile.am diff --git a/opal/mca/pmix/autogen.options b/opal/mca/pmix/autogen.options deleted file mode 100644 index 4399a0c907f..00000000000 --- a/opal/mca/pmix/autogen.options +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2017 Cisco Systems, Inc. All rights reserved -# Copyright (c) 2019 Intel, Inc. All rights reserved. -# $COPYRIGHT$ -# - -# Per https://github.com/open-mpi/ompi/issues/2616, we cannot have an -# "pmix.h" in the framework directory (due to conflicts of finding -# the system pmix.h file when using "--with-pmix=external"). Hence, -# we need to deviate from the framework norm of having -# framework/framework.h (i.e., pmix/pmix.h). Instead, we'll have -# pmix/pmix-internal.h to make sure that this header file can never -# be mistaken for a system-level pmix.h. - -framework_header = pmix-internal.h diff --git a/opal/mca/pmix/base/Makefile.am b/opal/mca/pmix/base/Makefile.am deleted file mode 100644 index e2b5aece7c1..00000000000 --- a/opal/mca/pmix/base/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (c) 2010-2022 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved. -# Copyright (c) 2014-2019 Intel, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -headers += \ - base/base.h \ - base/static-components.h - -libmca_pmix_la_SOURCES += \ - base/pmix_base_frame.c \ - base/pmix_base_fns.c diff --git a/opal/mca/pmix/base/base.h b/opal/mca/pmix/base/base.h deleted file mode 100644 index 380a98dbcec..00000000000 --- a/opal/mca/pmix/base/base.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2020 Triad National Security, LLC. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ -/** @file: - */ - -#ifndef MCA_PMI_BASE_H -#define MCA_PMI_BASE_H - -#include "opal_config.h" -#include "opal/mca/base/mca_base_framework.h" -#include "opal/mca/mca.h" -#include "opal/mca/threads/threads.h" -#include "opal/types.h" - -#include "opal/mca/pmix/pmix-internal.h" - -BEGIN_C_DECLS - -OPAL_DECLSPEC extern mca_base_framework_t opal_pmix_base_framework; - -/** - * Select a pmix module - */ -OPAL_DECLSPEC int opal_pmix_base_select(void); - -OPAL_DECLSPEC extern bool opal_pmix_base_allow_delayed_server; - -OPAL_DECLSPEC int opal_pmix_base_exchange(pmix_info_t *info, pmix_pdata_t *pdat, int timeout); - -typedef struct { - opal_event_base_t *evbase; - int timeout; - int initialized; - opal_pmix_lock_t lock; -} opal_pmix_base_t; - -extern opal_pmix_base_t opal_pmix_base; - -#define OPAL_PMIX_CONDITION_STATIC_INIT OPAL_CONDITION_STATIC_INIT - -END_C_DECLS - -#endif diff --git a/opal/mca/pmix/base/pmix_base_frame.c b/opal/mca/pmix/base/pmix_base_frame.c deleted file mode 100644 index cda84d77aba..00000000000 --- a/opal/mca/pmix/base/pmix_base_frame.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2016 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2022 The University of Tennessee and The University - * of Tennessee Research Foundation. All rights - * reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -#include "opal_config.h" -#include "opal/constants.h" - -#include "opal/mca/base/base.h" -#include "opal/mca/mca.h" -#include "opal/mca/threads/thread_usage.h" -#include "opal/util/argv.h" -#include "opal/util/output.h" -#include "opal/util/proc.h" - -#include "opal/mca/pmix/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" - -/* - * The following file was created by configure. It contains extern - * components and the definition of an array of pointers to each - * module's public mca_base_module_t struct. - */ - -#include "opal/mca/pmix/base/static-components.h" - -bool opal_pmix_collect_all_data = true; -int opal_pmix_verbose_output = -1; -bool opal_pmix_base_async_modex = false; -opal_pmix_base_t opal_pmix_base = {.evbase = NULL, - .timeout = 0, - .initialized = 0, - .lock = {.mutex = OPAL_MUTEX_STATIC_INIT, - .cond = OPAL_PMIX_CONDITION_STATIC_INIT, - .active = false}}; - -static int opal_pmix_base_frame_register(mca_base_register_flag_t flags) -{ - opal_pmix_base_async_modex = false; - (void) mca_base_var_register("opal", "pmix", "base", "async_modex", - "Use asynchronous modex mode", MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0, - OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, - &opal_pmix_base_async_modex); - opal_pmix_collect_all_data = true; - (void) mca_base_var_register("opal", "pmix", "base", "collect_data", - "Collect all data during modex", MCA_BASE_VAR_TYPE_BOOL, NULL, 0, - 0, OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, - &opal_pmix_collect_all_data); - - opal_pmix_base.timeout = -1; - (void) mca_base_var_register("opal", "pmix", "base", "exchange_timeout", - "Time (in seconds) to wait for a data exchange to complete", - MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, OPAL_INFO_LVL_3, - MCA_BASE_VAR_SCOPE_READONLY, &opal_pmix_base.timeout); - return OPAL_SUCCESS; -} - -static char* -opal_get_proc_hostname_using_pmix(const opal_proc_t *proc) -{ - int ret; - char *hostname; - - /* if the proc is NULL, then we can't know */ - if (NULL == proc) { - return strdup("unknown"); - } - - /* if it is my own hostname we are after, then just hand back - * the value in opal_process_info */ - if (proc == opal_proc_local_get()) { - return strdup(opal_process_info.nodename); - } - /* if we don't already have it, then try to get it */ - OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, PMIX_HOSTNAME, &proc->proc_name, (char **) &hostname, - PMIX_STRING); - if (OPAL_SUCCESS != ret) { - return strdup("unknown"); // return something so the caller doesn't segfault - } - /* user is not allowed to release the data */ - return hostname; -} - -static int opal_pmix_base_frame_close(void) -{ - int rc; - - rc = mca_base_framework_components_close(&opal_pmix_base_framework, NULL); - return rc; -} - -static int opal_pmix_base_frame_open(mca_base_open_flag_t flags) -{ - int rc; - - /* Open up all available components */ - rc = mca_base_framework_components_open(&opal_pmix_base_framework, flags); - /* default to the OPAL event base */ - opal_pmix_base.evbase = opal_sync_event_base; - /* pass across the verbosity */ - opal_pmix_verbose_output = opal_pmix_base_framework.framework_output; - /* Set the distributed name service via PMIx */ - opal_get_proc_hostname = opal_get_proc_hostname_using_pmix; - return rc; -} - -MCA_BASE_FRAMEWORK_DECLARE(opal, pmix, "OPAL PMI Client Framework", opal_pmix_base_frame_register, - opal_pmix_base_frame_open, opal_pmix_base_frame_close, - mca_pmix_base_static_components, 0); diff --git a/opal/mca/pmix/base/static-components.h b/opal/mca/pmix/base/static-components.h deleted file mode 100644 index f2be97a0c2b..00000000000 --- a/opal/mca/pmix/base/static-components.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * $HEADER$ - */ -#if defined(c_plusplus) || defined(__cplusplus) -extern "C" { -#endif - -extern const mca_base_component_t mca_pmix_pmix4x_component; - -const mca_base_component_t *mca_pmix_base_static_components[] = { - - NULL}; - -#if defined(c_plusplus) || defined(__cplusplus) -} -#endif diff --git a/opal/mca/pmix/configure.m4 b/opal/mca/pmix/configure.m4 deleted file mode 100644 index e7dfc10bd53..00000000000 --- a/opal/mca/pmix/configure.m4 +++ /dev/null @@ -1,29 +0,0 @@ -dnl -*- shell-script -*- -dnl -dnl Copyright (c) 2010-2017 Cisco Systems, Inc. All rights reserved -dnl Copyright (c) 2019 Intel, Inc. All rights reserved. -dnl Copyright (c) 2020 Amazon.com, Inc. or its affiliates. All Rights -dnl reserved. -dnl $COPYRIGHT$ -dnl -dnl Additional copyrights may follow -dnl -dnl $HEADER$ -dnl - -# -# In days of old, pmix was packaged as multiple MCA components, and -# grew an extensive set of base code to support Open MPI's use of -# pmix. When internal builds of libevent, hwloc, and pmix were moved -# out of components into base code so that they could be shared -# between Open MPI and PRRTE without incurring linking hell, we left -# the base code active. This MCA framework is essentially defunct; -# its only purpose is to allow continued use of the base code. -# -# We do not expect to find any components, nor do we allow any to be -# configured. The top-level configure will set all the flags in all -# the right places needed to link pmix. -# -AC_DEFUN([MCA_opal_pmix_CONFIG],[ - AC_CONFIG_FILES([$1/mca/$2/Makefile]) -]) diff --git a/opal/mca/pmix/pmix-3rdparty.h b/opal/mca/pmix/pmix-3rdparty.h deleted file mode 100644 index 7e2dd4724dd..00000000000 --- a/opal/mca/pmix/pmix-3rdparty.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2020 Amazon.com, Inc. or its affiliates. - * All Rights reserved. - * $COPYRIGHT$ - * - * Additional copyrights may follow - * - * $HEADER$ - */ - -/* - * TODO: UGLY HACK ALERT! - * - * PRRTE uses --with-pmix-header as a key that it is using an internal - * PMIx build (same with libevent/hwloc), and that header has to - * include all the files that the prrte source expects. This is a - * pain and the long term fix is to add the "cobuild" support to PRRTE - * similar to what was done for PMIx. Until those patches land, this - * header includes all the right pieces required. - */ - -#ifndef OPAL_PMIX_3RDPARTY_H -#define OPAL_PMIX_3RDPARTY_H - -#include -#include -#include -#include - -#endif diff --git a/opal/mca/reachable/weighted/reachable_weighted.h b/opal/mca/reachable/weighted/reachable_weighted.h index 85bc50232c3..7ea3e38ccea 100644 --- a/opal/mca/reachable/weighted/reachable_weighted.h +++ b/opal/mca/reachable/weighted/reachable_weighted.h @@ -2,6 +2,8 @@ * Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2017-2020 Amazon.com, Inc. or its affiliates. * All Rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -26,8 +28,6 @@ #include "opal/util/event.h" #include "opal/util/proc.h" -#include "opal/mca/pmix/base/base.h" - BEGIN_C_DECLS typedef struct { diff --git a/opal/mca/smsc/cma/smsc_cma_module.c b/opal/mca/smsc/cma/smsc_cma_module.c index 0aeec05c084..bd1112c390d 100644 --- a/opal/mca/smsc/cma/smsc_cma_module.c +++ b/opal/mca/smsc/cma/smsc_cma_module.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2010-2014 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2014-2018 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2020 The University of Tennessee and The University * of Tennessee Research Foundation. All rights @@ -17,7 +17,7 @@ */ #include "opal_config.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/smsc/base/base.h" #include "opal/mca/smsc/cma/smsc_cma_internal.h" diff --git a/opal/mca/smsc/knem/smsc_knem_module.c b/opal/mca/smsc/knem/smsc_knem_module.c index 6b38ddd3b7b..4d256cd3562 100644 --- a/opal/mca/smsc/knem/smsc_knem_module.c +++ b/opal/mca/smsc/knem/smsc_knem_module.c @@ -7,6 +7,8 @@ * reserved. * Copyright (c) 2020-2021 Google, LLC. All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -18,7 +20,7 @@ #include "opal/include/opal/align.h" #include "opal/mca/memchecker/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/rcache/rcache.h" #include "opal/mca/smsc/base/base.h" #include "opal/mca/smsc/knem/smsc_knem_internal.h" diff --git a/opal/mca/smsc/xpmem/smsc_xpmem_module.c b/opal/mca/smsc/xpmem/smsc_xpmem_module.c index 037d9d31fe7..45df1893db8 100644 --- a/opal/mca/smsc/xpmem/smsc_xpmem_module.c +++ b/opal/mca/smsc/xpmem/smsc_xpmem_module.c @@ -9,6 +9,8 @@ * Copyright (c) 2021 Nanook Consulting. All rights reserved. * Copyright (c) 2022-2023 Computer Architecture and VLSI Systems (CARV) * Laboratory, ICS Forth. All rights reserved. + * Copyright (c) 2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -20,7 +22,7 @@ #include "opal/include/opal/align.h" #include "opal/mca/memchecker/base/base.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/mca/rcache/rcache.h" #include "opal/mca/smsc/base/base.h" #include "opal/mca/smsc/xpmem/smsc_xpmem_internal.h" diff --git a/opal/pmix/Makefile.am b/opal/pmix/Makefile.am new file mode 100644 index 00000000000..0123c4777fe --- /dev/null +++ b/opal/pmix/Makefile.am @@ -0,0 +1,19 @@ +# +# Copyright (c) 2014-2019 Intel, Inc. All rights reserved. +# Copyright (c) 2024 Research Organization for Information Science +# and Technology (RIST). All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +EXTRA_DIST = autogen.options +dist_opaldata_DATA += pmix/help-pmix-base.txt + +headers += pmix/pmix-internal.h + +# main library setup +lib@OPAL_LIB_NAME@_la_SOURCES += \ + pmix/pmix.c diff --git a/opal/pmix/help-pmix-base.txt b/opal/pmix/help-pmix-base.txt new file mode 100644 index 00000000000..5a57507d4ec --- /dev/null +++ b/opal/pmix/help-pmix-base.txt @@ -0,0 +1,37 @@ + -*- text -*- +# +# Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2016 Los Alamos National Security, LLC. All rights +# reserved. +# +# Copyright (c) 2016-2018 Intel, Inc. All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# +# This is the US/English general help file for OPAL PMIx base. +# +[pmix2-init-failed] +PMI2_Init failed to intialize. Return code: %d +# +[pmix2-init-returned-bad-values] +PMI2_Init was intialized but negative values for job size and/or +rank was returned. +# +[old-pmix] +A version of PMIx was detected that is too old: + + Version: %s + Min version: %s + +Please reconfigure against an updated version of PMIx. +# +[incorrect-pmix] +An unexpected version of PMIx was loaded: + + Detected: %s + Expected: %s + +Please check the library path and reconfigure if required. diff --git a/opal/mca/pmix/pmix-internal.h b/opal/pmix/pmix-internal.h similarity index 98% rename from opal/mca/pmix/pmix-internal.h rename to opal/pmix/pmix-internal.h index 4e10393f60f..1a8eefe7dd8 100644 --- a/opal/mca/pmix/pmix-internal.h +++ b/opal/pmix/pmix-internal.h @@ -43,6 +43,7 @@ #include "opal/mca/threads/threads.h" #include "opal/util/error.h" #include "opal/util/event.h" +#include "opal/mca/threads/threads.h" #include @@ -715,26 +716,20 @@ OPAL_DECLSPEC int opal_pmix_register_cleanup(char *path, bool directory, bool ig # endif #endif -/** - * Structure for pmix components. - */ -struct opal_pmix_base_component_2_0_0_t { - /** MCA base component */ - mca_base_component_t base_version; - /** MCA base data */ - mca_base_component_data_t base_data; -}; +OPAL_DECLSPEC extern bool opal_pmix_base_allow_delayed_server; -/** - * Convenience typedef - */ -typedef struct opal_pmix_base_component_2_0_0_t opal_pmix_base_component_2_0_0_t; -typedef struct opal_pmix_base_component_2_0_0_t opal_pmix_component_t; +OPAL_DECLSPEC int opal_pmix_base_exchange(pmix_info_t *info, pmix_pdata_t *pdat, int timeout); -/** - * Macro for use in components that are of type hwloc - */ -#define OPAL_PMIX_BASE_VERSION_2_0_0 OPAL_MCA_BASE_VERSION_2_1_0("pmix", 2, 0, 0) +typedef struct { + opal_event_base_t *evbase; + int timeout; + int initialized; + opal_pmix_lock_t lock; +} opal_pmix_base_t; + +extern opal_pmix_base_t opal_pmix_base; + +#define OPAL_PMIX_CONDITION_STATIC_INIT OPAL_CONDITION_STATIC_INIT END_C_DECLS diff --git a/opal/mca/pmix/base/pmix_base_fns.c b/opal/pmix/pmix.c similarity index 91% rename from opal/mca/pmix/base/pmix_base_fns.c rename to opal/pmix/pmix.c index 60ce2df06cb..34900cad0b4 100644 --- a/opal/mca/pmix/base/pmix_base_fns.c +++ b/opal/pmix/pmix.c @@ -3,12 +3,15 @@ * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2016 Mellanox Technologies, Inc. * All rights reserved. * Copyright (c) 2016-2022 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2021 Nanook Consulting. All rights reserved. + * Copyright (c) 2022 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -38,8 +41,7 @@ #include "opal_stdint.h" #include "opal/mca/base/mca_base_vari.h" -#include "opal/mca/pmix/base/base.h" - +#include "opal/pmix/pmix-internal.h" #include "src/include/pmix_frameworks.h" int opal_pmix_base_exchange(pmix_info_t *indat, pmix_pdata_t *outdat, int timeout) @@ -703,3 +705,50 @@ static void infoitdecon(opal_info_item_t *p) OBJ_CLASS_INSTANCE(opal_info_item_t, opal_list_item_t, infoitmcon, infoitdecon); OBJ_CLASS_INSTANCE(opal_proclist_t, opal_list_item_t, NULL, NULL); + +/* + * The following file was created by configure. It contains extern + * components and the definition of an array of pointers to each + * module's public mca_base_module_t struct. + */ + +bool opal_pmix_collect_all_data = true; +int opal_pmix_verbose_output = -1; +bool opal_pmix_base_async_modex = false; +opal_pmix_base_t opal_pmix_base = {.evbase = NULL, + .timeout = 0, + .initialized = 0, + .lock = {.mutex = OPAL_MUTEX_STATIC_INIT, + .cond = OPAL_PMIX_CONDITION_STATIC_INIT, + .active = false}}; + +static char* +opal_get_proc_hostname_using_pmix(const opal_proc_t *proc) +{ + int ret; + char *hostname; + + /* if the proc is NULL, then we can't know */ + if (NULL == proc) { + return strdup("unknown"); + } + + /* if it is my own hostname we are after, then just hand back + * the value in opal_process_info */ + if (proc == opal_proc_local_get()) { + return strdup(opal_process_info.nodename); + } + /* if we don't already have it, then try to get it */ + OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, PMIX_HOSTNAME, &proc->proc_name, (char **) &hostname, + PMIX_STRING); + if (OPAL_SUCCESS != ret) { + return strdup("unknown"); // return something so the caller doesn't segfault + } + /* user is not allowed to release the data */ + return hostname; +} + +MCA_BASE_FRAMEWORK_DECLARE(opal, pmix, "OPAL PMI Client Framework", NULL, + NULL, NULL, + {NULL}, 0); + diff --git a/opal/runtime/opal_init.c b/opal/runtime/opal_init.c index 5ad0792e34f..17c5a3d1976 100644 --- a/opal/runtime/opal_init.c +++ b/opal/runtime/opal_init.c @@ -16,8 +16,8 @@ * Copyright (c) 2010-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2015-2024 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2017-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. * All Rights reserved. * Copyright (c) 2018 Mellanox Technologies, Inc. @@ -53,7 +53,6 @@ #include "opal/mca/memcpy/base/base.h" #include "opal/mca/memory/base/base.h" #include "opal/mca/patcher/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "opal/mca/reachable/base/base.h" #include "opal/mca/shmem/base/base.h" #include "opal/mca/smsc/base/base.h" @@ -130,7 +129,6 @@ static mca_base_framework_t *opal_init_frameworks[] = { &opal_memcpy_base_framework, &opal_memchecker_base_framework, &opal_backtrace_base_framework, &opal_timer_base_framework, &opal_shmem_base_framework, &opal_reachable_base_framework, - &opal_pmix_base_framework, NULL, }; diff --git a/opal/runtime/opal_init_core.c b/opal/runtime/opal_init_core.c index d9279376455..05ef2800bc6 100644 --- a/opal/runtime/opal_init_core.c +++ b/opal/runtime/opal_init_core.c @@ -16,7 +16,7 @@ * Copyright (c) 2010-2015 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2013-2019 Intel, Inc. All rights reserved. - * Copyright (c) 2015-2017 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2017-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. * All Rights reserved. @@ -49,7 +49,6 @@ #include "opal/mca/memcpy/base/base.h" #include "opal/mca/memory/base/base.h" #include "opal/mca/patcher/base/base.h" -#include "opal/mca/pmix/base/base.h" #include "opal/mca/reachable/base/base.h" #include "opal/mca/shmem/base/base.h" #include "opal/mca/smsc/base/base.h" diff --git a/opal/runtime/opal_params.c b/opal/runtime/opal_params.c index effc6d3ce0f..5a9e7e24bb9 100644 --- a/opal/runtime/opal_params.c +++ b/opal/runtime/opal_params.c @@ -17,7 +17,7 @@ * Copyright (c) 2010-2014 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2014 Hochschule Esslingen. All rights reserved. - * Copyright (c) 2015 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Mellanox Technologies, Inc. * All rights reserved. @@ -92,6 +92,23 @@ int opal_register_params(void) } #endif + opal_pmix_base_async_modex = false; + (void) mca_base_var_register("opal", "pmix", "base", "async_modex", + "Use asynchronous modex mode", MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0, + OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, + &opal_pmix_base_async_modex); + opal_pmix_collect_all_data = true; + (void) mca_base_var_register("opal", "pmix", "base", "collect_data", + "Collect all data during modex", MCA_BASE_VAR_TYPE_BOOL, NULL, 0, + 0, OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, + &opal_pmix_collect_all_data); + + opal_pmix_base.timeout = -1; + (void) mca_base_var_register("opal", "pmix", "base", "exchange_timeout", + "Time (in seconds) to wait for a data exchange to complete", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, OPAL_INFO_LVL_3, + MCA_BASE_VAR_SCOPE_READONLY, &opal_pmix_base.timeout); + opal_finalize_register_cleanup(opal_deregister_params); return OPAL_SUCCESS; diff --git a/opal/util/proc.c b/opal/util/proc.c index 25c0603ac33..8ec703a4a89 100644 --- a/opal/util/proc.c +++ b/opal/util/proc.c @@ -5,7 +5,7 @@ * reserved. * Copyright (c) 2013 Inria. All rights reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2017 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. @@ -22,7 +22,7 @@ #include "opal_config.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/util/arch.h" #include "opal/util/proc.h" #include "opal/util/string_copy.h" diff --git a/opal/util/proc.h b/opal/util/proc.h index df8c60dddcb..78dfaa371b9 100644 --- a/opal/util/proc.h +++ b/opal/util/proc.h @@ -4,7 +4,7 @@ * reserved. * Copyright (c) 2013 Inria. All rights reserved. * Copyright (c) 2014-2020 Intel, Inc. All rights reserved. - * Copyright (c) 2014-2016 Research Organization for Information Science + * Copyright (c) 2014-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2017 Cisco Systems, Inc. All rights reserved * Copyright (c) 2020 Amazon.com, Inc. or its affiliates. All Rights @@ -25,7 +25,7 @@ #include "opal_config.h" #include "opal/class/opal_list.h" #include "opal/mca/hwloc/hwloc-internal.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" #include "opal/types.h" #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT diff --git a/oshmem/mca/memheap/base/memheap_base_mkey.c b/oshmem/mca/memheap/base/memheap_base_mkey.c index cda9253e980..2832c22930a 100644 --- a/oshmem/mca/memheap/base/memheap_base_mkey.c +++ b/oshmem/mca/memheap/base/memheap_base_mkey.c @@ -2,7 +2,7 @@ /* * Copyright (c) 2013-2015 Mellanox Technologies, Inc. * All rights reserved. - * Copyright (c) 2015-2019 Research Organization for Information Science + * Copyright (c) 2015-2024 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Intel, Inc. All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights @@ -28,7 +28,7 @@ #include "oshmem/mca/memheap/base/base.h" #include "oshmem/mca/spml/spml.h" #include "opal/util/timings.h" -#include "opal/mca/pmix/pmix-internal.h" +#include "opal/pmix/pmix-internal.h" /* Turn ON/OFF debug output from build (default 0) */ #ifndef MEMHEAP_BASE_DEBUG