diff -Nru openmpi-4.1.2/aclocal.m4 openmpi-4.1.4/aclocal.m4 --- openmpi-4.1.2/aclocal.m4 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/aclocal.m4 2022-05-29 09:51:40.000000000 +0000 @@ -1204,6 +1204,7 @@ m4_include([config/ompi_check_psm.m4]) m4_include([config/ompi_check_psm2.m4]) m4_include([config/ompi_check_pvfs2.m4]) +m4_include([config/ompi_check_ucc.m4]) m4_include([config/ompi_check_ucx.m4]) m4_include([config/ompi_config_files.m4]) m4_include([config/ompi_configure_options.m4]) diff -Nru openmpi-4.1.2/AUTHORS openmpi-4.1.4/AUTHORS --- openmpi-4.1.2/AUTHORS 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/AUTHORS 2022-05-29 09:51:40.000000000 +0000 @@ -21,6 +21,8 @@ Adrian Reber adrian@lisas.de areber@redhat.com +Ake Sandgren + ake.sandgren@hpc2n.umu.se Akshay Venkatesh akvenkatesh@nvidia.com Alejandro Vilches @@ -145,6 +147,8 @@ Durgesh durg1222@in.ibm.com Edgar Gabriel + edgar.gabriel1@outlook.com + edgar.gabriel@amd.com egabriel@central.uh.edu gabriel@cs.uh.edu Elena Elkina @@ -249,6 +253,7 @@ jroman@dsic.upv.es Joseph Schuchart schuchart@hlrs.de + schuchart@icl.utk.edu Josh Hursey jhursey@us.ibm.com jjhursey@open-mpi.org @@ -287,6 +292,8 @@ lgenkin@nvidia.com Li-Ta Lo ollie@lanl.gov +Mamzi Bayatpour mbayatpour@nvidia.com () + mbayatpour@helios001.hpcadvisorycouncil.com Mangala Jyothi Bhaskar mjbhaskar@salmon.cs.uh.edu mjbhaskar@uh.edu diff -Nru openmpi-4.1.2/config/autogen_found_items.m4 openmpi-4.1.4/config/autogen_found_items.m4 --- openmpi-4.1.2/config/autogen_found_items.m4 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/config/autogen_found_items.m4 2022-05-29 09:51:40.000000000 +0000 @@ -5,8 +5,8 @@ dnl This file is automatically created by autogen.pl; it should not dnl be edited by hand!! dnl -dnl Generated by ec2-user at Wed Nov 24 16:40:48 2021 -dnl on ip-172-31-1-198.us-west-2.compute.internal. +dnl Generated by ec2-user at Thu May 26 14:32:49 2022 +dnl on ip-172-31-4-35.us-west-2.compute.internal. dnl --------------------------------------------------------------------------- dnl Platform file @@ -218,7 +218,7 @@ m4_define([mca_ompi_bml_no_config_component_list], []) dnl Components in the ompi / coll framework -m4_define([mca_ompi_coll_m4_config_component_list], [cuda, fca, hcoll, monitoring, portals4]) +m4_define([mca_ompi_coll_m4_config_component_list], [cuda, fca, hcoll, monitoring, portals4, ucc]) m4_define([mca_ompi_coll_no_config_component_list], [adapt, basic, han, inter, libnbc, self, sm, sync, tuned]) dnl Components in the ompi / crcp framework @@ -291,7 +291,7 @@ m4_define([mca_oshmem_memheap_no_config_component_list], [buddy, ptmalloc]) dnl Components in the oshmem / scoll framework -m4_define([mca_oshmem_scoll_m4_config_component_list], [fca]) +m4_define([mca_oshmem_scoll_m4_config_component_list], [fca, ucc]) m4_define([mca_oshmem_scoll_no_config_component_list], [basic, mpi]) dnl Components in the oshmem / spml framework @@ -420,6 +420,7 @@ m4_include([ompi/mca/coll/hcoll/configure.m4]) m4_include([ompi/mca/coll/monitoring/configure.m4]) m4_include([ompi/mca/coll/portals4/configure.m4]) +m4_include([ompi/mca/coll/ucc/configure.m4]) m4_include([ompi/mca/crcp/bkmrk/configure.m4]) m4_include([ompi/mca/fbtl/ime/configure.m4]) m4_include([ompi/mca/fbtl/posix/configure.m4]) @@ -456,6 +457,7 @@ m4_include([oshmem/mca/atomic/mxm/configure.m4]) m4_include([oshmem/mca/atomic/ucx/configure.m4]) m4_include([oshmem/mca/scoll/fca/configure.m4]) +m4_include([oshmem/mca/scoll/ucc/configure.m4]) m4_include([oshmem/mca/spml/ikrit/configure.m4]) m4_include([oshmem/mca/spml/ucx/configure.m4]) m4_include([oshmem/mca/sshmem/mmap/configure.m4]) diff -Nru openmpi-4.1.2/config/Makefile.in openmpi-4.1.4/config/Makefile.in --- openmpi-4.1.2/config/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/config/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1401,6 +1404,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1550,9 +1557,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1613,6 +1617,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1626,6 +1633,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/config/ompi_check_ucc.m4 openmpi-4.1.4/config/ompi_check_ucc.m4 --- openmpi-4.1.2/config/ompi_check_ucc.m4 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/config/ompi_check_ucc.m4 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,73 @@ +dnl -*- shell-script -*- +dnl +dnl Copyright (c) 2021 Mellanox Technologies. All rights reserved. +dnl Copyright (c) 2013-2021 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2015 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. +dnl $COPYRIGHT$ +dnl +dnl Additional copyrights may follow +dnl +dnl $HEADER$ +dnl + +# OMPI_CHECK_UCC(prefix, [action-if-found], [action-if-not-found]) +# -------------------------------------------------------- +# check if ucc support can be found. sets prefix_{CPPFLAGS, +# LDFLAGS, LIBS} as needed and runs action-if-found if there is +# support, otherwise executes action-if-not-found +AC_DEFUN([OMPI_CHECK_UCC],[ + OPAL_VAR_SCOPE_PUSH([ompi_check_ucc_dir ompi_check_ucc_happy CPPFLAGS_save LDFLAGS_save LIBS_save]) + + AC_ARG_WITH([ucc], + [AS_HELP_STRING([--with-ucc(=DIR)], + [Build UCC (Unified Collective Communication)])]) + + AS_IF([test "$with_ucc" != "no"], + [AS_IF([test -n "$with_ucc" && test "$with_ucc" != "yes"], + [ompi_check_ucc_dir=$with_ucc]) + + CPPFLAGS_save=$CPPFLAGS + LDFLAGS_save=$LDFLAGS + LIBS_save=$LIBS + + OPAL_LOG_MSG([$1_CPPFLAGS : $$1_CPPFLAGS], 1) + OPAL_LOG_MSG([$1_LDFLAGS : $$1_LDFLAGS], 1) + OPAL_LOG_MSG([$1_LIBS : $$1_LIBS], 1) + + OPAL_CHECK_PACKAGE([$1], + [ucc/api/ucc.h], + [ucc], + [ucc_init_version], + [], + [$ompi_check_ucc_dir], + [], + [ompi_check_ucc_happy="yes"], + [ompi_check_ucc_happy="no"]) + + AS_IF([test "$ompi_check_ucc_happy" = "yes"], + [ + CPPFLAGS=$coll_ucc_CPPFLAGS + LDFLAGS=$coll_ucc_LDFLAGS + LIBS=$coll_ucc_LIBS + AC_CHECK_FUNCS(ucc_comm_free, [], []) + ], + []) + + CPPFLAGS=$CPPFLAGS_save + LDFLAGS=$LDFLAGS_save + LIBS=$LIBS_save], + [ompi_check_ucc_happy=no]) + + AS_IF([test "$ompi_check_ucc_happy" = "yes" && test "$enable_progress_threads" = "yes"], + [AC_MSG_WARN([ucc driver does not currently support progress threads. Disabling UCC.]) + ompi_check_ucc_happy="no"]) + + AS_IF([test "$ompi_check_ucc_happy" = "yes"], + [$2], + [AS_IF([test -n "$with_ucc" && test "$with_ucc" != "no"], + [AC_MSG_ERROR([UCC support requested but not found. Aborting])]) + $3]) + + OPAL_VAR_SCOPE_POP +]) diff -Nru openmpi-4.1.2/config/ompi_setup_mpi_fortran.m4 openmpi-4.1.4/config/ompi_setup_mpi_fortran.m4 --- openmpi-4.1.2/config/ompi_setup_mpi_fortran.m4 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/config/ompi_setup_mpi_fortran.m4 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. -dnl Copyright (c) 2006-2017 Cisco Systems, Inc. All rights reserved +dnl Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved dnl Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights dnl reserved. @@ -375,7 +375,7 @@ # The mpi_f08 module in this version of Open MPI does not properly # handle if sizeof(INTEGER) != sizeof(int) with the mpi_f08 - # bindings. As of July 2020, this issue is fixed on master / what + # bindings. As of July 2020, this issue is fixed on main / what # will eventually become Open MPI v5.0.x, but the fix causes an # ABI break. Hence, we're not going to fix it here on this # release branch. diff -Nru openmpi-4.1.2/config/orte_check_lsf.m4 openmpi-4.1.4/config/orte_check_lsf.m4 --- openmpi-4.1.2/config/orte_check_lsf.m4 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/config/orte_check_lsf.m4 2022-05-29 09:51:40.000000000 +0000 @@ -77,10 +77,12 @@ # on AIX it should be in libbsd # on HP-UX it should be in libBSD # on IRIX < 6 it should be in libsun (IRIX 6 and later it is in libc) + # on RHEL: libnsl, libnsl2 AND libnsl2-devel are required to link libnsl to get yp_all. AS_IF([test "$orte_check_lsf_happy" = "yes"], [OPAL_SEARCH_LIBS_COMPONENT([yp_all_nsl], [yp_all], [nsl bsd BSD sun], [orte_check_lsf_happy="yes"], - [orte_check_lsf_happy="no"])]) + [AC_MSG_WARN([[Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details.]]) + orte_check_lsf_happy="no"])]) # liblsf requires shm_open, shm_unlink, which are in librt AS_IF([test "$orte_check_lsf_happy" = "yes"], @@ -154,18 +156,18 @@ # (3) Check to see if the -levent is from Libevent (check for a symbol it has) AC_CHECK_LIB([event], [evthread_set_condition_callbacks], [AC_MSG_CHECKING([for libevent conflict]) - AC_MSG_RESULT([No. The correct libevent.so was linked.]) + AC_MSG_RESULT([No conflict found. The correct libevent.so was linked.]) orte_check_lsf_event_conflict=no], [# (4) The libevent.so is not from Libevent. Warn the user. AC_MSG_CHECKING([for libevent conflict]) - AC_MSG_RESULT([Yes. Detected a libevent.so that is not from Libevent.]) + AC_MSG_RESULT([Conflict found. Detected a libevent.so that is not from Libevent.]) orte_check_lsf_event_conflict=yes]) ], [AC_MSG_CHECKING([for libevent conflict]) - AC_MSG_RESULT([No. Internal Libevent or libevent_core is being used.]) + AC_MSG_RESULT([No conflict found. Internal Libevent or libevent_core is being used.]) orte_check_lsf_event_conflict=na])], [AC_MSG_CHECKING([for libevent conflict]) - AC_MSG_RESULT([No. LSF checks passed.]) + AC_MSG_RESULT([No conflict found. LSF checks passed.]) orte_check_lsf_event_conflict=na]) AS_IF([test "$orte_check_lsf_event_conflict" = "yes"], diff -Nru openmpi-4.1.2/configure openmpi-4.1.4/configure --- openmpi-4.1.2/configure 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/configure 2022-05-29 09:51:40.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Open MPI 4.1.2. +# Generated by GNU Autoconf 2.69 for Open MPI 4.1.4. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='Open MPI' PACKAGE_TARNAME='openmpi' -PACKAGE_VERSION='4.1.2' -PACKAGE_STRING='Open MPI 4.1.2' +PACKAGE_VERSION='4.1.4' +PACKAGE_STRING='Open MPI 4.1.4' PACKAGE_BUGREPORT='http://www.open-mpi.org/community/help/' PACKAGE_URL='' @@ -783,6 +783,12 @@ MCA_oshmem_scoll_DSO_COMPONENTS MCA_oshmem_scoll_STATIC_COMPONENTS MCA_oshmem_scoll_ALL_COMPONENTS +MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE +MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE +scoll_ucc_LIBS +scoll_ucc_LDFLAGS +scoll_ucc_CPPFLAGS +scoll_ucc_CFLAGS MCA_BUILD_oshmem_scoll_fca_DSO_FALSE MCA_BUILD_oshmem_scoll_fca_DSO_TRUE scoll_fca_HOME @@ -1088,6 +1094,8 @@ MCA_ompi_coll_DSO_COMPONENTS MCA_ompi_coll_STATIC_COMPONENTS MCA_ompi_coll_ALL_COMPONENTS +MCA_BUILD_ompi_coll_ucc_DSO_FALSE +MCA_BUILD_ompi_coll_ucc_DSO_TRUE MCA_BUILD_ompi_coll_portals4_DSO_FALSE MCA_BUILD_ompi_coll_portals4_DSO_TRUE coll_portals4_LIBS @@ -1514,9 +1522,9 @@ MCA_opal_reachable_ALL_COMPONENTS MCA_BUILD_opal_reachable_netlink_DSO_FALSE MCA_BUILD_opal_reachable_netlink_DSO_TRUE -opal_reachable_netlink_LIBS -opal_reachable_netlink_LDFLAGS -opal_reachable_netlink_CPPFLAGS +reachable_netlink_LIBS +reachable_netlink_LDFLAGS +reachable_netlink_CPPFLAGS MCA_BUILD_opal_reachable_weighted_DSO_FALSE MCA_BUILD_opal_reachable_weighted_DSO_TRUE MCA_opal_rcache_DSO_SUBDIRS @@ -2470,7 +2478,11 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +coll_ucc_LIBS +coll_ucc_LDFLAGS +coll_ucc_CPPFLAGS +coll_ucc_CFLAGS' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -2636,6 +2648,7 @@ with_singularity with_fca with_hcoll +with_ucc with_ime with_pvfs2 with_gpfs @@ -3262,7 +3275,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Open MPI 4.1.2 to adapt to many kinds of systems. +\`configure' configures Open MPI 4.1.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -3337,7 +3350,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Open MPI 4.1.2:";; + short | recursive ) echo "Configuration of Open MPI 4.1.4:";; esac cat <<\_ACEOF @@ -3823,6 +3836,7 @@ support, optionally adding DIR/include and DIR/lib or DIR/lib64 to the search path for headers and libraries + --with-ucc(=DIR) Build UCC (Unified Collective Communication) --with-ime(=DIR) Build IME support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries @@ -4023,7 +4037,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Open MPI configure 4.1.2 +Open MPI configure 4.1.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -5204,7 +5218,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Open MPI $as_me 4.1.2, which was +It was created by Open MPI $as_me 4.1.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5701,7 +5715,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:5704: Loading environment file $with_platform, with contents below" >&5 + echo "configure:5718: Loading environment file $with_platform, with contents below" >&5 else echo Loading environment file $with_platform, with contents below >&5 fi @@ -5734,7 +5748,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:5737: Loaded platform arguments for $platform_loaded" >&5 + echo "configure:5751: Loaded platform arguments for $platform_loaded" >&5 else echo Loaded platform arguments for $platform_loaded >&5 fi @@ -5930,7 +5944,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:5933: === ${1}" >&5 + echo "configure:5947: === ${1}" >&5 else echo === ${1} >&5 fi @@ -5946,7 +5960,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:5949: *** ${1}" >&5 + echo "configure:5963: *** ${1}" >&5 else echo *** ${1} >&5 fi @@ -5962,7 +5976,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:5965: +++ ${1}" >&5 + echo "configure:5979: +++ ${1}" >&5 else echo +++ ${1} >&5 fi @@ -5977,7 +5991,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:5980: --- ${1}" >&5 + echo "configure:5994: --- ${1}" >&5 else echo --- ${1} >&5 fi @@ -5992,7 +6006,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:5995: --- ${1}" >&5 + echo "configure:6009: --- ${1}" >&5 else echo --- ${1} >&5 fi @@ -8114,7 +8128,7 @@ # Define the identity of the package. PACKAGE='openmpi' - VERSION='4.1.2' + VERSION='4.1.4' # Some tools Automake needs. @@ -8494,43 +8508,11 @@ # Sanity checks - - - - dir="$srcdir" - article="a" - label="source tree" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking directory of $label" >&5 -$as_echo_n "checking directory of $label... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 -$as_echo "$dir" >&6; } - if test -n "`echo $dir | grep ' '`"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Open MPI does not support $article $label" >&5 -$as_echo "$as_me: WARNING: This version of Open MPI does not support $article $label" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: with a path that contains spaces" >&5 -$as_echo "$as_me: WARNING: with a path that contains spaces" >&2;} - as_fn_error $? "Cannot continue." "$LINENO" 5 -fi - - - case $host_os in - darwin*) - # MacOS does not have "readlink -f" or realpath (at least as - # of MacOS Cataline / 10.15). Instead, use Python, because we - # know MacOS comes with a /usr/bin/python that has - # os.path.realpath. - ompi_dir=`/usr/bin/python -c 'import os; print os.path.realpath("'$srcdir'")'` - ;; - *) - ompi_dir=`readlink -f $srcdir` - ;; - esac - +ompi_dir=`pwd` dir="$ompi_dir" - article="an" - label="absolute source tree" + article="a" + label="build tree" { $as_echo "$as_me:${as_lineno-$LINENO}: checking directory of $label" >&5 $as_echo_n "checking directory of $label... " >&6; } @@ -8545,23 +8527,9 @@ fi - case $host_os in - darwin*) - # MacOS does not have "readlink -f" or realpath (at least as - # of MacOS Cataline / 10.15). Instead, use Python, because we - # know MacOS comes with a /usr/bin/python that has - # os.path.realpath. - ompi_dir=`/usr/bin/python -c 'import os; print os.path.realpath("'.'")'` - ;; - *) - ompi_dir=`readlink -f .` - ;; - esac - - - dir="$ompi_dir" + dir="$srcdir" article="a" - label="build tree" + label="source tree" { $as_echo "$as_me:${as_lineno-$LINENO}: checking directory of $label" >&5 $as_echo_n "checking directory of $label... " >&6; } @@ -8593,37 +8561,6 @@ fi - case $host_os in - darwin*) - # MacOS does not have "readlink -f" or realpath (at least as - # of MacOS Cataline / 10.15). Instead, use Python, because we - # know MacOS comes with a /usr/bin/python that has - # os.path.realpath. - ompi_dir=`/usr/bin/python -c 'import os; print os.path.realpath("'$prefix'")'` - ;; - *) - ompi_dir=`readlink -f $prefix` - ;; - esac - - - dir="$ompi_dir" - article="an" - label="absolute prefix" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking directory of $label" >&5 -$as_echo_n "checking directory of $label... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dir" >&5 -$as_echo "$dir" >&6; } - if test -n "`echo $dir | grep ' '`"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Open MPI does not support $article $label" >&5 -$as_echo "$as_me: WARNING: This version of Open MPI does not support $article $label" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: with a path that contains spaces" >&5 -$as_echo "$as_me: WARNING: with a path that contains spaces" >&2;} - as_fn_error $? "Cannot continue." "$LINENO" 5 -fi - - opal_show_subtitle "Checking versions" # Get the version of OMPI that we are installing @@ -9923,7 +9860,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:9926: Loading cross-compile file $with_cross, with contents below" >&5 + echo "configure:9863: Loading cross-compile file $with_cross, with contents below" >&5 else echo Loading cross-compile file $with_cross, with contents below >&5 fi @@ -11043,14 +10980,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:11046: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lz $LIBS $opal_zlib_LIBS" >&5 +echo "configure:10983: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lz $LIBS $opal_zlib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lz $LIBS $opal_zlib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:11053: \$? = $opal_status" >&5 + echo "configure:10990: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -11768,14 +11705,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:11771: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lz $LIBS $opal_zlib_LIBS" >&5 +echo "configure:11708: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lz $LIBS $opal_zlib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lz $LIBS $opal_zlib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:11778: \$? = $opal_status" >&5 + echo "configure:11715: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -20703,14 +20640,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:20706: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:20643: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:20713: \$? = $opal_status" >&5 + echo "configure:20650: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -20746,14 +20683,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:20749: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:20686: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:20756: \$? = $opal_status" >&5 + echo "configure:20693: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -20789,14 +20726,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:20792: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:20729: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:20799: \$? = $opal_status" >&5 + echo "configure:20736: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -20818,7 +20755,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:20821: the failed program was:" >&5 + echo "configure:20758: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -20846,7 +20783,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:20849: the failed program was:" >&5 + echo "configure:20786: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -20877,14 +20814,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:20880: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:20817: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:20887: \$? = $opal_status" >&5 + echo "configure:20824: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -20906,7 +20843,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:20909: the failed program was:" >&5 + echo "configure:20846: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -20950,14 +20887,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:20953: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:20890: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:20960: \$? = $opal_status" >&5 + echo "configure:20897: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -20979,7 +20916,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:20982: the failed program was:" >&5 + echo "configure:20919: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21016,7 +20953,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21019: the failed program was:" >&5 + echo "configure:20956: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21047,14 +20984,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21050: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:20987: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21057: \$? = $opal_status" >&5 + echo "configure:20994: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21090,14 +21027,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21093: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21030: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21100: \$? = $opal_status" >&5 + echo "configure:21037: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21119,7 +21056,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21122: the failed program was:" >&5 + echo "configure:21059: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21147,7 +21084,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21150: the failed program was:" >&5 + echo "configure:21087: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21178,14 +21115,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21181: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21118: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21188: \$? = $opal_status" >&5 + echo "configure:21125: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21207,7 +21144,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21210: the failed program was:" >&5 + echo "configure:21147: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21251,14 +21188,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21254: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21191: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21261: \$? = $opal_status" >&5 + echo "configure:21198: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21280,7 +21217,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21283: the failed program was:" >&5 + echo "configure:21220: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21333,14 +21270,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21336: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21273: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21343: \$? = $opal_status" >&5 + echo "configure:21280: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21376,14 +21313,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21379: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21316: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21386: \$? = $opal_status" >&5 + echo "configure:21323: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21405,7 +21342,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21408: the failed program was:" >&5 + echo "configure:21345: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21433,7 +21370,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21436: the failed program was:" >&5 + echo "configure:21373: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21464,14 +21401,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21467: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21404: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21474: \$? = $opal_status" >&5 + echo "configure:21411: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21493,7 +21430,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21496: the failed program was:" >&5 + echo "configure:21433: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -21537,14 +21474,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:21540: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 +echo "configure:21477: $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.c -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:21547: \$? = $opal_status" >&5 + echo "configure:21484: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -21566,7 +21503,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:21569: the failed program was:" >&5 + echo "configure:21506: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -24302,14 +24239,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:24305: $CC $CFLAGS -c conftest_weak.c" >&5 +echo "configure:24242: $CC $CFLAGS -c conftest_weak.c" >&5 $CC $CFLAGS -c conftest_weak.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:24312: \$? = $opal_status" >&5 + echo "configure:24249: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -24319,14 +24256,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:24322: $CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:24259: $CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS" >&5 $CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:24329: \$? = $opal_status" >&5 + echo "configure:24266: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -24399,14 +24336,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:24402: $CC $CFLAGS -c conftest_weak.c" >&5 +echo "configure:24339: $CC $CFLAGS -c conftest_weak.c" >&5 $CC $CFLAGS -c conftest_weak.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:24409: \$? = $opal_status" >&5 + echo "configure:24346: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -24416,14 +24353,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:24419: $CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:24356: $CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS" >&5 $CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:24426: \$? = $opal_status" >&5 + echo "configure:24363: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -26555,14 +26492,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:26558: $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext" >&5 +echo "configure:26495: $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext" >&5 $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:26565: \$? = $opal_status" >&5 + echo "configure:26502: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -28231,14 +28168,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:28234: $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext" >&5 +echo "configure:28171: $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext" >&5 $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:28241: \$? = $opal_status" >&5 + echo "configure:28178: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -29764,23 +29701,23 @@ EOF ompi_template_failed= -echo configure:29767: $CXX $CXXFLAGS -c conftest1.C >&5 +echo configure:29704: $CXX $CXXFLAGS -c conftest1.C >&5 $CXX $CXXFLAGS -c conftest1.C >&5 2>&5 if test ! -f conftest1.o ; then ompi_cv_cxx_template_repository="templates not supported" - echo configure:29771: here is the program that failed: >&5 + echo configure:29708: here is the program that failed: >&5 cat conftest1.C >&5 - echo configure:29773: here is conftest.h: >&5 + echo configure:29710: here is conftest.h: >&5 cat conftest.h >&5 ompi_template_failed=1 else - echo configure:29777: $CXX $CXXFLAGS -c conftest2.C >&5 + echo configure:29714: $CXX $CXXFLAGS -c conftest2.C >&5 $CXX $CXXFLAGS -c conftest2.C >&5 2>&5 if test ! -f conftest2.o ; then ompi_cv_cxx_template_repository= - echo configure:29781: here is the program that failed: >&5 + echo configure:29718: here is the program that failed: >&5 cat conftest2.C >&5 - echo configure:29783: here is conftest.h: >&5 + echo configure:29720: here is conftest.h: >&5 cat conftest.h >&5 else rm -rf conftest* @@ -29895,14 +29832,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:29898: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:29835: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:29905: \$? = $opal_status" >&5 + echo "configure:29842: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -29938,14 +29875,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:29941: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:29878: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:29948: \$? = $opal_status" >&5 + echo "configure:29885: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -29981,14 +29918,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:29984: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:29921: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:29991: \$? = $opal_status" >&5 + echo "configure:29928: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30010,7 +29947,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30013: the failed program was:" >&5 + echo "configure:29950: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30038,7 +29975,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30041: the failed program was:" >&5 + echo "configure:29978: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30069,14 +30006,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30072: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30009: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30079: \$? = $opal_status" >&5 + echo "configure:30016: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30098,7 +30035,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30101: the failed program was:" >&5 + echo "configure:30038: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30142,14 +30079,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30145: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30082: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30152: \$? = $opal_status" >&5 + echo "configure:30089: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30171,7 +30108,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30174: the failed program was:" >&5 + echo "configure:30111: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30208,7 +30145,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30211: the failed program was:" >&5 + echo "configure:30148: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30239,14 +30176,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30242: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30179: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30249: \$? = $opal_status" >&5 + echo "configure:30186: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30282,14 +30219,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30285: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30222: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30292: \$? = $opal_status" >&5 + echo "configure:30229: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30311,7 +30248,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30314: the failed program was:" >&5 + echo "configure:30251: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30339,7 +30276,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30342: the failed program was:" >&5 + echo "configure:30279: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30370,14 +30307,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30373: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30310: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30380: \$? = $opal_status" >&5 + echo "configure:30317: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30399,7 +30336,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30402: the failed program was:" >&5 + echo "configure:30339: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30443,14 +30380,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30446: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30383: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30453: \$? = $opal_status" >&5 + echo "configure:30390: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30472,7 +30409,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30475: the failed program was:" >&5 + echo "configure:30412: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30525,14 +30462,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30528: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30465: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30535: \$? = $opal_status" >&5 + echo "configure:30472: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30568,14 +30505,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30571: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30508: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30578: \$? = $opal_status" >&5 + echo "configure:30515: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30597,7 +30534,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30600: the failed program was:" >&5 + echo "configure:30537: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30625,7 +30562,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30628: the failed program was:" >&5 + echo "configure:30565: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30656,14 +30593,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30659: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30596: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30666: \$? = $opal_status" >&5 + echo "configure:30603: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30685,7 +30622,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30688: the failed program was:" >&5 + echo "configure:30625: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -30729,14 +30666,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:30732: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 +echo "configure:30669: $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT}" >&5 $opal_compiler $opal_flags -c conftest.cc -o conftest.${OBJEXT} 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:30739: \$? = $opal_status" >&5 + echo "configure:30676: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -30758,7 +30695,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:30761: the failed program was:" >&5 + echo "configure:30698: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -39550,14 +39487,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:39553: $CC $CFLAGS -c conftest.c -o conftest.$OBJEXT" >&5 +echo "configure:39490: $CC $CFLAGS -c conftest.c -o conftest.$OBJEXT" >&5 $CC $CFLAGS -c conftest.c -o conftest.$OBJEXT 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:39560: \$? = $opal_status" >&5 + echo "configure:39497: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -39570,7 +39507,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:39573: the failed program was:" >&5 + echo "configure:39510: the failed program was:" >&5 else echo the failed program was: >&5 fi @@ -44498,14 +44435,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:44501: $FC $FCFLAGS -c conftest_f.F90" >&5 +echo "configure:44438: $FC $FCFLAGS -c conftest_f.F90" >&5 $FC $FCFLAGS -c conftest_f.F90 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:44508: \$? = $opal_status" >&5 + echo "configure:44445: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -44523,14 +44460,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:44526: $FC $FCFLAGS -fpp -c conftest_f.F90" >&5 +echo "configure:44463: $FC $FCFLAGS -fpp -c conftest_f.F90" >&5 $FC $FCFLAGS -fpp -c conftest_f.F90 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:44533: \$? = $opal_status" >&5 + echo "configure:44470: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -44773,7 +44710,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:44776: Try with new FCFLAGS: $FCFLAGS_NEW and new LDFLAGS:$LDFLAGS_NEW" >&5 + echo "configure:44713: Try with new FCFLAGS: $FCFLAGS_NEW and new LDFLAGS:$LDFLAGS_NEW" >&5 else echo Try with new FCFLAGS: $FCFLAGS_NEW and new LDFLAGS:$LDFLAGS_NEW >&5 fi @@ -44789,14 +44726,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:44792: $FC $FCFLAGS_NEW -c conftest.f $LDFLAGS_NEW $LIBS" >&5 +echo "configure:44729: $FC $FCFLAGS_NEW -c conftest.f $LDFLAGS_NEW $LIBS" >&5 $FC $FCFLAGS_NEW -c conftest.f $LDFLAGS_NEW $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:44799: \$? = $opal_status" >&5 + echo "configure:44736: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -44818,7 +44755,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:44821: Could not determine Fortran naming convention. Output from $NM:" >&5 + echo "configure:44758: Could not determine Fortran naming convention. Output from $NM:" >&5 else echo Could not determine Fortran naming convention. Output from $NM: >&5 fi @@ -44934,14 +44871,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:44937: $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext" >&5 +echo "configure:44874: $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext" >&5 $CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:44944: \$? = $opal_status" >&5 + echo "configure:44881: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -45464,14 +45401,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:45467: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:45404: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45474: \$? = $opal_status" >&5 + echo "configure:45411: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -45481,14 +45418,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:45484: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:45421: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45491: \$? = $opal_status" >&5 + echo "configure:45428: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -45509,7 +45446,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45512: here is the Fortran program:" >&5 + echo "configure:45449: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -45532,14 +45469,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:45535: ./conftest" >&5 +echo "configure:45472: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45542: \$? = $opal_status" >&5 + echo "configure:45479: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -45771,14 +45708,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:45774: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:45711: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45781: \$? = $opal_status" >&5 + echo "configure:45718: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -45788,14 +45725,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:45791: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:45728: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45798: \$? = $opal_status" >&5 + echo "configure:45735: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -45826,14 +45763,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:45829: ./conftest" >&5 +echo "configure:45766: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:45836: \$? = $opal_status" >&5 + echo "configure:45773: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -46360,14 +46297,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:46363: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:46300: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46370: \$? = $opal_status" >&5 + echo "configure:46307: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -46377,14 +46314,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:46380: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:46317: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46387: \$? = $opal_status" >&5 + echo "configure:46324: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -46405,7 +46342,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46408: here is the Fortran program:" >&5 + echo "configure:46345: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -46428,14 +46365,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:46431: ./conftest" >&5 +echo "configure:46368: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46438: \$? = $opal_status" >&5 + echo "configure:46375: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -46667,14 +46604,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:46670: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:46607: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46677: \$? = $opal_status" >&5 + echo "configure:46614: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -46684,14 +46621,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:46687: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:46624: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46694: \$? = $opal_status" >&5 + echo "configure:46631: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -46722,14 +46659,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:46725: ./conftest" >&5 +echo "configure:46662: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:46732: \$? = $opal_status" >&5 + echo "configure:46669: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -47255,14 +47192,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:47258: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:47195: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47265: \$? = $opal_status" >&5 + echo "configure:47202: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -47272,14 +47209,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:47275: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:47212: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47282: \$? = $opal_status" >&5 + echo "configure:47219: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -47300,7 +47237,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47303: here is the Fortran program:" >&5 + echo "configure:47240: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -47323,14 +47260,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:47326: ./conftest" >&5 +echo "configure:47263: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47333: \$? = $opal_status" >&5 + echo "configure:47270: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -47574,14 +47511,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:47577: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:47514: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47584: \$? = $opal_status" >&5 + echo "configure:47521: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -47591,14 +47528,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:47594: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:47531: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47601: \$? = $opal_status" >&5 + echo "configure:47538: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -47629,14 +47566,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:47632: ./conftest" >&5 +echo "configure:47569: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:47639: \$? = $opal_status" >&5 + echo "configure:47576: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -48162,14 +48099,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:48165: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:48102: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48172: \$? = $opal_status" >&5 + echo "configure:48109: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -48179,14 +48116,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:48182: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:48119: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48189: \$? = $opal_status" >&5 + echo "configure:48126: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -48207,7 +48144,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48210: here is the Fortran program:" >&5 + echo "configure:48147: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -48230,14 +48167,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:48233: ./conftest" >&5 +echo "configure:48170: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48240: \$? = $opal_status" >&5 + echo "configure:48177: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -48476,14 +48413,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:48479: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:48416: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48486: \$? = $opal_status" >&5 + echo "configure:48423: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -48493,14 +48430,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:48496: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:48433: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48503: \$? = $opal_status" >&5 + echo "configure:48440: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -48531,14 +48468,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:48534: ./conftest" >&5 +echo "configure:48471: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:48541: \$? = $opal_status" >&5 + echo "configure:48478: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49064,14 +49001,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49067: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:49004: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49074: \$? = $opal_status" >&5 + echo "configure:49011: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49081,14 +49018,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49084: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:49021: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49091: \$? = $opal_status" >&5 + echo "configure:49028: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49109,7 +49046,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49112: here is the Fortran program:" >&5 + echo "configure:49049: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -49132,14 +49069,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49135: ./conftest" >&5 +echo "configure:49072: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49142: \$? = $opal_status" >&5 + echo "configure:49079: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49368,14 +49305,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49371: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:49308: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49378: \$? = $opal_status" >&5 + echo "configure:49315: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49385,14 +49322,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49388: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:49325: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49395: \$? = $opal_status" >&5 + echo "configure:49332: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49423,14 +49360,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49426: ./conftest" >&5 +echo "configure:49363: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49433: \$? = $opal_status" >&5 + echo "configure:49370: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49956,14 +49893,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49959: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:49896: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49966: \$? = $opal_status" >&5 + echo "configure:49903: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -49973,14 +49910,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:49976: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:49913: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:49983: \$? = $opal_status" >&5 + echo "configure:49920: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50001,7 +49938,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50004: here is the Fortran program:" >&5 + echo "configure:49941: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -50024,14 +49961,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50027: ./conftest" >&5 +echo "configure:49964: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50034: \$? = $opal_status" >&5 + echo "configure:49971: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50255,14 +50192,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50258: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:50195: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50265: \$? = $opal_status" >&5 + echo "configure:50202: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50272,14 +50209,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50275: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:50212: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50282: \$? = $opal_status" >&5 + echo "configure:50219: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50310,14 +50247,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50313: ./conftest" >&5 +echo "configure:50250: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50320: \$? = $opal_status" >&5 + echo "configure:50257: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50844,14 +50781,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50847: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:50784: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50854: \$? = $opal_status" >&5 + echo "configure:50791: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50861,14 +50798,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50864: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:50801: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50871: \$? = $opal_status" >&5 + echo "configure:50808: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -50889,7 +50826,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50892: here is the Fortran program:" >&5 + echo "configure:50829: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -50912,14 +50849,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:50915: ./conftest" >&5 +echo "configure:50852: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:50922: \$? = $opal_status" >&5 + echo "configure:50859: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -51146,14 +51083,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:51149: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:51086: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51156: \$? = $opal_status" >&5 + echo "configure:51093: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -51163,14 +51100,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:51166: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:51103: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51173: \$? = $opal_status" >&5 + echo "configure:51110: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -51201,14 +51138,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:51204: ./conftest" >&5 +echo "configure:51141: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51211: \$? = $opal_status" >&5 + echo "configure:51148: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -51734,14 +51671,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:51737: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:51674: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51744: \$? = $opal_status" >&5 + echo "configure:51681: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -51751,14 +51688,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:51754: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:51691: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51761: \$? = $opal_status" >&5 + echo "configure:51698: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -51779,7 +51716,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51782: here is the Fortran program:" >&5 + echo "configure:51719: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -51802,14 +51739,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:51805: ./conftest" >&5 +echo "configure:51742: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:51812: \$? = $opal_status" >&5 + echo "configure:51749: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52048,14 +51985,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52051: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:51988: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52058: \$? = $opal_status" >&5 + echo "configure:51995: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52065,14 +52002,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52068: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:52005: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52075: \$? = $opal_status" >&5 + echo "configure:52012: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52103,14 +52040,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52106: ./conftest" >&5 +echo "configure:52043: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52113: \$? = $opal_status" >&5 + echo "configure:52050: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52636,14 +52573,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52639: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:52576: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52646: \$? = $opal_status" >&5 + echo "configure:52583: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52653,14 +52590,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52656: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:52593: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52663: \$? = $opal_status" >&5 + echo "configure:52600: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52681,7 +52618,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52684: here is the Fortran program:" >&5 + echo "configure:52621: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -52704,14 +52641,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52707: ./conftest" >&5 +echo "configure:52644: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52714: \$? = $opal_status" >&5 + echo "configure:52651: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52950,14 +52887,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52953: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:52890: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52960: \$? = $opal_status" >&5 + echo "configure:52897: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -52967,14 +52904,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:52970: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:52907: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:52977: \$? = $opal_status" >&5 + echo "configure:52914: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53005,14 +52942,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53008: ./conftest" >&5 +echo "configure:52945: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53015: \$? = $opal_status" >&5 + echo "configure:52952: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53538,14 +53475,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53541: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:53478: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53548: \$? = $opal_status" >&5 + echo "configure:53485: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53555,14 +53492,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53558: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:53495: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53565: \$? = $opal_status" >&5 + echo "configure:53502: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53583,7 +53520,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53586: here is the Fortran program:" >&5 + echo "configure:53523: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -53606,14 +53543,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53609: ./conftest" >&5 +echo "configure:53546: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53616: \$? = $opal_status" >&5 + echo "configure:53553: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53842,14 +53779,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53845: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:53782: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53852: \$? = $opal_status" >&5 + echo "configure:53789: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53859,14 +53796,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53862: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:53799: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53869: \$? = $opal_status" >&5 + echo "configure:53806: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -53897,14 +53834,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:53900: ./conftest" >&5 +echo "configure:53837: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:53907: \$? = $opal_status" >&5 + echo "configure:53844: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -54430,14 +54367,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:54433: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:54370: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54440: \$? = $opal_status" >&5 + echo "configure:54377: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -54447,14 +54384,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:54450: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:54387: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54457: \$? = $opal_status" >&5 + echo "configure:54394: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -54475,7 +54412,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54478: here is the Fortran program:" >&5 + echo "configure:54415: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -54498,14 +54435,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:54501: ./conftest" >&5 +echo "configure:54438: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54508: \$? = $opal_status" >&5 + echo "configure:54445: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -54729,14 +54666,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:54732: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:54669: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54739: \$? = $opal_status" >&5 + echo "configure:54676: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -54746,14 +54683,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:54749: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:54686: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54756: \$? = $opal_status" >&5 + echo "configure:54693: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -54784,14 +54721,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:54787: ./conftest" >&5 +echo "configure:54724: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:54794: \$? = $opal_status" >&5 + echo "configure:54731: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -55317,14 +55254,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:55320: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:55257: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55327: \$? = $opal_status" >&5 + echo "configure:55264: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -55334,14 +55271,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:55337: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:55274: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55344: \$? = $opal_status" >&5 + echo "configure:55281: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -55362,7 +55299,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55365: here is the Fortran program:" >&5 + echo "configure:55302: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -55385,14 +55322,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:55388: ./conftest" >&5 +echo "configure:55325: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55395: \$? = $opal_status" >&5 + echo "configure:55332: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -55616,14 +55553,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:55619: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:55556: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55626: \$? = $opal_status" >&5 + echo "configure:55563: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -55633,14 +55570,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:55636: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:55573: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55643: \$? = $opal_status" >&5 + echo "configure:55580: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -55671,14 +55608,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:55674: ./conftest" >&5 +echo "configure:55611: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:55681: \$? = $opal_status" >&5 + echo "configure:55618: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -56205,14 +56142,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:56208: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:56145: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56215: \$? = $opal_status" >&5 + echo "configure:56152: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -56222,14 +56159,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:56225: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:56162: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56232: \$? = $opal_status" >&5 + echo "configure:56169: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -56250,7 +56187,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56253: here is the Fortran program:" >&5 + echo "configure:56190: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -56273,14 +56210,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:56276: ./conftest" >&5 +echo "configure:56213: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56283: \$? = $opal_status" >&5 + echo "configure:56220: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -56497,14 +56434,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:56500: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:56437: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56507: \$? = $opal_status" >&5 + echo "configure:56444: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -56514,14 +56451,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:56517: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:56454: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56524: \$? = $opal_status" >&5 + echo "configure:56461: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -56552,14 +56489,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:56555: ./conftest" >&5 +echo "configure:56492: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:56562: \$? = $opal_status" >&5 + echo "configure:56499: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57085,14 +57022,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57088: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:57025: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57095: \$? = $opal_status" >&5 + echo "configure:57032: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57102,14 +57039,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57105: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:57042: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57112: \$? = $opal_status" >&5 + echo "configure:57049: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57130,7 +57067,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57133: here is the Fortran program:" >&5 + echo "configure:57070: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -57153,14 +57090,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57156: ./conftest" >&5 +echo "configure:57093: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57163: \$? = $opal_status" >&5 + echo "configure:57100: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57379,14 +57316,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57382: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:57319: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57389: \$? = $opal_status" >&5 + echo "configure:57326: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57396,14 +57333,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57399: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:57336: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57406: \$? = $opal_status" >&5 + echo "configure:57343: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57434,14 +57371,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57437: ./conftest" >&5 +echo "configure:57374: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57444: \$? = $opal_status" >&5 + echo "configure:57381: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57967,14 +57904,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57970: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:57907: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57977: \$? = $opal_status" >&5 + echo "configure:57914: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -57984,14 +57921,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:57987: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:57924: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:57994: \$? = $opal_status" >&5 + echo "configure:57931: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58012,7 +57949,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58015: here is the Fortran program:" >&5 + echo "configure:57952: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -58035,14 +57972,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58038: ./conftest" >&5 +echo "configure:57975: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58045: \$? = $opal_status" >&5 + echo "configure:57982: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58261,14 +58198,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58264: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:58201: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58271: \$? = $opal_status" >&5 + echo "configure:58208: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58278,14 +58215,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58281: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:58218: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58288: \$? = $opal_status" >&5 + echo "configure:58225: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58316,14 +58253,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58319: ./conftest" >&5 +echo "configure:58256: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58326: \$? = $opal_status" >&5 + echo "configure:58263: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58849,14 +58786,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58852: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:58789: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58859: \$? = $opal_status" >&5 + echo "configure:58796: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58866,14 +58803,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58869: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:58806: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58876: \$? = $opal_status" >&5 + echo "configure:58813: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -58894,7 +58831,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58897: here is the Fortran program:" >&5 + echo "configure:58834: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -58917,14 +58854,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:58920: ./conftest" >&5 +echo "configure:58857: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:58927: \$? = $opal_status" >&5 + echo "configure:58864: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -59143,14 +59080,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:59146: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:59083: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59153: \$? = $opal_status" >&5 + echo "configure:59090: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -59160,14 +59097,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:59163: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:59100: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59170: \$? = $opal_status" >&5 + echo "configure:59107: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -59198,14 +59135,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:59201: ./conftest" >&5 +echo "configure:59138: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59208: \$? = $opal_status" >&5 + echo "configure:59145: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -59731,14 +59668,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:59734: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:59671: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59741: \$? = $opal_status" >&5 + echo "configure:59678: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -59748,14 +59685,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:59751: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:59688: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59758: \$? = $opal_status" >&5 + echo "configure:59695: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -59776,7 +59713,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59779: here is the Fortran program:" >&5 + echo "configure:59716: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -59799,14 +59736,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:59802: ./conftest" >&5 +echo "configure:59739: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:59809: \$? = $opal_status" >&5 + echo "configure:59746: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60025,14 +59962,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60028: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:59965: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60035: \$? = $opal_status" >&5 + echo "configure:59972: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60042,14 +59979,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60045: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:59982: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60052: \$? = $opal_status" >&5 + echo "configure:59989: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60080,14 +60017,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60083: ./conftest" >&5 +echo "configure:60020: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60090: \$? = $opal_status" >&5 + echo "configure:60027: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60527,14 +60464,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60530: $CC $CFLAGS -I. -c conftest_c.c" >&5 +echo "configure:60467: $CC $CFLAGS -I. -c conftest_c.c" >&5 $CC $CFLAGS -I. -c conftest_c.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60537: \$? = $opal_status" >&5 + echo "configure:60474: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60544,14 +60481,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60547: $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:60484: $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60554: \$? = $opal_status" >&5 + echo "configure:60491: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60580,14 +60517,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60583: ./conftest" >&5 +echo "configure:60520: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60590: \$? = $opal_status" >&5 + echo "configure:60527: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60754,14 +60691,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60757: $CC $CFLAGS -I. -c conftest_c.c" >&5 +echo "configure:60694: $CC $CFLAGS -I. -c conftest_c.c" >&5 $CC $CFLAGS -I. -c conftest_c.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60764: \$? = $opal_status" >&5 + echo "configure:60701: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60771,14 +60708,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60774: $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:60711: $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60781: \$? = $opal_status" >&5 + echo "configure:60718: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60807,14 +60744,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60810: ./conftest" >&5 +echo "configure:60747: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60817: \$? = $opal_status" >&5 + echo "configure:60754: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -60984,14 +60921,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:60987: $CC $CFLAGS -I. -c conftest_c.c" >&5 +echo "configure:60924: $CC $CFLAGS -I. -c conftest_c.c" >&5 $CC $CFLAGS -I. -c conftest_c.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:60994: \$? = $opal_status" >&5 + echo "configure:60931: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61001,14 +60938,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61004: $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:60941: $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61011: \$? = $opal_status" >&5 + echo "configure:60948: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61037,14 +60974,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61040: ./conftest" >&5 +echo "configure:60977: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61047: \$? = $opal_status" >&5 + echo "configure:60984: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61328,14 +61265,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61331: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:61268: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61338: \$? = $opal_status" >&5 + echo "configure:61275: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61345,14 +61282,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61348: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:61285: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61355: \$? = $opal_status" >&5 + echo "configure:61292: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61373,7 +61310,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61376: here is the Fortran program:" >&5 + echo "configure:61313: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -61396,14 +61333,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61399: ./conftest" >&5 +echo "configure:61336: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61406: \$? = $opal_status" >&5 + echo "configure:61343: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61620,14 +61557,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61623: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:61560: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61630: \$? = $opal_status" >&5 + echo "configure:61567: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61637,14 +61574,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61640: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:61577: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61647: \$? = $opal_status" >&5 + echo "configure:61584: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -61675,14 +61612,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:61678: ./conftest" >&5 +echo "configure:61615: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:61685: \$? = $opal_status" >&5 + echo "configure:61622: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -62209,14 +62146,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:62212: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:62149: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62219: \$? = $opal_status" >&5 + echo "configure:62156: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -62226,14 +62163,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:62229: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:62166: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62236: \$? = $opal_status" >&5 + echo "configure:62173: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -62254,7 +62191,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62257: here is the Fortran program:" >&5 + echo "configure:62194: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -62277,14 +62214,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:62280: ./conftest" >&5 +echo "configure:62217: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62287: \$? = $opal_status" >&5 + echo "configure:62224: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -62496,14 +62433,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:62499: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:62436: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62506: \$? = $opal_status" >&5 + echo "configure:62443: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -62513,14 +62450,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:62516: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:62453: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62523: \$? = $opal_status" >&5 + echo "configure:62460: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -62551,14 +62488,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:62554: ./conftest" >&5 +echo "configure:62491: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:62561: \$? = $opal_status" >&5 + echo "configure:62498: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63096,14 +63033,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63099: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:63036: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63106: \$? = $opal_status" >&5 + echo "configure:63043: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63113,14 +63050,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63116: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:63053: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63123: \$? = $opal_status" >&5 + echo "configure:63060: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63141,7 +63078,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63144: here is the Fortran program:" >&5 + echo "configure:63081: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -63164,14 +63101,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63167: ./conftest" >&5 +echo "configure:63104: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63174: \$? = $opal_status" >&5 + echo "configure:63111: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63380,14 +63317,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63383: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:63320: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63390: \$? = $opal_status" >&5 + echo "configure:63327: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63397,14 +63334,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63400: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:63337: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63407: \$? = $opal_status" >&5 + echo "configure:63344: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63435,14 +63372,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63438: ./conftest" >&5 +echo "configure:63375: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63445: \$? = $opal_status" >&5 + echo "configure:63382: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63968,14 +63905,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63971: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:63908: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63978: \$? = $opal_status" >&5 + echo "configure:63915: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -63985,14 +63922,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:63988: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:63925: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:63995: \$? = $opal_status" >&5 + echo "configure:63932: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64013,7 +63950,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64016: here is the Fortran program:" >&5 + echo "configure:63953: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -64036,14 +63973,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64039: ./conftest" >&5 +echo "configure:63976: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64046: \$? = $opal_status" >&5 + echo "configure:63983: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64262,14 +64199,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64265: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:64202: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64272: \$? = $opal_status" >&5 + echo "configure:64209: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64279,14 +64216,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64282: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:64219: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64289: \$? = $opal_status" >&5 + echo "configure:64226: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64317,14 +64254,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64320: ./conftest" >&5 +echo "configure:64257: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64327: \$? = $opal_status" >&5 + echo "configure:64264: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64850,14 +64787,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64853: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:64790: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64860: \$? = $opal_status" >&5 + echo "configure:64797: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64867,14 +64804,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64870: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:64807: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64877: \$? = $opal_status" >&5 + echo "configure:64814: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -64895,7 +64832,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64898: here is the Fortran program:" >&5 + echo "configure:64835: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -64918,14 +64855,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:64921: ./conftest" >&5 +echo "configure:64858: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:64928: \$? = $opal_status" >&5 + echo "configure:64865: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -65144,14 +65081,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:65147: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:65084: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65154: \$? = $opal_status" >&5 + echo "configure:65091: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -65161,14 +65098,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:65164: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:65101: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65171: \$? = $opal_status" >&5 + echo "configure:65108: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -65199,14 +65136,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:65202: ./conftest" >&5 +echo "configure:65139: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65209: \$? = $opal_status" >&5 + echo "configure:65146: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -65732,14 +65669,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:65735: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:65672: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65742: \$? = $opal_status" >&5 + echo "configure:65679: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -65749,14 +65686,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:65752: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:65689: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65759: \$? = $opal_status" >&5 + echo "configure:65696: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -65777,7 +65714,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65780: here is the Fortran program:" >&5 + echo "configure:65717: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -65800,14 +65737,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:65803: ./conftest" >&5 +echo "configure:65740: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:65810: \$? = $opal_status" >&5 + echo "configure:65747: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66026,14 +65963,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66029: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:65966: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66036: \$? = $opal_status" >&5 + echo "configure:65973: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66043,14 +65980,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66046: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:65983: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66053: \$? = $opal_status" >&5 + echo "configure:65990: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66081,14 +66018,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66084: ./conftest" >&5 +echo "configure:66021: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66091: \$? = $opal_status" >&5 + echo "configure:66028: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66617,14 +66554,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66620: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:66557: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66627: \$? = $opal_status" >&5 + echo "configure:66564: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66634,14 +66571,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66637: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:66574: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66644: \$? = $opal_status" >&5 + echo "configure:66581: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66662,7 +66599,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66665: here is the Fortran program:" >&5 + echo "configure:66602: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -66685,14 +66622,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66688: ./conftest" >&5 +echo "configure:66625: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66695: \$? = $opal_status" >&5 + echo "configure:66632: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66909,14 +66846,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66912: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:66849: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66919: \$? = $opal_status" >&5 + echo "configure:66856: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66926,14 +66863,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66929: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:66866: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66936: \$? = $opal_status" >&5 + echo "configure:66873: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -66964,14 +66901,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:66967: ./conftest" >&5 +echo "configure:66904: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:66974: \$? = $opal_status" >&5 + echo "configure:66911: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67596,14 +67533,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:67599: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:67536: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:67606: \$? = $opal_status" >&5 + echo "configure:67543: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67613,14 +67550,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:67616: $FC $FCFLAGS -o conftest conftest.o conftestf.f $LDFLAGS $LIBS" >&5 +echo "configure:67553: $FC $FCFLAGS -o conftest conftest.o conftestf.f $LDFLAGS $LIBS" >&5 $FC $FCFLAGS -o conftest conftest.o conftestf.f $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:67623: \$? = $opal_status" >&5 + echo "configure:67560: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67648,14 +67585,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:67651: ./conftest" >&5 +echo "configure:67588: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:67658: \$? = $opal_status" >&5 + echo "configure:67595: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67766,14 +67703,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:67769: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:67706: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:67776: \$? = $opal_status" >&5 + echo "configure:67713: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67783,14 +67720,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:67786: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:67723: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:67793: \$? = $opal_status" >&5 + echo "configure:67730: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67817,14 +67754,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:67820: ./conftest" >&5 +echo "configure:67757: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:67827: \$? = $opal_status" >&5 + echo "configure:67764: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -67927,7 +67864,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n ""; then - echo "configure:67930: testing Fortran dimension $f_rank / $f_dim" >&5 + echo "configure:67867: testing Fortran dimension $f_rank / $f_dim" >&5 else echo testing Fortran dimension $f_rank / $f_dim >&5 fi @@ -68952,14 +68889,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:68955: $FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS" >&5 +echo "configure:68892: $FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:68962: \$? = $opal_status" >&5 + echo "configure:68899: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -68996,14 +68933,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:68999: $FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir $LDFLAGS $LIBS" >&5 +echo "configure:68936: $FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:69006: \$? = $opal_status" >&5 + echo "configure:68943: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -69017,7 +68954,7 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:69020: $FC $FCFLAGS $FCFLAGS_f90 conftest.f90 subdir/conftest-module.o \ +echo "configure:68957: $FC $FCFLAGS $FCFLAGS_f90 conftest.f90 subdir/conftest-module.o \ ${flag}subdir $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftest.f90 subdir/conftest-module.o \ ${flag}subdir $LDFLAGS $LIBS 1>&5 2>&1 @@ -69026,7 +68963,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:69029: \$? = $opal_status" >&5 + echo "configure:68966: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -70251,7 +70188,7 @@ # The mpi_f08 module in this version of Open MPI does not properly # handle if sizeof(INTEGER) != sizeof(int) with the mpi_f08 - # bindings. As of July 2020, this issue is fixed on master / what + # bindings. As of July 2020, this issue is fixed on main / what # will eventually become Open MPI v5.0.x, but the fix causes an # ABI break. Hence, we're not going to fix it here on this # release branch. @@ -70650,14 +70587,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:70653: $FC $FCFLAGS -c aaa.f90" >&5 +echo "configure:70590: $FC $FCFLAGS -c aaa.f90" >&5 $FC $FCFLAGS -c aaa.f90 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:70660: \$? = $opal_status" >&5 + echo "configure:70597: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -70667,14 +70604,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:70670: $FC $FCFLAGS -c bbb.f90" >&5 +echo "configure:70607: $FC $FCFLAGS -c bbb.f90" >&5 $FC $FCFLAGS -c bbb.f90 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:70677: \$? = $opal_status" >&5 + echo "configure:70614: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -71154,14 +71091,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:71157: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:71094: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:71164: \$? = $opal_status" >&5 + echo "configure:71101: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -71171,14 +71108,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:71174: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:71111: $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:71181: \$? = $opal_status" >&5 + echo "configure:71118: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -71199,7 +71136,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:71202: here is the Fortran program:" >&5 + echo "configure:71139: here is the Fortran program:" >&5 else echo here is the Fortran program: >&5 fi @@ -71222,14 +71159,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:71225: ./conftest" >&5 +echo "configure:71162: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:71232: \$? = $opal_status" >&5 + echo "configure:71169: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -71296,14 +71233,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:71299: ./conftest" >&5 +echo "configure:71236: ./conftest" >&5 ./conftest 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:71306: \$? = $opal_status" >&5 + echo "configure:71243: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -75679,14 +75616,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:75682: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:75619: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:75689: \$? = $opal_status" >&5 + echo "configure:75626: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -75696,14 +75633,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:75699: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:75636: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:75706: \$? = $opal_status" >&5 + echo "configure:75643: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -75726,7 +75663,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:75729: here is the C program:" >&5 + echo "configure:75666: here is the C program:" >&5 else echo here is the C program: >&5 fi @@ -75740,7 +75677,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:75743: here is contest.h:" >&5 + echo "configure:75680: here is contest.h:" >&5 else echo here is contest.h: >&5 fi @@ -75754,7 +75691,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:75757: here is the fortran program:" >&5 + echo "configure:75694: here is the fortran program:" >&5 else echo here is the fortran program: >&5 fi @@ -76075,14 +76012,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:76078: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:76015: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76085: \$? = $opal_status" >&5 + echo "configure:76022: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -76092,14 +76029,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:76095: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:76032: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76102: \$? = $opal_status" >&5 + echo "configure:76039: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -76122,7 +76059,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76125: here is the C program:" >&5 + echo "configure:76062: here is the C program:" >&5 else echo here is the C program: >&5 fi @@ -76136,7 +76073,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76139: here is contest.h:" >&5 + echo "configure:76076: here is contest.h:" >&5 else echo here is contest.h: >&5 fi @@ -76150,7 +76087,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76153: here is the fortran program:" >&5 + echo "configure:76090: here is the fortran program:" >&5 else echo here is the fortran program: >&5 fi @@ -76581,14 +76518,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:76584: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:76521: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76591: \$? = $opal_status" >&5 + echo "configure:76528: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -76598,14 +76535,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:76601: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:76538: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76608: \$? = $opal_status" >&5 + echo "configure:76545: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -76628,7 +76565,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76631: here is the C program:" >&5 + echo "configure:76568: here is the C program:" >&5 else echo here is the C program: >&5 fi @@ -76642,7 +76579,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76645: here is contest.h:" >&5 + echo "configure:76582: here is contest.h:" >&5 else echo here is contest.h: >&5 fi @@ -76656,7 +76593,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76659: here is the fortran program:" >&5 + echo "configure:76596: here is the fortran program:" >&5 else echo here is the fortran program: >&5 fi @@ -76771,14 +76708,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:76774: $CC $CFLAGS -I. -c conftest.c" >&5 +echo "configure:76711: $CC $CFLAGS -I. -c conftest.c" >&5 $CC $CFLAGS -I. -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76781: \$? = $opal_status" >&5 + echo "configure:76718: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -76788,14 +76725,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:76791: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 +echo "configure:76728: $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS" >&5 $FC $FCFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76798: \$? = $opal_status" >&5 + echo "configure:76735: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -76818,7 +76755,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76821: here is the C program:" >&5 + echo "configure:76758: here is the C program:" >&5 else echo here is the C program: >&5 fi @@ -76832,7 +76769,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76835: here is contest.h:" >&5 + echo "configure:76772: here is contest.h:" >&5 else echo here is contest.h: >&5 fi @@ -76846,7 +76783,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:76849: here is the fortran program:" >&5 + echo "configure:76786: here is the fortran program:" >&5 else echo here is the fortran program: >&5 fi @@ -80193,14 +80130,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:80196: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lhwloc $LIBS $opal_hwloc_external_LIBS" >&5 +echo "configure:80133: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lhwloc $LIBS $opal_hwloc_external_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lhwloc $LIBS $opal_hwloc_external_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:80203: \$? = $opal_status" >&5 + echo "configure:80140: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -80918,14 +80855,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:80921: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lhwloc $LIBS $opal_hwloc_external_LIBS" >&5 +echo "configure:80858: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lhwloc $LIBS $opal_hwloc_external_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lhwloc $LIBS $opal_hwloc_external_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:80928: \$? = $opal_status" >&5 + echo "configure:80865: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -93763,14 +93700,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:93766: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:93703: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:93773: \$? = $opal_status" >&5 + echo "configure:93710: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -94488,14 +94425,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:94491: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:94428: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:94498: \$? = $opal_status" >&5 + echo "configure:94435: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -97089,14 +97026,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:97092: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:97029: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:97099: \$? = $opal_status" >&5 + echo "configure:97036: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -97814,14 +97751,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:97817: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:97754: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:97824: \$? = $opal_status" >&5 + echo "configure:97761: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -98720,14 +98657,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:98723: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:98660: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:98730: \$? = $opal_status" >&5 + echo "configure:98667: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -99445,14 +99382,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:99448: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:99385: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:99455: \$? = $opal_status" >&5 + echo "configure:99392: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -101620,14 +101557,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:101623: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:101560: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:101630: \$? = $opal_status" >&5 + echo "configure:101567: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -102345,14 +102282,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:102348: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:102285: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:102355: \$? = $opal_status" >&5 + echo "configure:102292: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -104544,14 +104481,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:104547: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:104484: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:104554: \$? = $opal_status" >&5 + echo "configure:104491: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -105269,14 +105206,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:105272: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:105209: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:105279: \$? = $opal_status" >&5 + echo "configure:105216: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -113308,14 +113245,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:113311: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:113248: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:113318: \$? = $opal_status" >&5 + echo "configure:113255: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -114033,14 +113970,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:114036: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:113973: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:114043: \$? = $opal_status" >&5 + echo "configure:113980: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -115932,14 +115869,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:115935: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:115872: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:115942: \$? = $opal_status" >&5 + echo "configure:115879: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -116657,14 +116594,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:116660: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:116597: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:116667: \$? = $opal_status" >&5 + echo "configure:116604: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -119328,14 +119265,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:119331: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:119268: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:119338: \$? = $opal_status" >&5 + echo "configure:119275: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -120053,14 +119990,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:120056: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:119993: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:120063: \$? = $opal_status" >&5 + echo "configure:120000: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -124071,14 +124008,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:124074: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:124011: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:124081: \$? = $opal_status" >&5 + echo "configure:124018: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -124796,14 +124733,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:124799: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:124736: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:124806: \$? = $opal_status" >&5 + echo "configure:124743: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -125702,14 +125639,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:125705: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:125642: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:125712: \$? = $opal_status" >&5 + echo "configure:125649: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -126427,14 +126364,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:126430: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:126367: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:126437: \$? = $opal_status" >&5 + echo "configure:126374: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -129890,14 +129827,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:129893: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:129830: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:129900: \$? = $opal_status" >&5 + echo "configure:129837: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -130615,14 +130552,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:130618: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:130555: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:130625: \$? = $opal_status" >&5 + echo "configure:130562: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -132852,14 +132789,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:132855: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lxpmem $LIBS $opal_check_xpmem_LIBS" >&5 +echo "configure:132792: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lxpmem $LIBS $opal_check_xpmem_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lxpmem $LIBS $opal_check_xpmem_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:132862: \$? = $opal_status" >&5 + echo "configure:132799: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -133577,14 +133514,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:133580: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lxpmem $LIBS $opal_check_xpmem_LIBS" >&5 +echo "configure:133517: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lxpmem $LIBS $opal_check_xpmem_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lxpmem $LIBS $opal_check_xpmem_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:133587: \$? = $opal_status" >&5 + echo "configure:133524: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -140770,14 +140707,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:140773: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $opal_dl_dlopen_LIBS" >&5 +echo "configure:140710: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $opal_dl_dlopen_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $opal_dl_dlopen_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:140780: \$? = $opal_status" >&5 + echo "configure:140717: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -141495,14 +141432,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:141498: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $opal_dl_dlopen_LIBS" >&5 +echo "configure:141435: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $opal_dl_dlopen_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $opal_dl_dlopen_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:141505: \$? = $opal_status" >&5 + echo "configure:141442: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -143156,14 +143093,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:143159: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lltdl $LIBS $opal_dl_libltdl_LIBS" >&5 +echo "configure:143096: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lltdl $LIBS $opal_dl_libltdl_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lltdl $LIBS $opal_dl_libltdl_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:143166: \$? = $opal_status" >&5 + echo "configure:143103: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -143881,14 +143818,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:143884: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lltdl $LIBS $opal_dl_libltdl_LIBS" >&5 +echo "configure:143821: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lltdl $LIBS $opal_dl_libltdl_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lltdl $LIBS $opal_dl_libltdl_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:143891: \$? = $opal_status" >&5 + echo "configure:143828: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -145930,14 +145867,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:145933: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -levent_core $LIBS $opal_event_external_LIBS" >&5 +echo "configure:145870: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -levent_core $LIBS $opal_event_external_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -levent_core $LIBS $opal_event_external_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:145940: \$? = $opal_status" >&5 + echo "configure:145877: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -146655,14 +146592,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:146658: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -levent_core $LIBS $opal_event_external_LIBS" >&5 +echo "configure:146595: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -levent_core $LIBS $opal_event_external_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -levent_core $LIBS $opal_event_external_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:146665: \$? = $opal_status" >&5 + echo "configure:146602: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -159195,14 +159132,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:159198: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmemkind $LIBS $mpool_memkind_LIBS" >&5 +echo "configure:159135: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmemkind $LIBS $mpool_memkind_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmemkind $LIBS $mpool_memkind_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:159205: \$? = $opal_status" >&5 + echo "configure:159142: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -159920,14 +159857,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:159923: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmemkind $LIBS $mpool_memkind_LIBS" >&5 +echo "configure:159860: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmemkind $LIBS $mpool_memkind_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmemkind $LIBS $mpool_memkind_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:159930: \$? = $opal_status" >&5 + echo "configure:159867: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -162255,14 +162192,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:162258: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $patcher_linux_LIBS" >&5 +echo "configure:162195: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $patcher_linux_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $patcher_linux_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:162265: \$? = $opal_status" >&5 + echo "configure:162202: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -162980,14 +162917,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:162983: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $patcher_linux_LIBS" >&5 +echo "configure:162920: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $patcher_linux_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ldl $LIBS $patcher_linux_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:162990: \$? = $opal_status" >&5 + echo "configure:162927: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -179390,13 +179327,13 @@ # Also, nl_recvmsgs_report is only in libnl v3. if test $opal_libnlv3_happy -eq 1; then : - opal_check_package_opal_reachable_netlink_save_CPPFLAGS="$CPPFLAGS" - opal_check_package_opal_reachable_netlink_save_LDFLAGS="$LDFLAGS" - opal_check_package_opal_reachable_netlink_save_LIBS="$LIBS" - - opal_check_package_opal_reachable_netlink_orig_CPPFLAGS="$opal_reachable_netlink_CPPFLAGS" - opal_check_package_opal_reachable_netlink_orig_LDFLAGS="$opal_reachable_netlink_LDFLAGS" - opal_check_package_opal_reachable_netlink_orig_LIBS="$opal_reachable_netlink_LIBS" + opal_check_package_reachable_netlink_save_CPPFLAGS="$CPPFLAGS" + opal_check_package_reachable_netlink_save_LDFLAGS="$LDFLAGS" + opal_check_package_reachable_netlink_save_LIBS="$LIBS" + + opal_check_package_reachable_netlink_orig_CPPFLAGS="$reachable_netlink_CPPFLAGS" + opal_check_package_reachable_netlink_orig_LDFLAGS="$reachable_netlink_LDFLAGS" + opal_check_package_reachable_netlink_orig_LIBS="$reachable_netlink_LIBS" # This is stolen from autoconf to peek under the covers to get the @@ -179474,7 +179411,7 @@ if test "$opal_check_package_header_happy" = "no"; then : if test "$dir_prefix" != ""; then : - opal_reachable_netlink_CPPFLAGS="$opal_reachable_netlink_CPPFLAGS -I$dir_prefix/include" + reachable_netlink_CPPFLAGS="$reachable_netlink_CPPFLAGS -I$dir_prefix/include" CPPFLAGS="$CPPFLAGS -I$dir_prefix/include" fi for ac_header in netlink/version.h @@ -179501,7 +179438,7 @@ opal_check_package_lib_happy="no" if test "" != ""; then : # libdir was specified - search only there - opal_reachable_netlink_LDFLAGS="$opal_reachable_netlink_LDFLAGS -L" + reachable_netlink_LDFLAGS="$reachable_netlink_LDFLAGS -L" LDFLAGS="$LDFLAGS -L" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nl_recvmsgs_report" >&5 $as_echo_n "checking for library containing nl_recvmsgs_report... " >&6; } @@ -179562,8 +179499,8 @@ fi if test "$opal_check_package_lib_happy" = "no"; then : - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi else @@ -179635,15 +179572,15 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi fi if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - opal_reachable_netlink_LDFLAGS="$opal_reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib" + reachable_netlink_LDFLAGS="$reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 $as_echo "looking for library in lib" >&6; } @@ -179707,8 +179644,8 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi fi @@ -179716,7 +179653,7 @@ if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - opal_reachable_netlink_LDFLAGS="$opal_reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib64" + reachable_netlink_LDFLAGS="$reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib64" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 $as_echo "looking for library in lib64" >&6; } @@ -179780,8 +179717,8 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi fi @@ -179896,14 +179833,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:179899: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $opal_reachable_netlink_LIBS" >&5 -$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $opal_reachable_netlink_LIBS 1>&5 2>&1 +echo "configure:179836: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $reachable_netlink_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $reachable_netlink_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:179906: \$? = $opal_status" >&5 + echo "configure:179843: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -180201,9 +180138,9 @@ # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] if test "$ac_cv_search_nl_recvmsgs_report" != "no" && test "$ac_cv_search_nl_recvmsgs_report" != "none required"; then : - opal_reachable_netlink_LIBS="$ac_cv_search_nl_recvmsgs_report " + reachable_netlink_LIBS="$ac_cv_search_nl_recvmsgs_report " else - opal_reachable_netlink_LIBS="" + reachable_netlink_LIBS="" fi opal_check_package_happy="yes" else @@ -180226,7 +180163,7 @@ opal_check_package_lib_happy="no" if test "" != ""; then : # libdir was specified - search only there - opal_reachable_netlink_LDFLAGS="$opal_reachable_netlink_LDFLAGS -L" + reachable_netlink_LDFLAGS="$reachable_netlink_LDFLAGS -L" LDFLAGS="$LDFLAGS -L" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nl_recvmsgs_report" >&5 $as_echo_n "checking for library containing nl_recvmsgs_report... " >&6; } @@ -180287,8 +180224,8 @@ fi if test "$opal_check_package_lib_happy" = "no"; then : - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi else @@ -180360,15 +180297,15 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi fi if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - opal_reachable_netlink_LDFLAGS="$opal_reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib" + reachable_netlink_LDFLAGS="$reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 $as_echo "looking for library in lib" >&6; } @@ -180432,8 +180369,8 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi fi @@ -180441,7 +180378,7 @@ if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - opal_reachable_netlink_LDFLAGS="$opal_reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib64" + reachable_netlink_LDFLAGS="$reachable_netlink_LDFLAGS -L$opal_check_package_libdir/lib64" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 $as_echo "looking for library in lib64" >&6; } @@ -180505,8 +180442,8 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" unset ac_cv_search_nl_recvmsgs_report fi fi @@ -180621,14 +180558,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:180624: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $opal_reachable_netlink_LIBS" >&5 -$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $opal_reachable_netlink_LIBS 1>&5 2>&1 +echo "configure:180561: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $reachable_netlink_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lnl-3 $LIBS $reachable_netlink_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:180631: \$? = $opal_status" >&5 + echo "configure:180568: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -180926,9 +180863,9 @@ # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] if test "$ac_cv_search_nl_recvmsgs_report" != "no" && test "$ac_cv_search_nl_recvmsgs_report" != "none required"; then : - opal_reachable_netlink_LIBS="$ac_cv_search_nl_recvmsgs_report " + reachable_netlink_LIBS="$ac_cv_search_nl_recvmsgs_report " else - opal_reachable_netlink_LIBS="" + reachable_netlink_LIBS="" fi opal_check_package_happy="yes" else @@ -180965,31 +180902,31 @@ if test "$opal_check_package_happy" = "yes"; then : else - opal_reachable_netlink_CPPFLAGS="$opal_check_package_opal_reachable_netlink_orig_CPPFLAGS" - opal_reachable_netlink_LDFLAGS="$opal_check_package_opal_reachable_netlink_orig_LDFLAGS" - opal_reachable_netlink_LIBS="$opal_check_package_opal_reachable_netlink_orig_LIBS" + reachable_netlink_CPPFLAGS="$opal_check_package_reachable_netlink_orig_CPPFLAGS" + reachable_netlink_LDFLAGS="$opal_check_package_reachable_netlink_orig_LDFLAGS" + reachable_netlink_LIBS="$opal_check_package_reachable_netlink_orig_LIBS" opal_libnlv3_happy=0 fi - CPPFLAGS="$opal_check_package_opal_reachable_netlink_save_CPPFLAGS" - LDFLAGS="$opal_check_package_opal_reachable_netlink_save_LDFLAGS" - LIBS="$opal_check_package_opal_reachable_netlink_save_LIBS" + CPPFLAGS="$opal_check_package_reachable_netlink_save_CPPFLAGS" + LDFLAGS="$opal_check_package_reachable_netlink_save_LDFLAGS" + LIBS="$opal_check_package_reachable_netlink_save_LIBS" # Note that OPAL_CHECK_PACKAGE is going to add - # -I$dir/include into opal_reachable_netlink_CPPFLAGS. But because libnl v3 + # -I$dir/include into reachable_netlink_CPPFLAGS. But because libnl v3 # puts the headers in $dir/include/libnl3, we need to - # overwrite opal_reachable_netlink_CPPFLAGS with -I$dir/include/libnl3. We can do + # overwrite reachable_netlink_CPPFLAGS with -I$dir/include/libnl3. We can do # this unconditionally; we don't have to check for # success (checking for success occurs below). - opal_reachable_netlink_CPPFLAGS=$opal_tmp_CPPFLAGS + reachable_netlink_CPPFLAGS=$opal_tmp_CPPFLAGS fi # If we found libnl-3, we *also* need libnl-route-3 LIBS_save=$LIBS LDFLAGS_save=$LDFLAGS - if test -n "$opal_reachable_netlink_LDFLAGS"; then : - LDFLAGS="$opal_reachable_netlink_LDFLAGS $LDFLAGS" + if test -n "$reachable_netlink_LDFLAGS"; then : + LDFLAGS="$reachable_netlink_LDFLAGS $LDFLAGS" fi if test $opal_libnlv3_happy -eq 1; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nl_rtgen_request" >&5 @@ -181061,8 +180998,8 @@ if test $opal_libnlv3_happy -eq 1; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking to ensure these really are libnl v3 headers" >&5 $as_echo_n "checking to ensure these really are libnl v3 headers... " >&6; } - if test -n "$opal_reachable_netlink_CPPFLAGS"; then : - CPPFLAGS="$opal_reachable_netlink_CPPFLAGS $CPPFLAGS" + if test -n "$reachable_netlink_CPPFLAGS"; then : + CPPFLAGS="$reachable_netlink_CPPFLAGS $CPPFLAGS" fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -181103,14 +181040,14 @@ # If we found everything if test $opal_libnlv3_happy -eq 1; then : - opal_reachable_netlink_LIBS="-lnl-3 -lnl-route-3" + reachable_netlink_LIBS="-lnl-3 -lnl-route-3" OPAL_HAVE_LIBNL3=1 else # OPAL_CHECK_PACKAGE(...,nl_recvmsgs_report,...) might have set the variables below # so reset them if libnl v3 cannot be used - opal_reachable_netlink_CPPFLAGS="" - opal_reachable_netlink_LDFLAGS="" - opal_reachable_netlink_LIBS="" + reachable_netlink_CPPFLAGS="" + reachable_netlink_LDFLAGS="" + reachable_netlink_LIBS="" fi @@ -198601,6 +198538,7 @@ # on AIX it should be in libbsd # on HP-UX it should be in libBSD # on IRIX < 6 it should be in libsun (IRIX 6 and later it is in libc) + # on RHEL: libnsl, libnsl2 AND libnsl2-devel are required to link libnsl to get yp_all. if test "$orte_check_lsf_happy" = "yes"; then : @@ -198785,7 +198723,9 @@ orte_check_lsf_happy="yes" else yp_all_nsl_have_yp_all=0 - orte_check_lsf_happy="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details." >&5 +$as_echo "$as_me: WARNING: Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details." >&2;} + orte_check_lsf_happy="no" fi @@ -199545,14 +199485,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:199548: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 +echo "configure:199488: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:199555: \$? = $opal_status" >&5 + echo "configure:199495: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -200270,14 +200210,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:200273: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 +echo "configure:200213: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:200280: \$? = $opal_status" >&5 + echo "configure:200220: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -201143,14 +201083,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:201146: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 +echo "configure:201086: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:201153: \$? = $opal_status" >&5 + echo "configure:201093: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -201868,14 +201808,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:201871: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 +echo "configure:201811: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:201878: \$? = $opal_status" >&5 + echo "configure:201818: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -202301,15 +202241,15 @@ if test "x$ac_cv_lib_event_evthread_set_condition_callbacks" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. The correct libevent.so was linked." >&5 -$as_echo "No. The correct libevent.so was linked." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. The correct libevent.so was linked." >&5 +$as_echo "No conflict found. The correct libevent.so was linked." >&6; } orte_check_lsf_event_conflict=no else # (4) The libevent.so is not from Libevent. Warn the user. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes. Detected a libevent.so that is not from Libevent." >&5 -$as_echo "Yes. Detected a libevent.so that is not from Libevent." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Conflict found. Detected a libevent.so that is not from Libevent." >&5 +$as_echo "Conflict found. Detected a libevent.so that is not from Libevent." >&6; } orte_check_lsf_event_conflict=yes fi @@ -202317,15 +202257,15 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. Internal Libevent or libevent_core is being used." >&5 -$as_echo "No. Internal Libevent or libevent_core is being used." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. Internal Libevent or libevent_core is being used." >&5 +$as_echo "No conflict found. Internal Libevent or libevent_core is being used." >&6; } orte_check_lsf_event_conflict=na fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. LSF checks passed." >&5 -$as_echo "No. LSF checks passed." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. LSF checks passed." >&5 +$as_echo "No conflict found. LSF checks passed." >&6; } orte_check_lsf_event_conflict=na fi @@ -204824,7 +204764,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:204827: orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS" >&5 + echo "configure:204767: orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS" >&5 else echo orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS >&5 fi @@ -204905,7 +204845,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:204908: orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS" >&5 + echo "configure:204848: orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS" >&5 else echo orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS >&5 fi @@ -204986,7 +204926,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:204989: orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS" >&5 + echo "configure:204929: orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS" >&5 else echo orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS >&5 fi @@ -205562,14 +205502,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:205565: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:205505: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:205572: \$? = $opal_status" >&5 + echo "configure:205512: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -206279,14 +206219,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:206282: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:206222: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:206289: \$? = $opal_status" >&5 + echo "configure:206229: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -206996,14 +206936,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:206999: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:206939: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:207006: \$? = $opal_status" >&5 + echo "configure:206946: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -222495,6 +222435,7 @@ # on AIX it should be in libbsd # on HP-UX it should be in libBSD # on IRIX < 6 it should be in libsun (IRIX 6 and later it is in libc) + # on RHEL: libnsl, libnsl2 AND libnsl2-devel are required to link libnsl to get yp_all. if test "$orte_check_lsf_happy" = "yes"; then : @@ -222679,7 +222620,9 @@ orte_check_lsf_happy="yes" else yp_all_nsl_have_yp_all=0 - orte_check_lsf_happy="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details." >&5 +$as_echo "$as_me: WARNING: Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details." >&2;} + orte_check_lsf_happy="no" fi @@ -223439,14 +223382,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:223442: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 +echo "configure:223385: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:223449: \$? = $opal_status" >&5 + echo "configure:223392: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -224164,14 +224107,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:224167: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 +echo "configure:224110: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:224174: \$? = $opal_status" >&5 + echo "configure:224117: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -225037,14 +224980,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:225040: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 +echo "configure:224983: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:225047: \$? = $opal_status" >&5 + echo "configure:224990: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -225762,14 +225705,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:225765: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 +echo "configure:225708: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:225772: \$? = $opal_status" >&5 + echo "configure:225715: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -226195,15 +226138,15 @@ if test "x$ac_cv_lib_event_evthread_set_condition_callbacks" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. The correct libevent.so was linked." >&5 -$as_echo "No. The correct libevent.so was linked." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. The correct libevent.so was linked." >&5 +$as_echo "No conflict found. The correct libevent.so was linked." >&6; } orte_check_lsf_event_conflict=no else # (4) The libevent.so is not from Libevent. Warn the user. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes. Detected a libevent.so that is not from Libevent." >&5 -$as_echo "Yes. Detected a libevent.so that is not from Libevent." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Conflict found. Detected a libevent.so that is not from Libevent." >&5 +$as_echo "Conflict found. Detected a libevent.so that is not from Libevent." >&6; } orte_check_lsf_event_conflict=yes fi @@ -226211,15 +226154,15 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. Internal Libevent or libevent_core is being used." >&5 -$as_echo "No. Internal Libevent or libevent_core is being used." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. Internal Libevent or libevent_core is being used." >&5 +$as_echo "No conflict found. Internal Libevent or libevent_core is being used." >&6; } orte_check_lsf_event_conflict=na fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. LSF checks passed." >&5 -$as_echo "No. LSF checks passed." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. LSF checks passed." >&5 +$as_echo "No conflict found. LSF checks passed." >&6; } orte_check_lsf_event_conflict=na fi @@ -229464,7 +229407,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:229467: orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS" >&5 + echo "configure:229410: orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS" >&5 else echo orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS >&5 fi @@ -229545,7 +229488,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:229548: orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS" >&5 + echo "configure:229491: orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS" >&5 else echo orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS >&5 fi @@ -229626,7 +229569,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:229629: orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS" >&5 + echo "configure:229572: orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS" >&5 else echo orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS >&5 fi @@ -230202,14 +230145,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:230205: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:230148: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:230212: \$? = $opal_status" >&5 + echo "configure:230155: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -230919,14 +230862,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:230922: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:230865: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:230929: \$? = $opal_status" >&5 + echo "configure:230872: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -231636,14 +231579,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:231639: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:231582: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:231646: \$? = $opal_status" >&5 + echo "configure:231589: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -236437,6 +236380,7 @@ # on AIX it should be in libbsd # on HP-UX it should be in libBSD # on IRIX < 6 it should be in libsun (IRIX 6 and later it is in libc) + # on RHEL: libnsl, libnsl2 AND libnsl2-devel are required to link libnsl to get yp_all. if test "$orte_check_lsf_happy" = "yes"; then : @@ -236621,7 +236565,9 @@ orte_check_lsf_happy="yes" else yp_all_nsl_have_yp_all=0 - orte_check_lsf_happy="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details." >&5 +$as_echo "$as_me: WARNING: Could not find yp_all. Please see https://www.open-mpi.org/faq/?category=building#build-rte-lsf for more details." >&2;} + orte_check_lsf_happy="no" fi @@ -237381,14 +237327,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:237384: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 +echo "configure:237330: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:237391: \$? = $opal_status" >&5 + echo "configure:237337: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -238106,14 +238052,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:238109: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 +echo "configure:238055: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llsf $LIBS $ls_info_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:238116: \$? = $opal_status" >&5 + echo "configure:238062: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -238979,14 +238925,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:238982: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 +echo "configure:238928: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:238989: \$? = $opal_status" >&5 + echo "configure:238935: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -239704,14 +239650,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:239707: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 +echo "configure:239653: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lbat $LIBS $orte_check_lsf_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:239714: \$? = $opal_status" >&5 + echo "configure:239660: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -240137,15 +240083,15 @@ if test "x$ac_cv_lib_event_evthread_set_condition_callbacks" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. The correct libevent.so was linked." >&5 -$as_echo "No. The correct libevent.so was linked." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. The correct libevent.so was linked." >&5 +$as_echo "No conflict found. The correct libevent.so was linked." >&6; } orte_check_lsf_event_conflict=no else # (4) The libevent.so is not from Libevent. Warn the user. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Yes. Detected a libevent.so that is not from Libevent." >&5 -$as_echo "Yes. Detected a libevent.so that is not from Libevent." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Conflict found. Detected a libevent.so that is not from Libevent." >&5 +$as_echo "Conflict found. Detected a libevent.so that is not from Libevent." >&6; } orte_check_lsf_event_conflict=yes fi @@ -240153,15 +240099,15 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. Internal Libevent or libevent_core is being used." >&5 -$as_echo "No. Internal Libevent or libevent_core is being used." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. Internal Libevent or libevent_core is being used." >&5 +$as_echo "No conflict found. Internal Libevent or libevent_core is being used." >&6; } orte_check_lsf_event_conflict=na fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libevent conflict" >&5 $as_echo_n "checking for libevent conflict... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No. LSF checks passed." >&5 -$as_echo "No. LSF checks passed." >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: No conflict found. LSF checks passed." >&5 +$as_echo "No conflict found. LSF checks passed." >&6; } orte_check_lsf_event_conflict=na fi @@ -242660,7 +242606,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:242663: orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS" >&5 + echo "configure:242609: orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS" >&5 else echo orte_check_tm_CPPFLAGS from pbs-config: $orte_check_tm_CPPFLAGS >&5 fi @@ -242741,7 +242687,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:242744: orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS" >&5 + echo "configure:242690: orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS" >&5 else echo orte_check_tm_LDFLAGS from pbs-config: $orte_check_tm_LDFLAGS >&5 fi @@ -242822,7 +242768,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:242825: orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS" >&5 + echo "configure:242771: orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS" >&5 else echo orte_check_tm_LIBS from pbs-config: $orte_check_tm_LIBS >&5 fi @@ -243398,14 +243344,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:243401: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:243347: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:243408: \$? = $opal_status" >&5 + echo "configure:243354: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -244115,14 +244061,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:244118: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:244064: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpbs $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:244125: \$? = $opal_status" >&5 + echo "configure:244071: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -244832,14 +244778,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:244835: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS" >&5 +echo "configure:244781: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltorque $LIBS $orte_check_tm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:244842: \$? = $opal_status" >&5 + echo "configure:244788: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -263858,14 +263804,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:263861: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lcmoab $LIBS $orte_check_moab_LIBS" >&5 +echo "configure:263807: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lcmoab $LIBS $orte_check_moab_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lcmoab $LIBS $orte_check_moab_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:263868: \$? = $opal_status" >&5 + echo "configure:263814: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -264583,14 +264529,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:264586: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lcmoab $LIBS $orte_check_moab_LIBS" >&5 +echo "configure:264532: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lcmoab $LIBS $orte_check_moab_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lcmoab $LIBS $orte_check_moab_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:264593: \$? = $opal_status" >&5 + echo "configure:264539: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -279653,8 +279599,8 @@ $as_echo "adapt, basic, han, inter, libnbc, self, sm, sync, tuned" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework coll" >&5 $as_echo_n "checking for m4 configure components in framework coll... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cuda, fca, hcoll, monitoring, portals4" >&5 -$as_echo "cuda, fca, hcoll, monitoring, portals4" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cuda, fca, hcoll, monitoring, portals4, ucc" >&5 +$as_echo "cuda, fca, hcoll, monitoring, portals4, ucc" >&6; } # If there are components in the no configure list, but we're # doing one of the "special" selection logics, abort with a @@ -286250,7 +286196,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:286253: coll_fca_CPPFLAGS : $coll_fca_CPPFLAGS" >&5 + echo "configure:286199: coll_fca_CPPFLAGS : $coll_fca_CPPFLAGS" >&5 else echo coll_fca_CPPFLAGS : $coll_fca_CPPFLAGS >&5 fi @@ -286258,7 +286204,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:286261: coll_fca_LDFLAGS : $coll_fca_LDFLAGS" >&5 + echo "configure:286207: coll_fca_LDFLAGS : $coll_fca_LDFLAGS" >&5 else echo coll_fca_LDFLAGS : $coll_fca_LDFLAGS >&5 fi @@ -286266,7 +286212,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:286269: coll_fca_LIBS : $coll_fca_LIBS" >&5 + echo "configure:286215: coll_fca_LIBS : $coll_fca_LIBS" >&5 else echo coll_fca_LIBS : $coll_fca_LIBS >&5 fi @@ -286778,14 +286724,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:286781: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $coll_fca_LIBS" >&5 +echo "configure:286727: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $coll_fca_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $coll_fca_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:286788: \$? = $opal_status" >&5 + echo "configure:286734: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -287503,14 +287449,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:287506: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $coll_fca_LIBS" >&5 +echo "configure:287452: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $coll_fca_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $coll_fca_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:287513: \$? = $opal_status" >&5 + echo "configure:287459: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -288630,7 +288576,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:288633: coll_hcoll_CPPFLAGS : $coll_hcoll_CPPFLAGS" >&5 + echo "configure:288579: coll_hcoll_CPPFLAGS : $coll_hcoll_CPPFLAGS" >&5 else echo coll_hcoll_CPPFLAGS : $coll_hcoll_CPPFLAGS >&5 fi @@ -288638,7 +288584,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:288641: coll_hcoll_LDFLAGS : $coll_hcoll_LDFLAGS" >&5 + echo "configure:288587: coll_hcoll_LDFLAGS : $coll_hcoll_LDFLAGS" >&5 else echo coll_hcoll_LDFLAGS : $coll_hcoll_LDFLAGS >&5 fi @@ -288646,7 +288592,7 @@ # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:288649: coll_hcoll_LIBS : $coll_hcoll_LIBS" >&5 + echo "configure:288595: coll_hcoll_LIBS : $coll_hcoll_LIBS" >&5 else echo coll_hcoll_LIBS : $coll_hcoll_LIBS >&5 fi @@ -289158,14 +289104,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:289161: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_hcoll_libs $LIBS $coll_hcoll_LIBS" >&5 +echo "configure:289107: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_hcoll_libs $LIBS $coll_hcoll_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_hcoll_libs $LIBS $coll_hcoll_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:289168: \$? = $opal_status" >&5 + echo "configure:289114: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -289883,14 +289829,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:289886: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_hcoll_libs $LIBS $coll_hcoll_LIBS" >&5 +echo "configure:289832: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_hcoll_libs $LIBS $coll_hcoll_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_hcoll_libs $LIBS $coll_hcoll_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:289893: \$? = $opal_status" >&5 + echo "configure:289839: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -292245,14 +292191,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:292248: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:292194: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:292255: \$? = $opal_status" >&5 + echo "configure:292201: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -292970,14 +292916,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:292973: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:292919: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:292980: \$? = $opal_status" >&5 + echo "configure:292926: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -294057,24 +294003,13 @@ - # configure components that provide their own configure script. - # It would be really hard to run these for "find first that - # works", so we don't :) - - - - if test "1" != "0"; then : - - for component_path in $srcdir/ompi/mca/coll/* ; do - component="`basename $component_path`" - if test -d $component_path && test -x $component_path/configure ; then - opal_show_subsubsubtitle "MCA component coll:$component (need to configure)" + opal_show_subsubsubtitle "MCA component coll:ucc (m4 configuration macro)" - opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: before, should_build=" + opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed" - component_path="$srcdir/ompi/mca/coll/$component" + component_path="$srcdir/ompi/mca/coll/ucc" want_component=0 # build if: @@ -294107,7 +294042,7 @@ # if this component type is direct and we are not it, we don't want # to be built. Otherwise, we do want to be built. if test ! -z "$DIRECT_coll" ; then - if test "$DIRECT_coll" = "$component" ; then + if test "$DIRECT_coll" = "ucc" ; then want_component=1 else want_component=0 @@ -294119,26 +294054,24 @@ if test "$DISABLE_coll" = "1"; then : want_component=0 fi - str="DISABLED_COMPONENT_CHECK=\$DISABLE_coll_$component" - eval $str - if test "$DISABLED_COMPONENT_CHECK" = "1" ; then - want_component=0 - fi + if test "$DISABLE_coll_ucc" = "1"; then : + want_component=0 +fi if test "$want_component" = "1"; then : - should_build=1 + should_build=$components_looking_for_succeed else should_build=0 fi + # Allow the component to override the build mode if it really wants to. + # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE SHARED_FRAMEWORK="$DSO_coll" - str="SHARED_COMPONENT=\$DSO_coll_$component" - eval $str + SHARED_COMPONENT="$DSO_coll_ucc" STATIC_FRAMEWORK="$STATIC_coll" - str="STATIC_COMPONENT=\$STATIC_coll_$component" - eval $str + STATIC_COMPONENT="$STATIC_coll_ucc" shared_mode_override=static @@ -294156,9 +294089,9 @@ compile_mode="static" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component coll:$component compile mode" >&5 -$as_echo_n "checking for MCA component coll:$component compile mode... " >&6; } - if test "$DIRECT_coll" = "$component" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component coll:ucc compile mode" >&5 +$as_echo_n "checking for MCA component coll:ucc compile mode... " >&6; } + if test "$DIRECT_coll" = "ucc" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 $as_echo "$compile_mode - direct" >&6; } else @@ -294166,9 +294099,12 @@ $as_echo "$compile_mode" >&6; } fi - opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build" - if test "$should_build" = "1" ; then + # try to configure the component + + ac_config_files="$ac_config_files ompi/mca/coll/ucc/Makefile" + + @@ -294181,7 +294117,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do + for opal_var in ompi_check_ucc_dir ompi_check_ucc_happy CPPFLAGS_save LDFLAGS_save LIBS_save; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -294200,7 +294136,7 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\"" + opal_str="opal_scope_$opal_scope_index=\"ompi_check_ucc_dir ompi_check_ucc_happy CPPFLAGS_save LDFLAGS_save LIBS_save\"" eval $opal_str unset opal_str @@ -294208,250 +294144,450 @@ opal_scope_index=`expr $opal_scope_index + 1` -# -# Invoke configure in a specific subdirectory. -# -# ompi/mca/coll/$component is the directory to invoke in -# $opal_subdir_args is the list of arguments to pass -# should_build=1 is actions to execute upon success -# should_build=0 is actions to execute upon failure -# -subdir_dir="ompi/mca/coll/$component" -subdir_args="$opal_subdir_args" -subdir_success="should_build=1" -subdir_failure="should_build=0" -# -# Sanity checks -# +# Check whether --with-ucc was given. +if test "${with_ucc+set}" = set; then : + withval=$with_ucc; +fi -if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then - { $as_echo "$as_me:${as_lineno-$LINENO}: OPAL configuring in $subdir_dir" >&5 -$as_echo "$as_me: OPAL configuring in $subdir_dir" >&6;} - # - # Gotta check where srcdir is for VPATH builds. If srcdir is not - # ., then we need to mkdir the subdir. Otherwise, we can just cd - # into it. - # + if test "$with_ucc" != "no"; then : + if test -n "$with_ucc" && test "$with_ucc" != "yes"; then : + ompi_check_ucc_dir=$with_ucc +fi - case $srcdir in - .) - ;; - *) - { case $subdir_dir in - [\\/]* | ?:[\\/]* ) total_dir=;; - *) total_dir=.;; - esac - temp=$subdir_dir - for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do - case $dir_part in - # Skip DOS drivespec - ?:) total_dir=$dir_part ;; - *) total_dir=$total_dir/$dir_part - test -d "$total_dir" || - mkdir "$total_dir" || - as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5 - ;; - esac - done; } + CPPFLAGS_save=$CPPFLAGS + LDFLAGS_save=$LDFLAGS + LIBS_save=$LIBS - if test -d ./$subdir_dir; then :; - else - as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5 - fi - ;; - esac - # - # Move into the target directory - # +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:294167: coll_ucc_CPPFLAGS : $coll_ucc_CPPFLAGS" >&5 +else + echo coll_ucc_CPPFLAGS : $coll_ucc_CPPFLAGS >&5 +fi - subdir_parent=`pwd` - cd $subdir_dir +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:294175: coll_ucc_LDFLAGS : $coll_ucc_LDFLAGS" >&5 +else + echo coll_ucc_LDFLAGS : $coll_ucc_LDFLAGS >&5 +fi - # - # Make a "../" for each directory in $subdir_dir. - # +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:294183: coll_ucc_LIBS : $coll_ucc_LIBS" >&5 +else + echo coll_ucc_LIBS : $coll_ucc_LIBS >&5 +fi - subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` - # - # Construct the --srcdir argument - # - case $srcdir in - .) - # In place - subdir_srcdir="$srcdir" - ;; - [\\/]* | ?:[\\/]* ) - # Absolute path - subdir_srcdir="$srcdir/$subdir_dir" - ;; - *) - # Relative path - subdir_srcdir="$subdir_dots$srcdir/$subdir_dir" - ;; - esac + opal_check_package_coll_ucc_save_CPPFLAGS="$CPPFLAGS" + opal_check_package_coll_ucc_save_LDFLAGS="$LDFLAGS" + opal_check_package_coll_ucc_save_LIBS="$LIBS" - # - # Construct the --cache-file argument - # + opal_check_package_coll_ucc_orig_CPPFLAGS="$coll_ucc_CPPFLAGS" + opal_check_package_coll_ucc_orig_LDFLAGS="$coll_ucc_LDFLAGS" + opal_check_package_coll_ucc_orig_LIBS="$coll_ucc_LIBS" - # BWB - subdir caching is a pain since we change CFLAGS and all that. - # Just disable it for now - subdir_cache_file="/dev/null" - # - # Invoke the configure script in the subdirectory - # + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering - sub_configure="$SHELL '$subdir_srcdir/configure'" - { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5 -$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;} - eval "$sub_configure $subdir_args \ - --cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking" - if test "$?" = "0"; then - eval $subdir_success - { $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5 -$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;} - else - eval $subdir_failure - { $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5 -$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;} + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 fi - # - # Go back to the topdir - # + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in dir_prefix; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str - cd $subdir_parent + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"dir_prefix\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + # so this sucks, but there's no way to get through the progression + # of header includes without killing off the cache variable and trying + # again... + unset ac_cv_header_ucc_api_ucc_h + + # get rid of the trailing slash(es) + dir_prefix=$(echo $ompi_check_ucc_dir | sed -e 'sX/*$XXg') + opal_check_package_header_happy="no" + if test "$dir_prefix" = "/usr" || \ + test "$dir_prefix" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5 +$as_echo "looking for header without includes" >&6; } + for ac_header in ucc/api/ucc.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ucc/api/ucc.h" "ac_cv_header_ucc_api_ucc_h" "$ac_includes_default" +if test "x$ac_cv_header_ucc_api_ucc_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UCC_API_UCC_H 1 +_ACEOF + opal_check_package_header_happy="yes" fi -# -# Clean up -# +done + if test "$opal_check_package_header_happy" = "no"; then : + # no go on the as is - reset the cache and try again + unset ac_cv_header_ucc_api_ucc_h +fi +fi - # Unwind the index - opal_scope_index=`expr $opal_scope_index - 1` - opal_scope_test=`expr $opal_scope_index \> 0` - if test "$opal_scope_test" = "0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi + if test "$opal_check_package_header_happy" = "no"; then : + if test "$dir_prefix" != ""; then : + coll_ucc_CPPFLAGS="$coll_ucc_CPPFLAGS -I$dir_prefix/include" + CPPFLAGS="$CPPFLAGS -I$dir_prefix/include" +fi + for ac_header in ucc/api/ucc.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ucc/api/ucc.h" "ac_cv_header_ucc_api_ucc_h" "$ac_includes_default" +if test "x$ac_cv_header_ucc_api_ucc_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UCC_API_UCC_H 1 +_ACEOF + opal_check_package_header_happy="yes" +fi - # Get the variable names from that index - opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" - eval $opal_str +done - # Iterate over all the variables and unset them all - for opal_var in $opal_str; do - unset $opal_var - done + if test "$opal_check_package_header_happy" = "yes"; then : - opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build" - fi + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering - if test "$should_build" = "1" ; then - # do some extra work to pass flags back from the - # top-level configure, the way a configure.m4 - # component would. - infile="$srcdir/ompi/mca/coll/all_components/post_configure.sh" - if test -f $infile; then - # First check for the ABORT tag - line="`$GREP ABORT= $infile | cut -d= -f2-`" - if test -n "$line" && test "$line" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5 -$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;} - as_fn_error $? "cannot continue" "$LINENO" 5 - fi + # see comment above + unset ac_cv_search_ucc_init_version + opal_check_package_lib_happy="no" + if test "" != ""; then : + # libdir was specified - search only there + coll_ucc_LDFLAGS="$coll_ucc_LDFLAGS -L" + LDFLAGS="$LDFLAGS -L" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`" - eval "line=$line" - if test -n "$line"; then - coll_all_components_WRAPPER_EXTRA_LDFLAGS="$line" - fi - line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`" - eval "line=$line" - if test -n "$line"; then - coll_all_components_WRAPPER_EXTRA_LIBS="$line" - fi - fi +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + if test "$opal_check_package_lib_happy" = "no"; then : + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +else + # libdir was not specified - go through search path + opal_check_package_libdir="$ompi_check_ucc_dir" + if test "$opal_check_package_libdir" = "" || \ + test "$opal_check_package_libdir" = "/usr" || \ + test "$opal_check_package_libdir" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 +$as_echo "looking for library without search path" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : - # See if it dropped an output file for us to pick up some - # shell variables in. - infile="$srcdir/ompi/mca/coll/$component/post_configure.sh" +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi - # Add this subdir to the mast list of all MCA component subdirs - all_components="$all_components $component" + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +fi - if test "$compile_mode" = "dso" ; then - dso_components="$dso_components $component" - else - if test "coll" = "common"; then - # Static libraries in "common" frameworks are installed, and - # therefore must obey the $FRAMEWORK_LIB_PREFIX that was - # set. - static_ltlibs="mca/coll/$component/lib${OMPI_LIB_PREFIX}mca_coll_$component.la $static_ltlibs" - else - # Other frameworks do not have to obey the - # $FRAMEWORK_LIB_PREFIX prefix. - static_ltlibs="mca/coll/$component/libmca_coll_$component.la $static_ltlibs" - fi - echo "extern const mca_base_component_t mca_coll_$component_component;" >> $outfile.extern - echo " &mca_coll_$component_component, " >> $outfile.struct - static_components="$static_components $component" - fi + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + coll_ucc_LDFLAGS="$coll_ucc_LDFLAGS -L$opal_check_package_libdir/lib" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 +$as_echo "looking for library in lib" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - # Output pretty results - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component coll:$component can compile" >&5 -$as_echo_n "checking if MCA component coll:$component can compile... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : - if test -f $infile; then - # check for direct call header to include. This will be - # AC_SUBSTed later. - if test "$DIRECT_coll" = "$component" ; then - if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then - line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" - str="MCA_ompi_coll_DIRECT_CALL_HEADER=$line" - eval $str - else -as_fn_error $? "*** coll component $component was supposed to be direct-called, but -*** does not appear to support direct calling. -*** Aborting" "$LINENO" 5 - fi - fi - else - # were we supposed to have found something in the - # post_configure.sh, but the file didn't exist? - if test "$DIRECT_coll" = "$component" ; then -as_fn_error $? "*** coll component $component was supposed to be direct-called, but -*** does not appear to support direct calling. -*** Aborting" "$LINENO" 5 - fi - fi +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi - # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and - # WRAPPER_EXTRA_LIBS. If the component doesn't specify it's - # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if - # component didn't have it's own configure script (in which case, - # we know it didn't set LDFLAGS and LIBS because it can't) Don't - # have to do this if the component is building dynamically, - # because it will link against these (without a dependency from - # libmpi.so to these flags) - if test "$compile_mode" = "static"; then - str="line=\$coll_$component_WRAPPER_EXTRA_LDFLAGS" - eval "$str" + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + coll_ucc_LDFLAGS="$coll_ucc_LDFLAGS -L$opal_check_package_libdir/lib64" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 +$as_echo "looking for library in lib64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : + +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # libnl v1 and libnl3 are known to *not* coexist + # harmoniously in the same process. Check to see if this + # new package will introduce such a conflict. @@ -294464,7 +294600,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in opal_tmp opal_append; do + for opal_var in opal_libnl_sane; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -294483,56 +294619,16 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + opal_str="opal_scope_$opal_scope_index=\"opal_libnl_sane\"" eval $opal_str unset opal_str env | grep opal_scope opal_scope_index=`expr $opal_scope_index + 1` - - for arg in $line; do - opal_tmp=`echo $arg | cut -c1-2` - opal_append=1 - if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : - for val in ${mca_wrapper_extra_ldflags}; do - if test "x$val" = "x$arg"; then : - opal_append=0 -fi - done -fi - if test "$opal_append" = "1"; then : - if test -z "$mca_wrapper_extra_ldflags"; then : - mca_wrapper_extra_ldflags=$arg -else - mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg" -fi -fi - done - - - # Unwind the index - opal_scope_index=`expr $opal_scope_index - 1` - opal_scope_test=`expr $opal_scope_index \> 0` - if test "$opal_scope_test" = "0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi - - # Get the variable names from that index - opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" - eval $opal_str - - # Iterate over all the variables and unset them all - for opal_var in $opal_str; do - unset $opal_var - done - -str="line=\$coll_$component_WRAPPER_EXTRA_LIBS" - eval "$str" + opal_libnl_sane=1 + case $host in + *linux*) @@ -294545,7 +294641,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in opal_tmp opal_append; do + for opal_var in this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -294564,7 +294660,7 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + opal_str="opal_scope_$opal_scope_index=\"this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg\"" eval $opal_str unset opal_str @@ -294572,332 +294668,1259 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $line; do - opal_tmp=`echo $arg | cut -c1-2` - opal_append=1 - if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : - for val in ${mca_wrapper_extra_libs}; do - if test "x$val" = "x$arg"; then : - opal_append=0 -fi - done -fi - if test "$opal_append" = "1"; then : - if test -z "$mca_wrapper_extra_libs"; then : - mca_wrapper_extra_libs=$arg + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libucc requires libnl v1 or v3" >&5 +$as_echo_n "checking if libucc requires libnl v1 or v3... " >&6; } + cat > conftest_c.$ac_ext << EOF +extern void ucc_init_version (void); +int main(int argc, char *argv[]) { + ucc_init_version (); + return 0; +} +EOF + + this_requires_v1=0 + this_requires_v3=0 + result_msg= + +# 1 is the command +# 2 is actions to do if success +# 3 is actions to do if fail +echo "configure:294695: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $coll_ucc_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $coll_ucc_LIBS 1>&5 2>&1 +opal_status=$? + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:294702: \$? = $opal_status" >&5 else - mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" + echo \$? = $opal_status >&5 fi +if test "$opal_status" = "0"; then + unset opal_status + ldd_output=`ldd conftest` + if echo $ldd_output | grep -q libnl-3.so; then : + this_requires_v3=1 + result_msg="v3" fi - done - + if echo $ldd_output | grep -q libnl.so; then : + this_requires_v1=1 + result_msg="v1 $result_msg" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5 +$as_echo "$result_msg" >&6; } - # Unwind the index - opal_scope_index=`expr $opal_scope_index - 1` - opal_scope_test=`expr $opal_scope_index \> 0` - if test "$opal_scope_test" = "0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi +else + unset opal_status + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib ucc" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib ucc" >&2;} - # Get the variable names from that index - opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" - eval $opal_str +fi - # Iterate over all the variables and unset them all - for opal_var in $opal_str; do - unset $opal_var - done + # Assume that our configuration is sane; this may get reset below + libnl_sane=1 + # Note: in all the checks below, only add this library to the list + # of libraries (for v1 or v3 as relevant) if we do not fail. + # I.e., assume that a higher level will refuse to use this library + # if we return failure. - fi + # Does this library require both v1 and v3? If so, fail. + if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&2;} - # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script - # component can never be used in a STOP_AT_FIRST framework, we - # don't have to implement the else clause in the literal check... + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} + libnl_sane=0 +fi - else + # Does this library require v1, but some prior library required + # v3? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : + if test $opal_libnl_version -eq 3; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component coll:$component can compile" >&5 -$as_echo_n "checking if MCA component coll:$component can compile... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} - # If this component was requested as the default for this - # type, then abort. - if test "$with_coll" = "$component" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 -$as_echo "$as_me: WARNING: This component was selected as the default" >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi + libnl_sane=0 +else + opal_libnlv1_libs="$opal_libnlv1_libs ucc" - if test ! -z "$DIRECT_coll" ; then - if test "$DIRECT_coll" = "$component" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 -$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi - fi +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv1_libs - fi - fi - done +# Go through each item in the variable and only keep the unique ones -fi +opal_count=0 +for val in ${opal_libnlv1_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 - MCA_ompi_coll_ALL_COMPONENTS="$all_components" - MCA_ompi_coll_STATIC_COMPONENTS="$static_components" - MCA_ompi_coll_DSO_COMPONENTS="$dso_components" - MCA_ompi_coll_STATIC_LTLIBS="$static_ltlibs" + # Loop over every token we've seen so far + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + # Check the ending condition + opal_done="`expr $opal_i \>= $opal_count`" + # Increment the counter - MCA_ompi_coll_ALL_SUBDIRS= - for item in $all_components ; do - MCA_ompi_coll_ALL_SUBDIRS="$MCA_ompi_coll_ALL_SUBDIRS mca/coll/$item" + opal_i="`expr $opal_i + 1`" done + # If we didn't find the token, add it to the "array" + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done - MCA_ompi_coll_STATIC_SUBDIRS= - for item in $static_components ; do - MCA_ompi_coll_STATIC_SUBDIRS="$MCA_ompi_coll_STATIC_SUBDIRS mca/coll/$item" - done +# Take all the items in the "array" and assemble them back into a +# single variable +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + opal_eval="unset opal_array_$opal_i" + eval $opal_eval - MCA_ompi_coll_DSO_SUBDIRS= - for item in $dso_components ; do - MCA_ompi_coll_DSO_SUBDIRS="$MCA_ompi_coll_DSO_SUBDIRS mca/coll/$item" - done + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done +# Done; do the assignment +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval - # Create the final .h file that will be included in the type's - # top-level glue. This lists all the static components. We don't - # need to do this for "common". - if test "coll" != "common"; then - cat > $outfile <&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&2;} -EOF - # Only replace the header file if a) it doesn't previously - # exist, or b) the contents are different. Do this to not - # trigger recompilation of certain .c files just because the - # timestamp changed on $outfile_real (similar to the way AC - # handles AC_CONFIG_HEADER files). - diff $outfile $outfile_real > /dev/null 2>&1 - if test "$?" != "0"; then - mv $outfile $outfile_real - else - rm -f $outfile - fi - fi - rm -f $outfile.struct $outfile.extern + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} - unset all_components static_components dso_components outfile outfile_real + libnl_sane=0 +else + opal_libnlv3_libs="$opal_libnlv3_libs ucc" - MCA_ompi_FRAMEWORKS="$MCA_ompi_FRAMEWORKS crcp" - MCA_ompi_FRAMEWORKS_SUBDIRS="$MCA_ompi_FRAMEWORKS_SUBDIRS mca/crcp" - MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_ompi_crcp_ALL_SUBDIRS)" - MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_ompi_crcp_DSO_SUBDIRS)" - MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_ompi_crcp_STATIC_SUBDIRS)" - MCA_ompi_FRAMEWORK_LIBS="$MCA_ompi_FRAMEWORK_LIBS mca/crcp/libmca_crcp.la" - MCA_ompi_FRAMEWORK_LIBS="$MCA_ompi_FRAMEWORK_LIBS \$(MCA_ompi_crcp_STATIC_LTLIBS)" +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv3_libs - opal_show_subsubtitle "Configuring MCA framework crcp" +# Go through each item in the variable and only keep the unique ones +opal_count=0 +for val in ${opal_libnlv3_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + # Loop over every token we've seen so far + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do - # setup for framework - all_components= - static_components= - dso_components= - static_ltlibs= + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. - # Ensure that the directory where the #include file is to live - # exists. Need to do this for VPATH builds, because the directory - # may not exist yet. For the "common" type, it's not really a - # component, so it doesn't have a base. - outdir=ompi/mca/crcp/base - as_dir=$outdir; as_fn_mkdir_p + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` - # emit Makefile rule - ac_config_files="$ac_config_files ompi/mca/crcp/Makefile" + # Check the ending condition + opal_done="`expr $opal_i \>= $opal_count`" - # remove any previously generated #include files - outfile_real=$outdir/static-components.h - outfile=$outfile_real.new - rm -f $outfile $outfile.struct $outfile.extern - touch $outfile.struct $outfile.extern + # Increment the counter - # print some nice messages about what we're about to do... - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework crcp" >&5 -$as_echo_n "checking for no configure components in framework crcp... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework crcp" >&5 -$as_echo_n "checking for m4 configure components in framework crcp... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: bkmrk" >&5 -$as_echo "bkmrk" >&6; } + opal_i="`expr $opal_i + 1`" + done - # If there are components in the no configure list, but we're - # doing one of the "special" selection logics, abort with a - # reasonable message. + # If we didn't find the token, add it to the "array" + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done +# Take all the items in the "array" and assemble them back into a +# single variable - # run the configure logic for the no-config components +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + opal_eval="unset opal_array_$opal_i" + eval $opal_eval - # configure components that use built-in configuration scripts + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done +# Done; do the assignment +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval - best_mca_component_priority=0 - components_looking_for_succeed=1 - components_last_result=0 +# Clean up +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=3 +fi - opal_show_subsubsubtitle "MCA component crcp:bkmrk (m4 configuration macro)" +fi - opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + rm -f conftest conftest_c.$ac_ext + opal_libnl_sane=$libnl_sane - component_path="$srcdir/ompi/mca/crcp/bkmrk" - want_component=0 - # build if: - # - the component type is direct and we are that component - # - there is no opal_ignore file - # - there is an opal_ignore, but there is an empty opal_unignore - # - there is an opal_ignore, but username is in opal_unignore - if test -d $component_path ; then - # decide if we want the component to be built or not. This - # is spread out because some of the logic is a little complex - # and test's syntax isn't exactly the greatest. We want to - # build the component by default. - want_component=1 - if test -f $component_path/.opal_ignore ; then - # If there is an opal_ignore file, don't build - # the component. Note that this decision can be - # overridden by the unignore logic below. - want_component=0 - fi - if test -f $component_path/.opal_unignore ; then - # if there is an empty opal_unignore, that is - # equivalent to having your userid in the unignore file. - # If userid is in the file, unignore the ignore file. - if test ! -s $component_path/.opal_unignore ; then - want_component=1 - elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then - want_component=1 - fi - fi - # if this component type is direct and we are not it, we don't want - # to be built. Otherwise, we do want to be built. - if test ! -z "$DIRECT_crcp" ; then - if test "$DIRECT_crcp" = "bkmrk" ; then - want_component=1 - else - want_component=0 - fi + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + ;; + esac + + opal_check_package_libnl_check_ok=$opal_libnl_sane + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + if test $opal_check_package_libnl_check_ok -eq 0; then : + opal_check_package_lib_happy=no +fi + +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] + if test "$ac_cv_search_ucc_init_version" != "no" && + test "$ac_cv_search_ucc_init_version" != "none required"; then : + coll_ucc_LIBS="$ac_cv_search_ucc_init_version " +else + coll_ucc_LIBS="" +fi + opal_check_package_happy="yes" +else + opal_check_package_happy="no" +fi + + +else + opal_check_package_happy="no" +fi +else + + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering + + + # see comment above + unset ac_cv_search_ucc_init_version + opal_check_package_lib_happy="no" + if test "" != ""; then : + # libdir was specified - search only there + coll_ucc_LDFLAGS="$coll_ucc_LDFLAGS -L" + LDFLAGS="$LDFLAGS -L" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : + +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +else + # libdir was not specified - go through search path + opal_check_package_libdir="$ompi_check_ucc_dir" + if test "$opal_check_package_libdir" = "" || \ + test "$opal_check_package_libdir" = "/usr" || \ + test "$opal_check_package_libdir" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 +$as_echo "looking for library without search path" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : + +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + coll_ucc_LDFLAGS="$coll_ucc_LDFLAGS -L$opal_check_package_libdir/lib" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 +$as_echo "looking for library in lib" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : + +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + coll_ucc_LDFLAGS="$coll_ucc_LDFLAGS -L$opal_check_package_libdir/lib64" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 +$as_echo "looking for library in lib64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ucc_init_version (); +int +main () +{ +return ucc_init_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ucc; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ucc_init_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ucc_init_version+:} false; then : + break +fi +done +if ${ac_cv_search_ucc_init_version+:} false; then : + +else + ac_cv_search_ucc_init_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version +fi +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # libnl v1 and libnl3 are known to *not* coexist + # harmoniously in the same process. Check to see if this + # new package will introduce such a conflict. + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_libnl_sane; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_libnl_sane\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + opal_libnl_sane=1 + case $host in + *linux*) + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 fi - # if we were explicitly disabled, don't build :) - if test "$DISABLE_crcp" = "1"; then : - want_component=0 + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libucc requires libnl v1 or v3" >&5 +$as_echo_n "checking if libucc requires libnl v1 or v3... " >&6; } + cat > conftest_c.$ac_ext << EOF +extern void ucc_init_version (void); +int main(int argc, char *argv[]) { + ucc_init_version (); + return 0; +} +EOF + + this_requires_v1=0 + this_requires_v3=0 + result_msg= + +# 1 is the command +# 2 is actions to do if success +# 3 is actions to do if fail +echo "configure:295420: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $coll_ucc_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $coll_ucc_LIBS 1>&5 2>&1 +opal_status=$? + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:295427: \$? = $opal_status" >&5 +else + echo \$? = $opal_status >&5 fi - if test "$DISABLE_crcp_bkmrk" = "1"; then : - want_component=0 +if test "$opal_status" = "0"; then + unset opal_status + ldd_output=`ldd conftest` + if echo $ldd_output | grep -q libnl-3.so; then : + this_requires_v3=1 + result_msg="v3" +fi + if echo $ldd_output | grep -q libnl.so; then : + this_requires_v1=1 + result_msg="v1 $result_msg" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5 +$as_echo "$result_msg" >&6; } - if test "$want_component" = "1"; then : - should_build=$components_looking_for_succeed else - should_build=0 + unset opal_status + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib ucc" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib ucc" >&2;} + fi - # Allow the component to override the build mode if it really wants to. - # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE + # Assume that our configuration is sane; this may get reset below + libnl_sane=1 - SHARED_FRAMEWORK="$DSO_crcp" - SHARED_COMPONENT="$DSO_crcp_bkmrk" + # Note: in all the checks below, only add this library to the list + # of libraries (for v1 or v3 as relevant) if we do not fail. + # I.e., assume that a higher level will refuse to use this library + # if we return failure. - STATIC_FRAMEWORK="$STATIC_crcp" - STATIC_COMPONENT="$STATIC_crcp_bkmrk" + # Does this library require both v1 and v3? If so, fail. + if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&2;} - shared_mode_override=static + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} - # Setup for either shared or static - if test "$STATIC_FRAMEWORK" = "1" || \ - test "$STATIC_COMPONENT" = "1" || \ - test "$STATIC_all" = "1" ; then - compile_mode="static" - elif test "$shared_mode_override" = "dso" || \ - test "$SHARED_FRAMEWORK" = "1" || \ - test "$SHARED_COMPONENT" = "1" || \ - test "$DSO_all" = "1"; then - compile_mode="dso" + libnl_sane=0 +fi + + # Does this library require v1, but some prior library required + # v3? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : + if test $opal_libnl_version -eq 3; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} + + libnl_sane=0 +else + opal_libnlv1_libs="$opal_libnlv1_libs ucc" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv1_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv1_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" else - compile_mode="static" + opal_i="`expr $opal_i - 1`" fi +done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component crcp:bkmrk compile mode" >&5 -$as_echo_n "checking for MCA component crcp:bkmrk compile mode... " >&6; } - if test "$DIRECT_crcp" = "bkmrk" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 -$as_echo "$compile_mode - direct" >&6; } +# Take all the items in the "array" and assemble them back into a +# single variable + +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=1 +fi + +fi + + # Does this library require v3, but some prior library required + # v1? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : + if test $opal_libnl_version -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} + + libnl_sane=0 +else + opal_libnlv3_libs="$opal_libnlv3_libs ucc" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv3_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv3_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5 -$as_echo "$compile_mode" >&6; } + opal_i="`expr $opal_i - 1`" fi +done +# Take all the items in the "array" and assemble them back into a +# single variable - # try to configure the component +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval - ac_config_files="$ac_config_files ompi/mca/crcp/bkmrk/Makefile" + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done - # If we don't want FT, don't compile this component - if test "$opal_want_ft_cr" = "1"; then : - should_build=$should_build +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=3 +fi + +fi + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + rm -f conftest conftest_c.$ac_ext + + opal_libnl_sane=$libnl_sane + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + ;; + esac + + opal_check_package_libnl_check_ok=$opal_libnl_sane + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + if test $opal_check_package_libnl_check_ok -eq 0; then : + opal_check_package_lib_happy=no +fi + +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] + if test "$ac_cv_search_ucc_init_version" != "no" && + test "$ac_cv_search_ucc_init_version" != "none required"; then : + coll_ucc_LIBS="$ac_cv_search_ucc_init_version " +else + coll_ucc_LIBS="" +fi + opal_check_package_happy="yes" +else + opal_check_package_happy="no" +fi + + +fi + unset opal_check_package_header_happy + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + + if test "$opal_check_package_happy" = "yes"; then : + ompi_check_ucc_happy="yes" +else + coll_ucc_CPPFLAGS="$opal_check_package_coll_ucc_orig_CPPFLAGS" + coll_ucc_LDFLAGS="$opal_check_package_coll_ucc_orig_LDFLAGS" + coll_ucc_LIBS="$opal_check_package_coll_ucc_orig_LIBS" + ompi_check_ucc_happy="no" +fi + + CPPFLAGS="$opal_check_package_coll_ucc_save_CPPFLAGS" + LDFLAGS="$opal_check_package_coll_ucc_save_LDFLAGS" + LIBS="$opal_check_package_coll_ucc_save_LIBS" + + + if test "$ompi_check_ucc_happy" = "yes"; then : + + CPPFLAGS=$coll_ucc_CPPFLAGS + LDFLAGS=$coll_ucc_LDFLAGS + LIBS=$coll_ucc_LIBS + for ac_func in ucc_comm_free +do : + ac_fn_c_check_func "$LINENO" "ucc_comm_free" "ac_cv_func_ucc_comm_free" +if test "x$ac_cv_func_ucc_comm_free" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UCC_COMM_FREE 1 +_ACEOF + +fi +done + + +fi + + CPPFLAGS=$CPPFLAGS_save + LDFLAGS=$LDFLAGS_save + LIBS=$LIBS_save +else + ompi_check_ucc_happy=no +fi + + if test "$ompi_check_ucc_happy" = "yes" && test "$enable_progress_threads" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ucc driver does not currently support progress threads. Disabling UCC." >&5 +$as_echo "$as_me: WARNING: ucc driver does not currently support progress threads. Disabling UCC." >&2;} + ompi_check_ucc_happy="no" +fi + + if test "$ompi_check_ucc_happy" = "yes"; then : + coll_ucc_happy="yes" +else + if test -n "$with_ucc" && test "$with_ucc" != "no"; then : + as_fn_error $? "UCC support requested but not found. Aborting" "$LINENO" 5 +fi + coll_ucc_happy="no" +fi + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + + if test "$coll_ucc_happy" = "yes"; then : + coll_ucc_WRAPPER_EXTRA_LDFLAGS="$coll_ucc_LDFLAGS" + coll_ucc_CPPFLAGS="$coll_ucc_CPPFLAGS" + coll_ucc_WRAPPER_EXTRA_LIBS="$coll_ucc_LIBS" + should_build=$should_build else should_build=0 fi + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in ompi_summary_section ompi_summary_line ompi_summary_section_current; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"ompi_summary_section ompi_summary_line ompi_summary_section_current\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + ompi_summary_section=$(echo Miscellaneous | tr ' ' '_') + ompi_summary_line="Open UCC: $coll_ucc_happy" + ompi_summary_section_current=$(eval echo \$ompi_summary_values_$ompi_summary_section) + + if test -z "$ompi_summary_section_current" ; then + if test -z "$ompi_summary_sections" ; then + ompi_summary_sections=$ompi_summary_section + else + ompi_summary_sections="$ompi_summary_sections $ompi_summary_section" + fi + eval ompi_summary_values_$ompi_summary_section=\"$ompi_summary_line\" + else + eval ompi_summary_values_$ompi_summary_section=\"$ompi_summary_section_current,$ompi_summary_line\" + fi + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build" if test "$should_build" = "1"; then : @@ -294906,45 +295929,45 @@ # See if it dropped an output file for us to pick up some # shell variables in. - infile="$srcdir/ompi/mca/crcp/bkmrk/post_configure.sh" + infile="$srcdir/ompi/mca/coll/ucc/post_configure.sh" # Add this subdir to the mast list of all MCA component subdirs - all_components="$all_components bkmrk" + all_components="$all_components ucc" if test "$compile_mode" = "dso" ; then - dso_components="$dso_components bkmrk" + dso_components="$dso_components ucc" else - if test "crcp" = "common"; then + if test "coll" = "common"; then # Static libraries in "common" frameworks are installed, and # therefore must obey the $FRAMEWORK_LIB_PREFIX that was # set. - static_ltlibs="mca/crcp/bkmrk/lib${OMPI_LIB_PREFIX}mca_crcp_bkmrk.la $static_ltlibs" + static_ltlibs="mca/coll/ucc/lib${OMPI_LIB_PREFIX}mca_coll_ucc.la $static_ltlibs" else # Other frameworks do not have to obey the # $FRAMEWORK_LIB_PREFIX prefix. - static_ltlibs="mca/crcp/bkmrk/libmca_crcp_bkmrk.la $static_ltlibs" + static_ltlibs="mca/coll/ucc/libmca_coll_ucc.la $static_ltlibs" fi - echo "extern const mca_base_component_t mca_crcp_bkmrk_component;" >> $outfile.extern - echo " &mca_crcp_bkmrk_component, " >> $outfile.struct - static_components="$static_components bkmrk" + echo "extern const mca_base_component_t mca_coll_ucc_component;" >> $outfile.extern + echo " &mca_coll_ucc_component, " >> $outfile.struct + static_components="$static_components ucc" fi # Output pretty results - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:bkmrk can compile" >&5 -$as_echo_n "checking if MCA component crcp:bkmrk can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component coll:ucc can compile" >&5 +$as_echo_n "checking if MCA component coll:ucc can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } if test -f $infile; then # check for direct call header to include. This will be # AC_SUBSTed later. - if test "$DIRECT_crcp" = "bkmrk" ; then + if test "$DIRECT_coll" = "ucc" ; then if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" - str="MCA_ompi_crcp_DIRECT_CALL_HEADER=$line" + str="MCA_ompi_coll_DIRECT_CALL_HEADER=$line" eval $str else -as_fn_error $? "*** crcp component bkmrk was supposed to be direct-called, but +as_fn_error $? "*** coll component ucc was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -294952,8 +295975,8 @@ else # were we supposed to have found something in the # post_configure.sh, but the file didn't exist? - if test "$DIRECT_crcp" = "bkmrk" ; then -as_fn_error $? "*** crcp component bkmrk was supposed to be direct-called, but + if test "$DIRECT_coll" = "ucc" ; then +as_fn_error $? "*** coll component ucc was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -294968,7 +295991,7 @@ # because it will link against these (without a dependency from # libmpi.so to these flags) if test "$compile_mode" = "static"; then - if test "$crcp_bkmrk_WRAPPER_EXTRA_LDFLAGS" = ""; then : + if test "$coll_ucc_WRAPPER_EXTRA_LDFLAGS" = ""; then : @@ -295008,7 +296031,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $crcp_bkmrk_LDFLAGS; do + for arg in $coll_ucc_LDFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -295089,7 +296112,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $crcp_bkmrk_WRAPPER_EXTRA_LDFLAGS; do + for arg in $coll_ucc_WRAPPER_EXTRA_LDFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -295131,7 +296154,7 @@ fi - if test "$crcp_bkmrk_WRAPPER_EXTRA_LIBS" = ""; then : + if test "$coll_ucc_WRAPPER_EXTRA_LIBS" = ""; then : @@ -295171,7 +296194,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $crcp_bkmrk_LIBS; do + for arg in $coll_ucc_LIBS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -295252,7 +296275,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $crcp_bkmrk_WRAPPER_EXTRA_LIBS; do + for arg in $coll_ucc_WRAPPER_EXTRA_LIBS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -295300,7 +296323,7 @@ # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script # component can never be used in a STOP_AT_FIRST framework, we # don't have to implement the else clause in the literal check... - if test "$crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS" != ""; then : + if test "$coll_ucc_WRAPPER_EXTRA_CPPFLAGS" != ""; then : stop_at_first=0 if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : if test "$with_devel_headers" = "yes"; then : @@ -295343,7 +296366,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS; do + for arg in $coll_ucc_WRAPPER_EXTRA_CPPFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -295386,32 +296409,32 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS ($crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 -$as_echo "$as_me: WARNING: ignoring crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS ($crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring coll_ucc_WRAPPER_EXTRA_CPPFLAGS ($coll_ucc_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 +$as_echo "$as_me: WARNING: ignoring coll_ucc_WRAPPER_EXTRA_CPPFLAGS ($coll_ucc_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:bkmrk can compile" >&5 -$as_echo_n "checking if MCA component crcp:bkmrk can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component coll:ucc can compile" >&5 +$as_echo_n "checking if MCA component coll:ucc can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } # If this component was requested as the default for this # type, then abort. - if test "$with_crcp" = "bkmrk" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bkmrk\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"bkmrk\" failed to configure properly" >&2;} + if test "$with_coll" = "ucc" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"ucc\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"ucc\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 $as_echo "$as_me: WARNING: This component was selected as the default" >&2;} as_fn_error $? "Cannot continue" "$LINENO" 5 fi - if test ! -z "$DIRECT_crcp" ; then - if test "$DIRECT_crcp" = "bkmrk" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bkmrk\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"bkmrk\" failed to configure properly" >&2;} + if test ! -z "$DIRECT_coll" ; then + if test "$DIRECT_coll" = "ucc" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"ucc\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"ucc\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 $as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} as_fn_error $? "Cannot continue" "$LINENO" 5 @@ -295419,23 +296442,23 @@ fi # add component to all component list - all_components="$all_components bkmrk" + all_components="$all_components ucc" fi # set the AM_CONDITIONAL on how we should build if test "$compile_mode" = "dso"; then : - BUILD_ompi_crcp_bkmrk_DSO=1 + BUILD_ompi_coll_ucc_DSO=1 else - BUILD_ompi_crcp_bkmrk_DSO=0 + BUILD_ompi_coll_ucc_DSO=0 fi - if test "$BUILD_ompi_crcp_bkmrk_DSO" = "1"; then - MCA_BUILD_ompi_crcp_bkmrk_DSO_TRUE= - MCA_BUILD_ompi_crcp_bkmrk_DSO_FALSE='#' + if test "$BUILD_ompi_coll_ucc_DSO" = "1"; then + MCA_BUILD_ompi_coll_ucc_DSO_TRUE= + MCA_BUILD_ompi_coll_ucc_DSO_FALSE='#' else - MCA_BUILD_ompi_crcp_bkmrk_DSO_TRUE='#' - MCA_BUILD_ompi_crcp_bkmrk_DSO_FALSE= + MCA_BUILD_ompi_coll_ucc_DSO_TRUE='#' + MCA_BUILD_ompi_coll_ucc_DSO_FALSE= fi @@ -295459,16 +296482,16 @@ if test "1" != "0"; then : - for component_path in $srcdir/ompi/mca/crcp/* ; do + for component_path in $srcdir/ompi/mca/coll/* ; do component="`basename $component_path`" if test -d $component_path && test -x $component_path/configure ; then - opal_show_subsubsubtitle "MCA component crcp:$component (need to configure)" + opal_show_subsubsubtitle "MCA component coll:$component (need to configure)" opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: before, should_build=" - component_path="$srcdir/ompi/mca/crcp/$component" + component_path="$srcdir/ompi/mca/coll/$component" want_component=0 # build if: @@ -295500,8 +296523,8 @@ fi # if this component type is direct and we are not it, we don't want # to be built. Otherwise, we do want to be built. - if test ! -z "$DIRECT_crcp" ; then - if test "$DIRECT_crcp" = "$component" ; then + if test ! -z "$DIRECT_coll" ; then + if test "$DIRECT_coll" = "$component" ; then want_component=1 else want_component=0 @@ -295510,10 +296533,10 @@ fi # if we were explicitly disabled, don't build :) - if test "$DISABLE_crcp" = "1"; then : + if test "$DISABLE_coll" = "1"; then : want_component=0 fi - str="DISABLED_COMPONENT_CHECK=\$DISABLE_crcp_$component" + str="DISABLED_COMPONENT_CHECK=\$DISABLE_coll_$component" eval $str if test "$DISABLED_COMPONENT_CHECK" = "1" ; then want_component=0 @@ -295526,12 +296549,12 @@ fi - SHARED_FRAMEWORK="$DSO_crcp" - str="SHARED_COMPONENT=\$DSO_crcp_$component" + SHARED_FRAMEWORK="$DSO_coll" + str="SHARED_COMPONENT=\$DSO_coll_$component" eval $str - STATIC_FRAMEWORK="$STATIC_crcp" - str="STATIC_COMPONENT=\$STATIC_crcp_$component" + STATIC_FRAMEWORK="$STATIC_coll" + str="STATIC_COMPONENT=\$STATIC_coll_$component" eval $str shared_mode_override=static @@ -295550,9 +296573,9 @@ compile_mode="static" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component crcp:$component compile mode" >&5 -$as_echo_n "checking for MCA component crcp:$component compile mode... " >&6; } - if test "$DIRECT_crcp" = "$component" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component coll:$component compile mode" >&5 +$as_echo_n "checking for MCA component coll:$component compile mode... " >&6; } + if test "$DIRECT_coll" = "$component" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 $as_echo "$compile_mode - direct" >&6; } else @@ -295605,12 +296628,12 @@ # # Invoke configure in a specific subdirectory. # -# ompi/mca/crcp/$component is the directory to invoke in +# ompi/mca/coll/$component is the directory to invoke in # $opal_subdir_args is the list of arguments to pass # should_build=1 is actions to execute upon success # should_build=0 is actions to execute upon failure # -subdir_dir="ompi/mca/crcp/$component" +subdir_dir="ompi/mca/coll/$component" subdir_args="$opal_subdir_args" subdir_success="should_build=1" subdir_failure="should_build=0" @@ -295754,7 +296777,7 @@ # do some extra work to pass flags back from the # top-level configure, the way a configure.m4 # component would. - infile="$srcdir/ompi/mca/crcp/all_components/post_configure.sh" + infile="$srcdir/ompi/mca/coll/all_components/post_configure.sh" if test -f $infile; then # First check for the ABORT tag @@ -295768,12 +296791,12 @@ line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`" eval "line=$line" if test -n "$line"; then - crcp_all_components_WRAPPER_EXTRA_LDFLAGS="$line" + coll_all_components_WRAPPER_EXTRA_LDFLAGS="$line" fi line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`" eval "line=$line" if test -n "$line"; then - crcp_all_components_WRAPPER_EXTRA_LIBS="$line" + coll_all_components_WRAPPER_EXTRA_LIBS="$line" fi fi @@ -295782,7 +296805,7 @@ # See if it dropped an output file for us to pick up some # shell variables in. - infile="$srcdir/ompi/mca/crcp/$component/post_configure.sh" + infile="$srcdir/ompi/mca/coll/$component/post_configure.sh" # Add this subdir to the mast list of all MCA component subdirs all_components="$all_components $component" @@ -295790,37 +296813,37 @@ if test "$compile_mode" = "dso" ; then dso_components="$dso_components $component" else - if test "crcp" = "common"; then + if test "coll" = "common"; then # Static libraries in "common" frameworks are installed, and # therefore must obey the $FRAMEWORK_LIB_PREFIX that was # set. - static_ltlibs="mca/crcp/$component/lib${OMPI_LIB_PREFIX}mca_crcp_$component.la $static_ltlibs" + static_ltlibs="mca/coll/$component/lib${OMPI_LIB_PREFIX}mca_coll_$component.la $static_ltlibs" else # Other frameworks do not have to obey the # $FRAMEWORK_LIB_PREFIX prefix. - static_ltlibs="mca/crcp/$component/libmca_crcp_$component.la $static_ltlibs" + static_ltlibs="mca/coll/$component/libmca_coll_$component.la $static_ltlibs" fi - echo "extern const mca_base_component_t mca_crcp_$component_component;" >> $outfile.extern - echo " &mca_crcp_$component_component, " >> $outfile.struct + echo "extern const mca_base_component_t mca_coll_$component_component;" >> $outfile.extern + echo " &mca_coll_$component_component, " >> $outfile.struct static_components="$static_components $component" fi # Output pretty results - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:$component can compile" >&5 -$as_echo_n "checking if MCA component crcp:$component can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component coll:$component can compile" >&5 +$as_echo_n "checking if MCA component coll:$component can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } if test -f $infile; then # check for direct call header to include. This will be # AC_SUBSTed later. - if test "$DIRECT_crcp" = "$component" ; then + if test "$DIRECT_coll" = "$component" ; then if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" - str="MCA_ompi_crcp_DIRECT_CALL_HEADER=$line" + str="MCA_ompi_coll_DIRECT_CALL_HEADER=$line" eval $str else -as_fn_error $? "*** crcp component $component was supposed to be direct-called, but +as_fn_error $? "*** coll component $component was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -295828,8 +296851,8 @@ else # were we supposed to have found something in the # post_configure.sh, but the file didn't exist? - if test "$DIRECT_crcp" = "$component" ; then -as_fn_error $? "*** crcp component $component was supposed to be direct-called, but + if test "$DIRECT_coll" = "$component" ; then +as_fn_error $? "*** coll component $component was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -295844,7 +296867,7 @@ # because it will link against these (without a dependency from # libmpi.so to these flags) if test "$compile_mode" = "static"; then - str="line=\$crcp_$component_WRAPPER_EXTRA_LDFLAGS" + str="line=\$coll_$component_WRAPPER_EXTRA_LDFLAGS" eval "$str" @@ -295925,7 +296948,7 @@ unset $opal_var done -str="line=\$crcp_$component_WRAPPER_EXTRA_LIBS" +str="line=\$coll_$component_WRAPPER_EXTRA_LIBS" eval "$str" @@ -296016,14 +297039,14 @@ else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:$component can compile" >&5 -$as_echo_n "checking if MCA component crcp:$component can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component coll:$component can compile" >&5 +$as_echo_n "checking if MCA component coll:$component can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } # If this component was requested as the default for this # type, then abort. - if test "$with_crcp" = "$component" ; then + if test "$with_coll" = "$component" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5 $as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 @@ -296031,8 +297054,8 @@ as_fn_error $? "Cannot continue" "$LINENO" 5 fi - if test ! -z "$DIRECT_crcp" ; then - if test "$DIRECT_crcp" = "$component" ; then + if test ! -z "$DIRECT_coll" ; then + if test "$DIRECT_coll" = "$component" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5 $as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 @@ -296047,10 +297070,10 @@ fi - MCA_ompi_crcp_ALL_COMPONENTS="$all_components" - MCA_ompi_crcp_STATIC_COMPONENTS="$static_components" - MCA_ompi_crcp_DSO_COMPONENTS="$dso_components" - MCA_ompi_crcp_STATIC_LTLIBS="$static_ltlibs" + MCA_ompi_coll_ALL_COMPONENTS="$all_components" + MCA_ompi_coll_STATIC_COMPONENTS="$static_components" + MCA_ompi_coll_DSO_COMPONENTS="$dso_components" + MCA_ompi_coll_STATIC_LTLIBS="$static_ltlibs" @@ -296058,23 +297081,23 @@ - MCA_ompi_crcp_ALL_SUBDIRS= + MCA_ompi_coll_ALL_SUBDIRS= for item in $all_components ; do - MCA_ompi_crcp_ALL_SUBDIRS="$MCA_ompi_crcp_ALL_SUBDIRS mca/crcp/$item" + MCA_ompi_coll_ALL_SUBDIRS="$MCA_ompi_coll_ALL_SUBDIRS mca/coll/$item" done - MCA_ompi_crcp_STATIC_SUBDIRS= + MCA_ompi_coll_STATIC_SUBDIRS= for item in $static_components ; do - MCA_ompi_crcp_STATIC_SUBDIRS="$MCA_ompi_crcp_STATIC_SUBDIRS mca/crcp/$item" + MCA_ompi_coll_STATIC_SUBDIRS="$MCA_ompi_coll_STATIC_SUBDIRS mca/coll/$item" done - MCA_ompi_crcp_DSO_SUBDIRS= + MCA_ompi_coll_DSO_SUBDIRS= for item in $dso_components ; do - MCA_ompi_crcp_DSO_SUBDIRS="$MCA_ompi_crcp_DSO_SUBDIRS mca/crcp/$item" + MCA_ompi_coll_DSO_SUBDIRS="$MCA_ompi_coll_DSO_SUBDIRS mca/coll/$item" done @@ -296082,7 +297105,7 @@ # Create the final .h file that will be included in the type's # top-level glue. This lists all the static components. We don't # need to do this for "common". - if test "crcp" != "common"; then + if test "coll" != "common"; then cat > $outfile <&5 -$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 -$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi - done - - # Ok, we passed the simple sanity check. Save all these names so - # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"want_io_ompio\"" - eval $opal_str - unset opal_str - - env | grep opal_scope - opal_scope_index=`expr $opal_scope_index + 1` - - - if test "$enable_io_ompio" != "no"; then : - want_io_ompio=1 -else - want_io_ompio=0 -fi - + MCA_ompi_FRAMEWORKS="$MCA_ompi_FRAMEWORKS crcp" + MCA_ompi_FRAMEWORKS_SUBDIRS="$MCA_ompi_FRAMEWORKS_SUBDIRS mca/crcp" + MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_ompi_crcp_ALL_SUBDIRS)" + MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_ompi_crcp_DSO_SUBDIRS)" + MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_ompi_crcp_STATIC_SUBDIRS)" + MCA_ompi_FRAMEWORK_LIBS="$MCA_ompi_FRAMEWORK_LIBS mca/crcp/libmca_crcp.la" + MCA_ompi_FRAMEWORK_LIBS="$MCA_ompi_FRAMEWORK_LIBS \$(MCA_ompi_crcp_STATIC_LTLIBS)" - opal_show_subsubtitle "Configuring MCA framework fbtl" + opal_show_subsubtitle "Configuring MCA framework crcp" @@ -296187,11 +297165,11 @@ # exists. Need to do this for VPATH builds, because the directory # may not exist yet. For the "common" type, it's not really a # component, so it doesn't have a base. - outdir=ompi/mca/fbtl/base + outdir=ompi/mca/crcp/base as_dir=$outdir; as_fn_mkdir_p # emit Makefile rule - ac_config_files="$ac_config_files ompi/mca/fbtl/Makefile" + ac_config_files="$ac_config_files ompi/mca/crcp/Makefile" # remove any previously generated #include files @@ -296201,14 +297179,14 @@ touch $outfile.struct $outfile.extern # print some nice messages about what we're about to do... - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework fbtl" >&5 -$as_echo_n "checking for no configure components in framework fbtl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework crcp" >&5 +$as_echo_n "checking for no configure components in framework crcp... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework fbtl" >&5 -$as_echo_n "checking for m4 configure components in framework fbtl... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ime, posix, pvfs2" >&5 -$as_echo "ime, posix, pvfs2" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework crcp" >&5 +$as_echo_n "checking for m4 configure components in framework crcp... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: bkmrk" >&5 +$as_echo "bkmrk" >&6; } # If there are components in the no configure list, but we're # doing one of the "special" selection logics, abort with a @@ -296224,17 +297202,17 @@ best_mca_component_priority=0 - components_looking_for_succeed=$want_io_ompio + components_looking_for_succeed=1 components_last_result=0 - opal_show_subsubsubtitle "MCA component fbtl:ime (m4 configuration macro)" + opal_show_subsubsubtitle "MCA component crcp:bkmrk (m4 configuration macro)" opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed" - component_path="$srcdir/ompi/mca/fbtl/ime" + component_path="$srcdir/ompi/mca/crcp/bkmrk" want_component=0 # build if: @@ -296266,8 +297244,8 @@ fi # if this component type is direct and we are not it, we don't want # to be built. Otherwise, we do want to be built. - if test ! -z "$DIRECT_fbtl" ; then - if test "$DIRECT_fbtl" = "ime" ; then + if test ! -z "$DIRECT_crcp" ; then + if test "$DIRECT_crcp" = "bkmrk" ; then want_component=1 else want_component=0 @@ -296276,10 +297254,10 @@ fi # if we were explicitly disabled, don't build :) - if test "$DISABLE_fbtl" = "1"; then : + if test "$DISABLE_crcp" = "1"; then : want_component=0 fi - if test "$DISABLE_fbtl_ime" = "1"; then : + if test "$DISABLE_crcp_bkmrk" = "1"; then : want_component=0 fi @@ -296292,11 +297270,11 @@ # Allow the component to override the build mode if it really wants to. # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE - SHARED_FRAMEWORK="$DSO_fbtl" - SHARED_COMPONENT="$DSO_fbtl_ime" + SHARED_FRAMEWORK="$DSO_crcp" + SHARED_COMPONENT="$DSO_crcp_bkmrk" - STATIC_FRAMEWORK="$STATIC_fbtl" - STATIC_COMPONENT="$STATIC_fbtl_ime" + STATIC_FRAMEWORK="$STATIC_crcp" + STATIC_COMPONENT="$STATIC_crcp_bkmrk" shared_mode_override=static @@ -296314,9 +297292,9 @@ compile_mode="static" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component fbtl:ime compile mode" >&5 -$as_echo_n "checking for MCA component fbtl:ime compile mode... " >&6; } - if test "$DIRECT_fbtl" = "ime" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component crcp:bkmrk compile mode" >&5 +$as_echo_n "checking for MCA component crcp:bkmrk compile mode... " >&6; } + if test "$DIRECT_crcp" = "bkmrk" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 $as_echo "$compile_mode - direct" >&6; } else @@ -296327,95 +297305,168 @@ # try to configure the component - ac_config_files="$ac_config_files ompi/mca/fbtl/ime/Makefile" + ac_config_files="$ac_config_files ompi/mca/crcp/bkmrk/Makefile" + # If we don't want FT, don't compile this component + if test "$opal_want_ft_cr" = "1"; then : + should_build=$should_build +else + should_build=0 +fi + opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build" - check_ime_CPPFLAGS= - check_ime_LDFLAGS= - check_ime_LIBS= + if test "$should_build" = "1"; then : - check_ime_configuration="none" - ompi_check_ime_happy="yes" - # Get some configuration information + # See if it dropped an output file for us to pick up some + # shell variables in. + infile="$srcdir/ompi/mca/crcp/bkmrk/post_configure.sh" -# Check whether --with-ime was given. -if test "${with_ime+set}" = set; then : - withval=$with_ime; -fi + # Add this subdir to the mast list of all MCA component subdirs + all_components="$all_components bkmrk" + if test "$compile_mode" = "dso" ; then + dso_components="$dso_components bkmrk" + else + if test "crcp" = "common"; then + # Static libraries in "common" frameworks are installed, and + # therefore must obey the $FRAMEWORK_LIB_PREFIX that was + # set. + static_ltlibs="mca/crcp/bkmrk/lib${OMPI_LIB_PREFIX}mca_crcp_bkmrk.la $static_ltlibs" + else + # Other frameworks do not have to obey the + # $FRAMEWORK_LIB_PREFIX prefix. + static_ltlibs="mca/crcp/bkmrk/libmca_crcp_bkmrk.la $static_ltlibs" + fi + echo "extern const mca_base_component_t mca_crcp_bkmrk_component;" >> $outfile.extern + echo " &mca_crcp_bkmrk_component, " >> $outfile.struct + static_components="$static_components bkmrk" + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ime value" >&5 -$as_echo_n "checking --with-ime value... " >&6; } - if test "$with_ime" = "no" ; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple no (specified --without-ime)" >&5 -$as_echo "simple no (specified --without-ime)" >&6; } -else - if test "$with_ime" = "yes" || test "x$with_ime" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple ok (unspecified value)" >&5 -$as_echo "simple ok (unspecified value)" >&6; } -else - if test ! -d "$with_ime"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Directory $with_ime not found" >&5 -$as_echo "$as_me: WARNING: Directory $with_ime not found" >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 -else - if test "x`ls $with_ime/include/ime_native.h 2> /dev/null`" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Expected file $with_ime/include/ime_native.h not found" >&5 -$as_echo "$as_me: WARNING: Expected file $with_ime/include/ime_native.h not found" >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: sanity check ok ($with_ime)" >&5 -$as_echo "sanity check ok ($with_ime)" >&6; } + # Output pretty results + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:bkmrk can compile" >&5 +$as_echo_n "checking if MCA component crcp:bkmrk can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -fi + if test -f $infile; then + # check for direct call header to include. This will be + # AC_SUBSTed later. + if test "$DIRECT_crcp" = "bkmrk" ; then + if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then + line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" + str="MCA_ompi_crcp_DIRECT_CALL_HEADER=$line" + eval $str + else +as_fn_error $? "*** crcp component bkmrk was supposed to be direct-called, but +*** does not appear to support direct calling. +*** Aborting" "$LINENO" 5 + fi + fi + else + # were we supposed to have found something in the + # post_configure.sh, but the file didn't exist? + if test "$DIRECT_crcp" = "bkmrk" ; then +as_fn_error $? "*** crcp component bkmrk was supposed to be direct-called, but +*** does not appear to support direct calling. +*** Aborting" "$LINENO" 5 + fi + fi + # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and + # WRAPPER_EXTRA_LIBS. If the component doesn't specify it's + # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if + # component didn't have it's own configure script (in which case, + # we know it didn't set LDFLAGS and LIBS because it can't) Don't + # have to do this if the component is building dynamically, + # because it will link against these (without a dependency from + # libmpi.so to these flags) + if test "$compile_mode" = "static"; then + if test "$crcp_bkmrk_WRAPPER_EXTRA_LDFLAGS" = ""; then : -fi -fi + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str -fi + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str - if test "$with_ime" = "no"; then : - ompi_check_ime_happy="no" -else - if test -z "$with_ime"; then : - ompi_check_ime_dir="/usr/local" + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $crcp_bkmrk_LDFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_ldflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_ldflags"; then : + mca_wrapper_extra_ldflags=$arg else - ompi_check_ime_dir=$with_ime + mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg" fi +fi + done - if test -e "$ompi_check_ime_dir/lib64" ; then - ompi_check_ime_libdir="$ompi_check_ime_dir/lib64" - else - ompi_check_ime_libdir="$ompi_check_ime_dir/lib" - fi - # Add correct -I and -L flags + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi - opal_check_package_fbtl_ime_save_CPPFLAGS="$CPPFLAGS" - opal_check_package_fbtl_ime_save_LDFLAGS="$LDFLAGS" - opal_check_package_fbtl_ime_save_LIBS="$LIBS" + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str - opal_check_package_fbtl_ime_orig_CPPFLAGS="$fbtl_ime_CPPFLAGS" - opal_check_package_fbtl_ime_orig_LDFLAGS="$fbtl_ime_LDFLAGS" - opal_check_package_fbtl_ime_orig_LIBS="$fbtl_ime_LIBS" + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done - # This is stolen from autoconf to peek under the covers to get the - # cache variable for the library check. one should not copy this - # code into other places unless you want much pain and suffering +else @@ -296428,7 +297479,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in dir_prefix; do + for opal_var in opal_tmp opal_append; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -296447,7 +297498,7 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"dir_prefix\"" + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" eval $opal_str unset opal_str @@ -296455,357 +297506,130 @@ opal_scope_index=`expr $opal_scope_index + 1` - # so this sucks, but there's no way to get through the progression - # of header includes without killing off the cache variable and trying - # again... - unset ac_cv_header_ime_native_h - - # get rid of the trailing slash(es) - dir_prefix=$(echo $ompi_check_ime_dir | sed -e 'sX/*$XXg') - opal_check_package_header_happy="no" - if test "$dir_prefix" = "/usr" || \ - test "$dir_prefix" = "/usr/local"; then : - # try as is... - { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5 -$as_echo "looking for header without includes" >&6; } - for ac_header in ime_native.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ime_native.h" "ac_cv_header_ime_native_h" "$ac_includes_default" -if test "x$ac_cv_header_ime_native_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_IME_NATIVE_H 1 -_ACEOF - opal_check_package_header_happy="yes" -fi - -done - - if test "$opal_check_package_header_happy" = "no"; then : - # no go on the as is - reset the cache and try again - unset ac_cv_header_ime_native_h + for arg in $crcp_bkmrk_WRAPPER_EXTRA_LDFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_ldflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 fi + done fi - - if test "$opal_check_package_header_happy" = "no"; then : - if test "$dir_prefix" != ""; then : - fbtl_ime_CPPFLAGS="$fbtl_ime_CPPFLAGS -I$dir_prefix/include" - CPPFLAGS="$CPPFLAGS -I$dir_prefix/include" + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_ldflags"; then : + mca_wrapper_extra_ldflags=$arg +else + mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg" fi - for ac_header in ime_native.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ime_native.h" "ac_cv_header_ime_native_h" "$ac_includes_default" -if test "x$ac_cv_header_ime_native_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_IME_NATIVE_H 1 -_ACEOF - opal_check_package_header_happy="yes" fi + done -done - if test "$opal_check_package_header_happy" = "yes"; then : + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi - # This is stolen from autoconf to peek under the covers to get the - # cache variable for the library check. one should not copy this - # code into other places unless you want much pain and suffering + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done - # see comment above - unset ac_cv_search_ime_client_native2_init - opal_check_package_lib_happy="no" - if test "$ompi_check_ime_libdir" != ""; then : - # libdir was specified - search only there - fbtl_ime_LDFLAGS="$fbtl_ime_LDFLAGS -L$ompi_check_ime_libdir" - LDFLAGS="$LDFLAGS -L$ompi_check_ime_libdir" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 -$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } -if ${ac_cv_search_ime_client_native2_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ime_client_native2_init (); -int -main () -{ -return ime_client_native2_init (); - ; - return 0; -} -_ACEOF -for ac_lib in '' im_client; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ime_client_native2_init=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_ime_client_native2_init+:} false; then : - break fi -done -if ${ac_cv_search_ime_client_native2_init+:} false; then : + if test "$crcp_bkmrk_WRAPPER_EXTRA_LIBS" = ""; then : -else - ac_cv_search_ime_client_native2_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 -$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } -ac_res=$ac_cv_search_ime_client_native2_init -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - opal_check_package_lib_happy="yes" -else - opal_check_package_lib_happy="no" -fi - if test "$opal_check_package_lib_happy" = "no"; then : - LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" - fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" - unset ac_cv_search_ime_client_native2_init -fi -else - # libdir was not specified - go through search path - opal_check_package_libdir="$ompi_check_ime_dir" - if test "$opal_check_package_libdir" = "" || \ - test "$opal_check_package_libdir" = "/usr" || \ - test "$opal_check_package_libdir" = "/usr/local"; then : - # try as is... - { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 -$as_echo "looking for library without search path" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 -$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } -if ${ac_cv_search_ime_client_native2_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ime_client_native2_init (); -int -main () -{ -return ime_client_native2_init (); - ; - return 0; -} -_ACEOF -for ac_lib in '' im_client; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ime_client_native2_init=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_ime_client_native2_init+:} false; then : - break -fi -done -if ${ac_cv_search_ime_client_native2_init+:} false; then : + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi -else - ac_cv_search_ime_client_native2_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 -$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } -ac_res=$ac_cv_search_ime_client_native2_init -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - opal_check_package_lib_happy="yes" -else - opal_check_package_lib_happy="no" -fi + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str - if test "$opal_check_package_lib_happy" = "no"; then : - # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" - fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" - unset ac_cv_search_ime_client_native2_init -fi -fi + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done - if test "$opal_check_package_lib_happy" = "no"; then : - if test "$opal_check_package_libdir" != ""; then : - fbtl_ime_LDFLAGS="$fbtl_ime_LDFLAGS -L$opal_check_package_libdir/lib" - LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 -$as_echo "looking for library in lib" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 -$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } -if ${ac_cv_search_ime_client_native2_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ime_client_native2_init (); -int -main () -{ -return ime_client_native2_init (); - ; - return 0; -} -_ACEOF -for ac_lib in '' im_client; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ime_client_native2_init=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_ime_client_native2_init+:} false; then : - break -fi -done -if ${ac_cv_search_ime_client_native2_init+:} false; then : + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` -else - ac_cv_search_ime_client_native2_init=no + + for arg in $crcp_bkmrk_LIBS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 -$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } -ac_res=$ac_cv_search_ime_client_native2_init -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - opal_check_package_lib_happy="yes" + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg else - opal_check_package_lib_happy="no" -fi - - if test "$opal_check_package_lib_happy" = "no"; then : - # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" - fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" - unset ac_cv_search_ime_client_native2_init -fi + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" fi fi + done - if test "$opal_check_package_lib_happy" = "no"; then : - if test "$opal_check_package_libdir" != ""; then : - fbtl_ime_LDFLAGS="$fbtl_ime_LDFLAGS -L$opal_check_package_libdir/lib64" - LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 -$as_echo "looking for library in lib64" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 -$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } -if ${ac_cv_search_ime_client_native2_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ime_client_native2_init (); -int -main () -{ -return ime_client_native2_init (); - ; - return 0; -} -_ACEOF -for ac_lib in '' im_client; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ime_client_native2_init=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_ime_client_native2_init+:} false; then : - break -fi -done -if ${ac_cv_search_ime_client_native2_init+:} false; then : + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi -else - ac_cv_search_ime_client_native2_init=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 -$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } -ac_res=$ac_cv_search_ime_client_native2_init -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - opal_check_package_lib_happy="yes" -else - opal_check_package_lib_happy="no" -fi + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str - if test "$opal_check_package_lib_happy" = "no"; then : - # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" - fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" - unset ac_cv_search_ime_client_native2_init -fi -fi -fi -fi + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done - if test "$opal_check_package_lib_happy" = "yes"; then : - # libnl v1 and libnl3 are known to *not* coexist - # harmoniously in the same process. Check to see if this - # new package will introduce such a conflict. + +else @@ -296818,7 +297642,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in opal_libnl_sane; do + for opal_var in opal_tmp opal_append; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -296837,16 +297661,66 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"opal_libnl_sane\"" + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" eval $opal_str unset opal_str env | grep opal_scope opal_scope_index=`expr $opal_scope_index + 1` - opal_libnl_sane=1 - case $host in - *linux*) + + for arg in $crcp_bkmrk_WRAPPER_EXTRA_LIBS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg +else + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +fi + + fi + + # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script + # component can never be used in a STOP_AT_FIRST framework, we + # don't have to implement the else clause in the literal check... + if test "$crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS" != ""; then : + stop_at_first=0 + if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : + if test "$with_devel_headers" = "yes"; then : @@ -296859,7 +297733,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg; do + for opal_var in opal_tmp opal_append; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -296878,7 +297752,7 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg\"" + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" eval $opal_str unset opal_str @@ -296886,276 +297760,566 @@ opal_scope_index=`expr $opal_scope_index + 1` - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + for arg in $crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_cppflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_cppflags"; then : + mca_wrapper_extra_cppflags=$arg +else + mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg" +fi +fi + done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libim_client requires libnl v1 or v3" >&5 -$as_echo_n "checking if libim_client requires libnl v1 or v3... " >&6; } - cat > conftest_c.$ac_ext << EOF -extern void ime_client_native2_init (void); -int main(int argc, char *argv[]) { - ime_client_native2_init (); - return 0; -} -EOF + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi - this_requires_v1=0 - this_requires_v3=0 - result_msg= + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done -# 1 is the command -# 2 is actions to do if success -# 3 is actions to do if fail -echo "configure:296913: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 -$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS 1>&5 2>&1 -opal_status=$? -# 1 is the message -# 2 is whether to put a prefix or not -if test -n "1"; then - echo "configure:296920: \$? = $opal_status" >&5 -else - echo \$? = $opal_status >&5 fi -if test "$opal_status" = "0"; then - unset opal_status - ldd_output=`ldd conftest` - if echo $ldd_output | grep -q libnl-3.so; then : - this_requires_v3=1 - result_msg="v3" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS ($crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 +$as_echo "$as_me: WARNING: ignoring crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS ($crcp_bkmrk_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} fi - if echo $ldd_output | grep -q libnl.so; then : - this_requires_v1=1 - result_msg="v1 $result_msg" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5 -$as_echo "$result_msg" >&6; } else - unset opal_status - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib im_client" >&5 -$as_echo "$as_me: WARNING: Could not link a simple program with lib im_client" >&2;} - -fi - # Assume that our configuration is sane; this may get reset below - libnl_sane=1 - - # Note: in all the checks below, only add this library to the list - # of libraries (for v1 or v3 as relevant) if we do not fail. - # I.e., assume that a higher level will refuse to use this library - # if we return failure. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:bkmrk can compile" >&5 +$as_echo_n "checking if MCA component crcp:bkmrk can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - # Does this library require both v1 and v3? If so, fail. - if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, libim_client links to both libnl and libnl-3." >&5 -$as_echo "$as_me: WARNING: Unfortunately, libim_client links to both libnl and libnl-3." >&2;} + # If this component was requested as the default for this + # type, then abort. + if test "$with_crcp" = "bkmrk" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bkmrk\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"bkmrk\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 -$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libim_client (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in libim_client (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libim_client." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using libim_client." >&2;} + if test ! -z "$DIRECT_crcp" ; then + if test "$DIRECT_crcp" = "bkmrk" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"bkmrk\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"bkmrk\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + fi - libnl_sane=0 + # add component to all component list + all_components="$all_components bkmrk" fi - # Does this library require v1, but some prior library required - # v3? If so, fail. - if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : - if test $opal_libnl_version -eq 3; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas im_client requires libnl" >&5 -$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas im_client requires libnl" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 -$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libim_client (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in libim_client (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libim_client." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using libim_client." >&2;} - libnl_sane=0 + # set the AM_CONDITIONAL on how we should build + if test "$compile_mode" = "dso"; then : + BUILD_ompi_crcp_bkmrk_DSO=1 else - opal_libnlv1_libs="$opal_libnlv1_libs im_client" - -# 1 is the variable name to be uniq-ized -opal_name=opal_libnlv1_libs - -# Go through each item in the variable and only keep the unique ones - -opal_count=0 -for val in ${opal_libnlv1_libs}; do - opal_done=0 - opal_i=1 - opal_found=0 - - # Loop over every token we've seen so far - - opal_done="`expr $opal_i \> $opal_count`" - while test "$opal_found" = "0" && test "$opal_done" = "0"; do - - # Have we seen this token already? Prefix the comparison with - # "x" so that "-Lfoo" values won't be cause an error. + BUILD_ompi_crcp_bkmrk_DSO=0 +fi + if test "$BUILD_ompi_crcp_bkmrk_DSO" = "1"; then + MCA_BUILD_ompi_crcp_bkmrk_DSO_TRUE= + MCA_BUILD_ompi_crcp_bkmrk_DSO_FALSE='#' +else + MCA_BUILD_ompi_crcp_bkmrk_DSO_TRUE='#' + MCA_BUILD_ompi_crcp_bkmrk_DSO_FALSE= +fi - opal_eval="expr x$val = x\$opal_array_$opal_i" - opal_found=`eval $opal_eval` - # Check the ending condition + if test "$should_build" = "1"; then : + components_last_result=1 +else + components_last_result=0 +fi - opal_done="`expr $opal_i \>= $opal_count`" + unset compile_mode - # Increment the counter - opal_i="`expr $opal_i + 1`" - done - # If we didn't find the token, add it to the "array" - if test "$opal_found" = "0"; then - opal_eval="opal_array_$opal_i=$val" - eval $opal_eval - opal_count="`expr $opal_count + 1`" - else - opal_i="`expr $opal_i - 1`" - fi -done -# Take all the items in the "array" and assemble them back into a -# single variable + # configure components that provide their own configure script. + # It would be really hard to run these for "find first that + # works", so we don't :) -opal_i=1 -opal_done="`expr $opal_i \> $opal_count`" -opal_newval= -while test "$opal_done" = "0"; do - opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" - eval $opal_eval - opal_eval="unset opal_array_$opal_i" - eval $opal_eval - opal_done="`expr $opal_i \>= $opal_count`" - opal_i="`expr $opal_i + 1`" -done + if test "1" != "0"; then : -# Done; do the assignment + for component_path in $srcdir/ompi/mca/crcp/* ; do + component="`basename $component_path`" + if test -d $component_path && test -x $component_path/configure ; then + opal_show_subsubsubtitle "MCA component crcp:$component (need to configure)" -opal_newval="`echo $opal_newval`" -opal_eval="$opal_name=\"$opal_newval\"" -eval $opal_eval + opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: before, should_build=" -# Clean up -unset opal_name opal_i opal_done opal_newval opal_eval opal_count - opal_libnl_version=1 -fi -fi + component_path="$srcdir/ompi/mca/crcp/$component" + want_component=0 - # Does this library require v3, but some prior library required - # v1? If so, fail. - if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : - if test $opal_libnl_version -eq 1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libim_client requires libnl-3" >&5 -$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libim_client requires libnl-3" >&2;} + # build if: + # - the component type is direct and we are that component + # - there is no opal_ignore file + # - there is an opal_ignore, but there is an empty opal_unignore + # - there is an opal_ignore, but username is in opal_unignore + if test -d $component_path ; then + # decide if we want the component to be built or not. This + # is spread out because some of the logic is a little complex + # and test's syntax isn't exactly the greatest. We want to + # build the component by default. + want_component=1 + if test -f $component_path/.opal_ignore ; then + # If there is an opal_ignore file, don't build + # the component. Note that this decision can be + # overridden by the unignore logic below. + want_component=0 + fi + if test -f $component_path/.opal_unignore ; then + # if there is an empty opal_unignore, that is + # equivalent to having your userid in the unignore file. + # If userid is in the file, unignore the ignore file. + if test ! -s $component_path/.opal_unignore ; then + want_component=1 + elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then + want_component=1 + fi + fi + # if this component type is direct and we are not it, we don't want + # to be built. Otherwise, we do want to be built. + if test ! -z "$DIRECT_crcp" ; then + if test "$DIRECT_crcp" = "$component" ; then + want_component=1 + else + want_component=0 + fi + fi + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 -$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libim_client (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in libim_client (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libim_client." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using libim_client." >&2;} + # if we were explicitly disabled, don't build :) + if test "$DISABLE_crcp" = "1"; then : + want_component=0 +fi + str="DISABLED_COMPONENT_CHECK=\$DISABLE_crcp_$component" + eval $str + if test "$DISABLED_COMPONENT_CHECK" = "1" ; then + want_component=0 + fi - libnl_sane=0 + if test "$want_component" = "1"; then : + should_build=1 else - opal_libnlv3_libs="$opal_libnlv3_libs im_client" + should_build=0 +fi -# 1 is the variable name to be uniq-ized -opal_name=opal_libnlv3_libs -# Go through each item in the variable and only keep the unique ones + SHARED_FRAMEWORK="$DSO_crcp" + str="SHARED_COMPONENT=\$DSO_crcp_$component" + eval $str -opal_count=0 -for val in ${opal_libnlv3_libs}; do - opal_done=0 - opal_i=1 - opal_found=0 + STATIC_FRAMEWORK="$STATIC_crcp" + str="STATIC_COMPONENT=\$STATIC_crcp_$component" + eval $str - # Loop over every token we've seen so far + shared_mode_override=static - opal_done="`expr $opal_i \> $opal_count`" - while test "$opal_found" = "0" && test "$opal_done" = "0"; do + # Setup for either shared or static + if test "$STATIC_FRAMEWORK" = "1" || \ + test "$STATIC_COMPONENT" = "1" || \ + test "$STATIC_all" = "1" ; then + compile_mode="static" + elif test "$shared_mode_override" = "dso" || \ + test "$SHARED_FRAMEWORK" = "1" || \ + test "$SHARED_COMPONENT" = "1" || \ + test "$DSO_all" = "1"; then + compile_mode="dso" + else + compile_mode="static" + fi - # Have we seen this token already? Prefix the comparison with - # "x" so that "-Lfoo" values won't be cause an error. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component crcp:$component compile mode" >&5 +$as_echo_n "checking for MCA component crcp:$component compile mode... " >&6; } + if test "$DIRECT_crcp" = "$component" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 +$as_echo "$compile_mode - direct" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5 +$as_echo "$compile_mode" >&6; } + fi - opal_eval="expr x$val = x\$opal_array_$opal_i" - opal_found=`eval $opal_eval` + opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build" - # Check the ending condition + if test "$should_build" = "1" ; then - opal_done="`expr $opal_i \>= $opal_count`" - # Increment the counter - opal_i="`expr $opal_i + 1`" + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi done - # If we didn't find the token, add it to the "array" + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"subdir_parent sub_configure subdir_dir subdir_srcdir subdir_cache_file subdir_args subdir_dots total_dir dir_part temp\"" + eval $opal_str + unset opal_str - if test "$opal_found" = "0"; then - opal_eval="opal_array_$opal_i=$val" - eval $opal_eval - opal_count="`expr $opal_count + 1`" + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + +# +# Invoke configure in a specific subdirectory. +# +# ompi/mca/crcp/$component is the directory to invoke in +# $opal_subdir_args is the list of arguments to pass +# should_build=1 is actions to execute upon success +# should_build=0 is actions to execute upon failure +# +subdir_dir="ompi/mca/crcp/$component" +subdir_args="$opal_subdir_args" +subdir_success="should_build=1" +subdir_failure="should_build=0" + +# +# Sanity checks +# + +if test "$subdir_dir" != ":" && test -d $srcdir/$subdir_dir; then + { $as_echo "$as_me:${as_lineno-$LINENO}: OPAL configuring in $subdir_dir" >&5 +$as_echo "$as_me: OPAL configuring in $subdir_dir" >&6;} + + # + # Gotta check where srcdir is for VPATH builds. If srcdir is not + # ., then we need to mkdir the subdir. Otherwise, we can just cd + # into it. + # + + case $srcdir in + .) + ;; + *) + { case $subdir_dir in + [\\/]* | ?:[\\/]* ) total_dir=;; + *) total_dir=.;; + esac + temp=$subdir_dir + for dir_part in `IFS='/\\'; set X $temp; shift; echo "$@"`; do + case $dir_part in + # Skip DOS drivespec + ?:) total_dir=$dir_part ;; + *) total_dir=$total_dir/$dir_part + test -d "$total_dir" || + mkdir "$total_dir" || + as_fn_error $? "cannot create $subdir_dir" "$LINENO" 5 + ;; + esac + done; } + + if test -d ./$subdir_dir; then :; + else + as_fn_error $? "cannot create \`pwd\`/$subdir_dir" "$LINENO" 5 + fi + ;; + esac + + # + # Move into the target directory + # + + subdir_parent=`pwd` + cd $subdir_dir + + # + # Make a "../" for each directory in $subdir_dir. + # + + subdir_dots=`echo $subdir_dir | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + # + # Construct the --srcdir argument + # + + case $srcdir in + .) + # In place + subdir_srcdir="$srcdir" + ;; + [\\/]* | ?:[\\/]* ) + # Absolute path + subdir_srcdir="$srcdir/$subdir_dir" + ;; + *) + # Relative path + subdir_srcdir="$subdir_dots$srcdir/$subdir_dir" + ;; + esac + + # + # Construct the --cache-file argument + # + + # BWB - subdir caching is a pain since we change CFLAGS and all that. + # Just disable it for now + subdir_cache_file="/dev/null" + + # + # Invoke the configure script in the subdirectory + # + + sub_configure="$SHELL '$subdir_srcdir/configure'" + { $as_echo "$as_me:${as_lineno-$LINENO}: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&5 +$as_echo "$as_me: running $sub_configure $subdir_args --cache-file=$subdir_cache_file --srcdir=$subdir_srcdir --disable-option-checking" >&6;} + eval "$sub_configure $subdir_args \ + --cache-file=\"\$subdir_cache_file\" --srcdir=\"$subdir_srcdir\" --disable-option-checking" + if test "$?" = "0"; then + eval $subdir_success + { $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure succeeded for $subdir_dir" >&5 +$as_echo "$as_me: $sub_configure succeeded for $subdir_dir" >&6;} else - opal_i="`expr $opal_i - 1`" + eval $subdir_failure + { $as_echo "$as_me:${as_lineno-$LINENO}: $sub_configure *failed* for $subdir_dir" >&5 +$as_echo "$as_me: $sub_configure *failed* for $subdir_dir" >&6;} fi -done -# Take all the items in the "array" and assemble them back into a -# single variable + # + # Go back to the topdir + # -opal_i=1 -opal_done="`expr $opal_i \> $opal_count`" -opal_newval= -while test "$opal_done" = "0"; do - opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" - eval $opal_eval + cd $subdir_parent +fi - opal_eval="unset opal_array_$opal_i" - eval $opal_eval +# +# Clean up +# - opal_done="`expr $opal_i \>= $opal_count`" - opal_i="`expr $opal_i + 1`" -done -# Done; do the assignment + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi -opal_newval="`echo $opal_newval`" -opal_eval="$opal_name=\"$opal_newval\"" -eval $opal_eval + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str -# Clean up + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done -unset opal_name opal_i opal_done opal_newval opal_eval opal_count - opal_libnl_version=3 -fi + opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: after subdir, should_build=$should_build" + fi -fi + if test "$should_build" = "1" ; then + # do some extra work to pass flags back from the + # top-level configure, the way a configure.m4 + # component would. + infile="$srcdir/ompi/mca/crcp/all_components/post_configure.sh" + if test -f $infile; then - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + # First check for the ABORT tag + line="`$GREP ABORT= $infile | cut -d= -f2-`" + if test -n "$line" && test "$line" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component configure script told me to abort" >&5 +$as_echo "$as_me: WARNING: MCA component configure script told me to abort" >&2;} + as_fn_error $? "cannot continue" "$LINENO" 5 + fi - rm -f conftest conftest_c.$ac_ext + line="`$GREP WRAPPER_EXTRA_LDFLAGS= $infile | cut -d= -f2-`" + eval "line=$line" + if test -n "$line"; then + crcp_all_components_WRAPPER_EXTRA_LDFLAGS="$line" + fi + line="`$GREP WRAPPER_EXTRA_LIBS= $infile | cut -d= -f2-`" + eval "line=$line" + if test -n "$line"; then + crcp_all_components_WRAPPER_EXTRA_LIBS="$line" + fi + fi - opal_libnl_sane=$libnl_sane + + + + # See if it dropped an output file for us to pick up some + # shell variables in. + infile="$srcdir/ompi/mca/crcp/$component/post_configure.sh" + + # Add this subdir to the mast list of all MCA component subdirs + all_components="$all_components $component" + + if test "$compile_mode" = "dso" ; then + dso_components="$dso_components $component" + else + if test "crcp" = "common"; then + # Static libraries in "common" frameworks are installed, and + # therefore must obey the $FRAMEWORK_LIB_PREFIX that was + # set. + static_ltlibs="mca/crcp/$component/lib${OMPI_LIB_PREFIX}mca_crcp_$component.la $static_ltlibs" + else + # Other frameworks do not have to obey the + # $FRAMEWORK_LIB_PREFIX prefix. + static_ltlibs="mca/crcp/$component/libmca_crcp_$component.la $static_ltlibs" + fi + echo "extern const mca_base_component_t mca_crcp_$component_component;" >> $outfile.extern + echo " &mca_crcp_$component_component, " >> $outfile.struct + static_components="$static_components $component" + fi + + # Output pretty results + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:$component can compile" >&5 +$as_echo_n "checking if MCA component crcp:$component can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + if test -f $infile; then + # check for direct call header to include. This will be + # AC_SUBSTed later. + if test "$DIRECT_crcp" = "$component" ; then + if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then + line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" + str="MCA_ompi_crcp_DIRECT_CALL_HEADER=$line" + eval $str + else +as_fn_error $? "*** crcp component $component was supposed to be direct-called, but +*** does not appear to support direct calling. +*** Aborting" "$LINENO" 5 + fi + fi + else + # were we supposed to have found something in the + # post_configure.sh, but the file didn't exist? + if test "$DIRECT_crcp" = "$component" ; then +as_fn_error $? "*** crcp component $component was supposed to be direct-called, but +*** does not appear to support direct calling. +*** Aborting" "$LINENO" 5 + fi + fi + + # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and + # WRAPPER_EXTRA_LIBS. If the component doesn't specify it's + # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if + # component didn't have it's own configure script (in which case, + # we know it didn't set LDFLAGS and LIBS because it can't) Don't + # have to do this if the component is building dynamically, + # because it will link against these (without a dependency from + # libmpi.so to these flags) + if test "$compile_mode" = "static"; then + str="line=\$crcp_$component_WRAPPER_EXTRA_LDFLAGS" + eval "$str" + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $line; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_ldflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_ldflags"; then : + mca_wrapper_extra_ldflags=$arg +else + mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg" +fi +fi + done # Unwind the index @@ -297178,11 +298342,66 @@ unset $opal_var done +str="line=\$crcp_$component_WRAPPER_EXTRA_LIBS" + eval "$str" - ;; - esac - opal_check_package_libnl_check_ok=$opal_libnl_sane + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $line; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg +else + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" +fi +fi + done + # Unwind the index opal_scope_index=`expr $opal_scope_index - 1` @@ -297205,30 +298424,503 @@ done - if test $opal_check_package_libnl_check_ok -eq 0; then : - opal_check_package_lib_happy=no -fi + fi + + # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script + # component can never be used in a STOP_AT_FIRST framework, we + # don't have to implement the else clause in the literal check... + + + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component crcp:$component can compile" >&5 +$as_echo_n "checking if MCA component crcp:$component can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # If this component was requested as the default for this + # type, then abort. + if test "$with_crcp" = "$component" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + if test ! -z "$DIRECT_crcp" ; then + if test "$DIRECT_crcp" = "$component" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"$component\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"$component\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + fi + + fi + fi + done fi - if test "$opal_check_package_lib_happy" = "yes"; then : - # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] - if test "$ac_cv_search_ime_client_native2_init" != "no" && - test "$ac_cv_search_ime_client_native2_init" != "none required"; then : - fbtl_ime_LIBS="$ac_cv_search_ime_client_native2_init " + MCA_ompi_crcp_ALL_COMPONENTS="$all_components" + MCA_ompi_crcp_STATIC_COMPONENTS="$static_components" + MCA_ompi_crcp_DSO_COMPONENTS="$dso_components" + MCA_ompi_crcp_STATIC_LTLIBS="$static_ltlibs" + + + + + + + + MCA_ompi_crcp_ALL_SUBDIRS= + for item in $all_components ; do + MCA_ompi_crcp_ALL_SUBDIRS="$MCA_ompi_crcp_ALL_SUBDIRS mca/crcp/$item" + done + + + + MCA_ompi_crcp_STATIC_SUBDIRS= + for item in $static_components ; do + MCA_ompi_crcp_STATIC_SUBDIRS="$MCA_ompi_crcp_STATIC_SUBDIRS mca/crcp/$item" + done + + + + MCA_ompi_crcp_DSO_SUBDIRS= + for item in $dso_components ; do + MCA_ompi_crcp_DSO_SUBDIRS="$MCA_ompi_crcp_DSO_SUBDIRS mca/crcp/$item" + done + + + + # Create the final .h file that will be included in the type's + # top-level glue. This lists all the static components. We don't + # need to do this for "common". + if test "crcp" != "common"; then + cat > $outfile < /dev/null 2>&1 + if test "$?" != "0"; then + mv $outfile $outfile_real + else + rm -f $outfile + fi + fi + rm -f $outfile.struct $outfile.extern + + unset all_components static_components dso_components outfile outfile_real + + MCA_ompi_FRAMEWORKS="$MCA_ompi_FRAMEWORKS fbtl" + MCA_ompi_FRAMEWORKS_SUBDIRS="$MCA_ompi_FRAMEWORKS_SUBDIRS mca/fbtl" + MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS \$(MCA_ompi_fbtl_ALL_SUBDIRS)" + MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS \$(MCA_ompi_fbtl_DSO_SUBDIRS)" + MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS="$MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS \$(MCA_ompi_fbtl_STATIC_SUBDIRS)" + MCA_ompi_FRAMEWORK_LIBS="$MCA_ompi_FRAMEWORK_LIBS mca/fbtl/libmca_fbtl.la" + MCA_ompi_FRAMEWORK_LIBS="$MCA_ompi_FRAMEWORK_LIBS \$(MCA_ompi_fbtl_STATIC_LTLIBS)" + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in want_io_ompio; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"want_io_ompio\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + if test "$enable_io_ompio" != "no"; then : + want_io_ompio=1 else - fbtl_ime_LIBS="" + want_io_ompio=0 fi - opal_check_package_happy="yes" + + + opal_show_subsubtitle "Configuring MCA framework fbtl" + + + + + # setup for framework + all_components= + static_components= + dso_components= + static_ltlibs= + + # Ensure that the directory where the #include file is to live + # exists. Need to do this for VPATH builds, because the directory + # may not exist yet. For the "common" type, it's not really a + # component, so it doesn't have a base. + outdir=ompi/mca/fbtl/base + as_dir=$outdir; as_fn_mkdir_p + + # emit Makefile rule + ac_config_files="$ac_config_files ompi/mca/fbtl/Makefile" + + + # remove any previously generated #include files + outfile_real=$outdir/static-components.h + outfile=$outfile_real.new + rm -f $outfile $outfile.struct $outfile.extern + touch $outfile.struct $outfile.extern + + # print some nice messages about what we're about to do... + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for no configure components in framework fbtl" >&5 +$as_echo_n "checking for no configure components in framework fbtl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework fbtl" >&5 +$as_echo_n "checking for m4 configure components in framework fbtl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ime, posix, pvfs2" >&5 +$as_echo "ime, posix, pvfs2" >&6; } + + # If there are components in the no configure list, but we're + # doing one of the "special" selection logics, abort with a + # reasonable message. + + + + # run the configure logic for the no-config components + + + # configure components that use built-in configuration scripts + + + + best_mca_component_priority=0 + components_looking_for_succeed=$want_io_ompio + components_last_result=0 + + + opal_show_subsubsubtitle "MCA component fbtl:ime (m4 configuration macro)" + + opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed" + + + + component_path="$srcdir/ompi/mca/fbtl/ime" + want_component=0 + + # build if: + # - the component type is direct and we are that component + # - there is no opal_ignore file + # - there is an opal_ignore, but there is an empty opal_unignore + # - there is an opal_ignore, but username is in opal_unignore + if test -d $component_path ; then + # decide if we want the component to be built or not. This + # is spread out because some of the logic is a little complex + # and test's syntax isn't exactly the greatest. We want to + # build the component by default. + want_component=1 + if test -f $component_path/.opal_ignore ; then + # If there is an opal_ignore file, don't build + # the component. Note that this decision can be + # overridden by the unignore logic below. + want_component=0 + fi + if test -f $component_path/.opal_unignore ; then + # if there is an empty opal_unignore, that is + # equivalent to having your userid in the unignore file. + # If userid is in the file, unignore the ignore file. + if test ! -s $component_path/.opal_unignore ; then + want_component=1 + elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then + want_component=1 + fi + fi + # if this component type is direct and we are not it, we don't want + # to be built. Otherwise, we do want to be built. + if test ! -z "$DIRECT_fbtl" ; then + if test "$DIRECT_fbtl" = "ime" ; then + want_component=1 + else + want_component=0 + fi + fi + fi + + # if we were explicitly disabled, don't build :) + if test "$DISABLE_fbtl" = "1"; then : + want_component=0 +fi + if test "$DISABLE_fbtl_ime" = "1"; then : + want_component=0 +fi + + if test "$want_component" = "1"; then : + should_build=$components_looking_for_succeed else - opal_check_package_happy="no" + should_build=0 +fi + + # Allow the component to override the build mode if it really wants to. + # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE + + SHARED_FRAMEWORK="$DSO_fbtl" + SHARED_COMPONENT="$DSO_fbtl_ime" + + STATIC_FRAMEWORK="$STATIC_fbtl" + STATIC_COMPONENT="$STATIC_fbtl_ime" + + shared_mode_override=static + + # Setup for either shared or static + if test "$STATIC_FRAMEWORK" = "1" || \ + test "$STATIC_COMPONENT" = "1" || \ + test "$STATIC_all" = "1" ; then + compile_mode="static" + elif test "$shared_mode_override" = "dso" || \ + test "$SHARED_FRAMEWORK" = "1" || \ + test "$SHARED_COMPONENT" = "1" || \ + test "$DSO_all" = "1"; then + compile_mode="dso" + else + compile_mode="static" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component fbtl:ime compile mode" >&5 +$as_echo_n "checking for MCA component fbtl:ime compile mode... " >&6; } + if test "$DIRECT_fbtl" = "ime" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 +$as_echo "$compile_mode - direct" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5 +$as_echo "$compile_mode" >&6; } + fi + + + # try to configure the component + + ac_config_files="$ac_config_files ompi/mca/fbtl/ime/Makefile" + + + + + check_ime_CPPFLAGS= + check_ime_LDFLAGS= + check_ime_LIBS= + + check_ime_configuration="none" + ompi_check_ime_happy="yes" + + + # Get some configuration information + +# Check whether --with-ime was given. +if test "${with_ime+set}" = set; then : + withval=$with_ime; fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ime value" >&5 +$as_echo_n "checking --with-ime value... " >&6; } + if test "$with_ime" = "no" ; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple no (specified --without-ime)" >&5 +$as_echo "simple no (specified --without-ime)" >&6; } else - opal_check_package_happy="no" + if test "$with_ime" = "yes" || test "x$with_ime" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: simple ok (unspecified value)" >&5 +$as_echo "simple ok (unspecified value)" >&6; } +else + if test ! -d "$with_ime"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Directory $with_ime not found" >&5 +$as_echo "$as_me: WARNING: Directory $with_ime not found" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 +else + if test "x`ls $with_ime/include/ime_native.h 2> /dev/null`" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Expected file $with_ime/include/ime_native.h not found" >&5 +$as_echo "$as_me: WARNING: Expected file $with_ime/include/ime_native.h not found" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: sanity check ok ($with_ime)" >&5 +$as_echo "sanity check ok ($with_ime)" >&6; } + +fi + + +fi + + +fi + + fi + + + if test "$with_ime" = "no"; then : + ompi_check_ime_happy="no" else + if test -z "$with_ime"; then : + ompi_check_ime_dir="/usr/local" +else + ompi_check_ime_dir=$with_ime +fi + + if test -e "$ompi_check_ime_dir/lib64" ; then + ompi_check_ime_libdir="$ompi_check_ime_dir/lib64" + else + ompi_check_ime_libdir="$ompi_check_ime_dir/lib" + fi + + # Add correct -I and -L flags + + opal_check_package_fbtl_ime_save_CPPFLAGS="$CPPFLAGS" + opal_check_package_fbtl_ime_save_LDFLAGS="$LDFLAGS" + opal_check_package_fbtl_ime_save_LIBS="$LIBS" + + opal_check_package_fbtl_ime_orig_CPPFLAGS="$fbtl_ime_CPPFLAGS" + opal_check_package_fbtl_ime_orig_LDFLAGS="$fbtl_ime_LDFLAGS" + opal_check_package_fbtl_ime_orig_LIBS="$fbtl_ime_LIBS" + + + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in dir_prefix; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"dir_prefix\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + # so this sucks, but there's no way to get through the progression + # of header includes without killing off the cache variable and trying + # again... + unset ac_cv_header_ime_native_h + + # get rid of the trailing slash(es) + dir_prefix=$(echo $ompi_check_ime_dir | sed -e 'sX/*$XXg') + opal_check_package_header_happy="no" + if test "$dir_prefix" = "/usr" || \ + test "$dir_prefix" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5 +$as_echo "looking for header without includes" >&6; } + for ac_header in ime_native.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ime_native.h" "ac_cv_header_ime_native_h" "$ac_includes_default" +if test "x$ac_cv_header_ime_native_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IME_NATIVE_H 1 +_ACEOF + opal_check_package_header_happy="yes" +fi + +done + + if test "$opal_check_package_header_happy" = "no"; then : + # no go on the as is - reset the cache and try again + unset ac_cv_header_ime_native_h +fi +fi + + if test "$opal_check_package_header_happy" = "no"; then : + if test "$dir_prefix" != ""; then : + fbtl_ime_CPPFLAGS="$fbtl_ime_CPPFLAGS -I$dir_prefix/include" + CPPFLAGS="$CPPFLAGS -I$dir_prefix/include" +fi + for ac_header in ime_native.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ime_native.h" "ac_cv_header_ime_native_h" "$ac_includes_default" +if test "x$ac_cv_header_ime_native_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_IME_NATIVE_H 1 +_ACEOF + opal_check_package_header_happy="yes" +fi + +done + + if test "$opal_check_package_header_happy" = "yes"; then : # This is stolen from autoconf to peek under the covers to get the # cache variable for the library check. one should not copy this @@ -297635,14 +299327,739 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:297638: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 +echo "configure:299330: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:297645: \$? = $opal_status" >&5 + echo "configure:299337: \$? = $opal_status" >&5 +else + echo \$? = $opal_status >&5 +fi +if test "$opal_status" = "0"; then + unset opal_status + ldd_output=`ldd conftest` + if echo $ldd_output | grep -q libnl-3.so; then : + this_requires_v3=1 + result_msg="v3" +fi + if echo $ldd_output | grep -q libnl.so; then : + this_requires_v1=1 + result_msg="v1 $result_msg" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5 +$as_echo "$result_msg" >&6; } + +else + unset opal_status + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib im_client" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib im_client" >&2;} + +fi + + # Assume that our configuration is sane; this may get reset below + libnl_sane=1 + + # Note: in all the checks below, only add this library to the list + # of libraries (for v1 or v3 as relevant) if we do not fail. + # I.e., assume that a higher level will refuse to use this library + # if we return failure. + + # Does this library require both v1 and v3? If so, fail. + if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, libim_client links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, libim_client links to both libnl and libnl-3." >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libim_client (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libim_client (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libim_client." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libim_client." >&2;} + + libnl_sane=0 +fi + + # Does this library require v1, but some prior library required + # v3? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : + if test $opal_libnl_version -eq 3; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas im_client requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas im_client requires libnl" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libim_client (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libim_client (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libim_client." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libim_client." >&2;} + + libnl_sane=0 +else + opal_libnlv1_libs="$opal_libnlv1_libs im_client" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv1_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv1_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done + +# Take all the items in the "array" and assemble them back into a +# single variable + +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=1 +fi + +fi + + # Does this library require v3, but some prior library required + # v1? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : + if test $opal_libnl_version -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libim_client requires libnl-3" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libim_client requires libnl-3" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libim_client (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libim_client (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libim_client." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libim_client." >&2;} + + libnl_sane=0 +else + opal_libnlv3_libs="$opal_libnlv3_libs im_client" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv3_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv3_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done + +# Take all the items in the "array" and assemble them back into a +# single variable + +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=3 +fi + +fi + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + rm -f conftest conftest_c.$ac_ext + + opal_libnl_sane=$libnl_sane + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + ;; + esac + + opal_check_package_libnl_check_ok=$opal_libnl_sane + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + if test $opal_check_package_libnl_check_ok -eq 0; then : + opal_check_package_lib_happy=no +fi + +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] + if test "$ac_cv_search_ime_client_native2_init" != "no" && + test "$ac_cv_search_ime_client_native2_init" != "none required"; then : + fbtl_ime_LIBS="$ac_cv_search_ime_client_native2_init " +else + fbtl_ime_LIBS="" +fi + opal_check_package_happy="yes" +else + opal_check_package_happy="no" +fi + + +else + opal_check_package_happy="no" +fi +else + + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering + + + # see comment above + unset ac_cv_search_ime_client_native2_init + opal_check_package_lib_happy="no" + if test "$ompi_check_ime_libdir" != ""; then : + # libdir was specified - search only there + fbtl_ime_LDFLAGS="$fbtl_ime_LDFLAGS -L$ompi_check_ime_libdir" + LDFLAGS="$LDFLAGS -L$ompi_check_ime_libdir" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 +$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } +if ${ac_cv_search_ime_client_native2_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ime_client_native2_init (); +int +main () +{ +return ime_client_native2_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' im_client; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ime_client_native2_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ime_client_native2_init+:} false; then : + break +fi +done +if ${ac_cv_search_ime_client_native2_init+:} false; then : + +else + ac_cv_search_ime_client_native2_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 +$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } +ac_res=$ac_cv_search_ime_client_native2_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" + fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" + unset ac_cv_search_ime_client_native2_init +fi +else + # libdir was not specified - go through search path + opal_check_package_libdir="$ompi_check_ime_dir" + if test "$opal_check_package_libdir" = "" || \ + test "$opal_check_package_libdir" = "/usr" || \ + test "$opal_check_package_libdir" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 +$as_echo "looking for library without search path" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 +$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } +if ${ac_cv_search_ime_client_native2_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ime_client_native2_init (); +int +main () +{ +return ime_client_native2_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' im_client; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ime_client_native2_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ime_client_native2_init+:} false; then : + break +fi +done +if ${ac_cv_search_ime_client_native2_init+:} false; then : + +else + ac_cv_search_ime_client_native2_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 +$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } +ac_res=$ac_cv_search_ime_client_native2_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" + fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" + unset ac_cv_search_ime_client_native2_init +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + fbtl_ime_LDFLAGS="$fbtl_ime_LDFLAGS -L$opal_check_package_libdir/lib" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 +$as_echo "looking for library in lib" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 +$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } +if ${ac_cv_search_ime_client_native2_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ime_client_native2_init (); +int +main () +{ +return ime_client_native2_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' im_client; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ime_client_native2_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ime_client_native2_init+:} false; then : + break +fi +done +if ${ac_cv_search_ime_client_native2_init+:} false; then : + +else + ac_cv_search_ime_client_native2_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 +$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } +ac_res=$ac_cv_search_ime_client_native2_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" + fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" + unset ac_cv_search_ime_client_native2_init +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + fbtl_ime_LDFLAGS="$fbtl_ime_LDFLAGS -L$opal_check_package_libdir/lib64" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 +$as_echo "looking for library in lib64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ime_client_native2_init" >&5 +$as_echo_n "checking for library containing ime_client_native2_init... " >&6; } +if ${ac_cv_search_ime_client_native2_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char ime_client_native2_init (); +int +main () +{ +return ime_client_native2_init (); + ; + return 0; +} +_ACEOF +for ac_lib in '' im_client; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ime_client_native2_init=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_ime_client_native2_init+:} false; then : + break +fi +done +if ${ac_cv_search_ime_client_native2_init+:} false; then : + +else + ac_cv_search_ime_client_native2_init=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ime_client_native2_init" >&5 +$as_echo "$ac_cv_search_ime_client_native2_init" >&6; } +ac_res=$ac_cv_search_ime_client_native2_init +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_fbtl_ime_save_LDFLAGS" + fbtl_ime_LDFLAGS="$opal_check_package_fbtl_ime_orig_LDFLAGS" + unset ac_cv_search_ime_client_native2_init +fi +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # libnl v1 and libnl3 are known to *not* coexist + # harmoniously in the same process. Check to see if this + # new package will introduce such a conflict. + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_libnl_sane; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_libnl_sane\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + opal_libnl_sane=1 + case $host in + *linux*) + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libim_client requires libnl v1 or v3" >&5 +$as_echo_n "checking if libim_client requires libnl v1 or v3... " >&6; } + cat > conftest_c.$ac_ext << EOF +extern void ime_client_native2_init (void); +int main(int argc, char *argv[]) { + ime_client_native2_init (); + return 0; +} +EOF + + this_requires_v1=0 + this_requires_v3=0 + result_msg= + +# 1 is the command +# 2 is actions to do if success +# 3 is actions to do if fail +echo "configure:300055: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS 1>&5 2>&1 +opal_status=$? + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:300062: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -298489,14 +300906,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:298492: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 +echo "configure:300909: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:298499: \$? = $opal_status" >&5 + echo "configure:300916: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -299214,14 +301631,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:299217: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 +echo "configure:301634: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fbtl_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:299224: \$? = $opal_status" >&5 + echo "configure:301641: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -301740,14 +304157,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:301743: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fbtl_pvfs2_LIBS" >&5 +echo "configure:304160: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fbtl_pvfs2_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fbtl_pvfs2_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:301750: \$? = $opal_status" >&5 + echo "configure:304167: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -302465,14 +304882,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:302468: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fbtl_pvfs2_LIBS" >&5 +echo "configure:304885: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fbtl_pvfs2_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fbtl_pvfs2_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:302475: \$? = $opal_status" >&5 + echo "configure:304892: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -308874,14 +311291,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:308877: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lgpfs $LIBS $fs_gpfs_LIBS" >&5 +echo "configure:311294: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lgpfs $LIBS $fs_gpfs_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lgpfs $LIBS $fs_gpfs_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:308884: \$? = $opal_status" >&5 + echo "configure:311301: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -309599,14 +312016,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:309602: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lgpfs $LIBS $fs_gpfs_LIBS" >&5 +echo "configure:312019: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lgpfs $LIBS $fs_gpfs_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lgpfs $LIBS $fs_gpfs_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:309609: \$? = $opal_status" >&5 + echo "configure:312026: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -311291,14 +313708,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:311294: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 +echo "configure:313711: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:311301: \$? = $opal_status" >&5 + echo "configure:313718: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -312016,14 +314433,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:312019: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 +echo "configure:314436: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:312026: \$? = $opal_status" >&5 + echo "configure:314443: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -312870,14 +315287,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:312873: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 +echo "configure:315290: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:312880: \$? = $opal_status" >&5 + echo "configure:315297: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -313595,14 +316012,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:313598: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 +echo "configure:316015: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lim_client $LIBS $fs_ime_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:313605: \$? = $opal_status" >&5 + echo "configure:316022: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -315301,14 +317718,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:315304: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llustreapi $LIBS $fs_lustre_LIBS" >&5 +echo "configure:317721: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llustreapi $LIBS $fs_lustre_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llustreapi $LIBS $fs_lustre_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:315311: \$? = $opal_status" >&5 + echo "configure:317728: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -316026,14 +318443,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:316029: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llustreapi $LIBS $fs_lustre_LIBS" >&5 +echo "configure:318446: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llustreapi $LIBS $fs_lustre_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -llustreapi $LIBS $fs_lustre_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:316036: \$? = $opal_status" >&5 + echo "configure:318453: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -316402,14 +318819,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:316405: $CC $CFLAGS -I$ompi_check_lustre_dir/include -c conftest.c" >&5 +echo "configure:318822: $CC $CFLAGS -I$ompi_check_lustre_dir/include -c conftest.c" >&5 $CC $CFLAGS -I$ompi_check_lustre_dir/include -c conftest.c 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:316412: \$? = $opal_status" >&5 + echo "configure:318829: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -317760,14 +320177,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:317763: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fs_pvfs2_LIBS" >&5 +echo "configure:320180: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fs_pvfs2_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fs_pvfs2_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:317770: \$? = $opal_status" >&5 + echo "configure:320187: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -318485,14 +320902,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:318488: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fs_pvfs2_LIBS" >&5 +echo "configure:320905: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fs_pvfs2_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpvfs2 $LIBS $fs_pvfs2_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:318495: \$? = $opal_status" >&5 + echo "configure:320912: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -324944,14 +327361,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:324947: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:327364: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:324954: \$? = $opal_status" >&5 + echo "configure:327371: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -325669,14 +328086,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:325672: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 +echo "configure:328089: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lfabric $LIBS $opal_ofi_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:325679: \$? = $opal_status" >&5 + echo "configure:328096: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -327606,14 +330023,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:327609: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:330026: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:327616: \$? = $opal_status" >&5 + echo "configure:330033: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -328331,14 +330748,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:328334: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:330751: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:328341: \$? = $opal_status" >&5 + echo "configure:330758: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -330169,14 +332586,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:330172: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm_infinipath $LIBS $ompi_check_psm_LIBS" >&5 +echo "configure:332589: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm_infinipath $LIBS $ompi_check_psm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm_infinipath $LIBS $ompi_check_psm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:330179: \$? = $opal_status" >&5 + echo "configure:332596: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -330894,14 +333311,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:330897: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm_infinipath $LIBS $ompi_check_psm_LIBS" >&5 +echo "configure:333314: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm_infinipath $LIBS $ompi_check_psm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm_infinipath $LIBS $ompi_check_psm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:330904: \$? = $opal_status" >&5 + echo "configure:333321: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -332676,14 +335093,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:332679: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm2 $LIBS $ompi_check_psm2_LIBS" >&5 +echo "configure:335096: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm2 $LIBS $ompi_check_psm2_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm2 $LIBS $ompi_check_psm2_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:332686: \$? = $opal_status" >&5 + echo "configure:335103: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -333401,14 +335818,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:333404: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm2 $LIBS $ompi_check_psm2_LIBS" >&5 +echo "configure:335821: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm2 $LIBS $ompi_check_psm2_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lpsm2 $LIBS $ompi_check_psm2_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:333411: \$? = $opal_status" >&5 + echo "configure:335828: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -339340,14 +341757,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:339343: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:341760: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:339350: \$? = $opal_status" >&5 + echo "configure:341767: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -340065,14 +342482,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:340068: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 +echo "configure:342485: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lportals $LIBS $opal_check_portals4_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:340075: \$? = $opal_status" >&5 + echo "configure:342492: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -343330,14 +345747,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:343333: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:345750: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:343340: \$? = $opal_status" >&5 + echo "configure:345757: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -344055,14 +346472,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:344058: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:346475: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:344065: \$? = $opal_status" >&5 + echo "configure:346482: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -344961,14 +347378,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:344964: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:347381: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:344971: \$? = $opal_status" >&5 + echo "configure:347388: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -345686,14 +348103,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:345689: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:348106: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:345696: \$? = $opal_status" >&5 + echo "configure:348113: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -351346,14 +353763,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:351349: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:353766: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:351356: \$? = $opal_status" >&5 + echo "configure:353773: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -352071,14 +354488,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:352074: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:354491: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:352081: \$? = $opal_status" >&5 + echo "configure:354498: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -352977,14 +355394,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:352980: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:355397: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:352987: \$? = $opal_status" >&5 + echo "configure:355404: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -353702,14 +356119,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:353705: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:356122: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:353712: \$? = $opal_status" >&5 + echo "configure:356129: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -356460,14 +358877,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:356463: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 +echo "configure:358880: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:356470: \$? = $opal_status" >&5 + echo "configure:358887: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -357185,14 +359602,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:357188: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 +echo "configure:359605: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:357195: \$? = $opal_status" >&5 + echo "configure:359612: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -364667,14 +367084,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:364670: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltreematch $LIBS $topo_treematch_LIBS" >&5 +echo "configure:367087: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltreematch $LIBS $topo_treematch_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltreematch $LIBS $topo_treematch_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:364677: \$? = $opal_status" >&5 + echo "configure:367094: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -365392,14 +367809,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:365395: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltreematch $LIBS $topo_treematch_LIBS" >&5 +echo "configure:367812: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltreematch $LIBS $topo_treematch_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -ltreematch $LIBS $topo_treematch_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:365402: \$? = $opal_status" >&5 + echo "configure:367819: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -369810,14 +372227,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:369813: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 +echo "configure:372230: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:369820: \$? = $opal_status" >&5 + echo "configure:372237: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -370535,14 +372952,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:370538: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 +echo "configure:372955: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:370545: \$? = $opal_status" >&5 + echo "configure:372962: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -372471,14 +374888,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:372474: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:374891: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:372481: \$? = $opal_status" >&5 + echo "configure:374898: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -373196,14 +375613,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:373199: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:375616: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:373206: \$? = $opal_status" >&5 + echo "configure:375623: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -374102,14 +376519,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:374105: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:376522: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:374112: \$? = $opal_status" >&5 + echo "configure:376529: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -374827,14 +377244,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:374830: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:377247: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:374837: \$? = $opal_status" >&5 + echo "configure:377254: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -379011,8 +381428,8 @@ $as_echo "basic, mpi" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m4 configure components in framework scoll" >&5 $as_echo_n "checking for m4 configure components in framework scoll... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: fca" >&5 -$as_echo "fca" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: fca, ucc" >&5 +$as_echo "fca, ucc" >&6; } # If there are components in the no configure list, but we're # doing one of the "special" selection logics, abort with a @@ -379362,7 +381779,2323 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in opal_tmp opal_append; do + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_basic_LIBS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg +else + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +else + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_basic_WRAPPER_EXTRA_LIBS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg +else + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +fi + + fi + + # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script + # component can never be used in a STOP_AT_FIRST framework, we + # don't have to implement the else clause in the literal check... + if test "$scoll_basic_WRAPPER_EXTRA_CPPFLAGS" != ""; then : + stop_at_first=0 + if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : + if test "$with_devel_headers" = "yes"; then : + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_basic_WRAPPER_EXTRA_CPPFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_cppflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_cppflags"; then : + mca_wrapper_extra_cppflags=$arg +else + mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_basic_WRAPPER_EXTRA_CPPFLAGS ($scoll_basic_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 +$as_echo "$as_me: WARNING: ignoring scoll_basic_WRAPPER_EXTRA_CPPFLAGS ($scoll_basic_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} +fi +fi + + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:basic can compile" >&5 +$as_echo_n "checking if MCA component scoll:basic can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # If this component was requested as the default for this + # type, then abort. + if test "$with_scoll" = "basic" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"basic\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"basic\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + if test ! -z "$DIRECT_scoll" ; then + if test "$DIRECT_scoll" = "basic" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"basic\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"basic\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + fi + + # add component to all component list + all_components="$all_components basic" + fi + + # set the AM_CONDITIONAL on how we should build + if test "$compile_mode" = "dso" ; then + BUILD_oshmem_scoll_basic_DSO=1 + else + BUILD_oshmem_scoll_basic_DSO=0 + fi + if test "$BUILD_oshmem_scoll_basic_DSO" = "1"; then + MCA_BUILD_oshmem_scoll_basic_DSO_TRUE= + MCA_BUILD_oshmem_scoll_basic_DSO_FALSE='#' +else + MCA_BUILD_oshmem_scoll_basic_DSO_TRUE='#' + MCA_BUILD_oshmem_scoll_basic_DSO_FALSE= +fi + + + ac_config_files="$ac_config_files oshmem/mca/scoll/basic/Makefile" + + + unset compile_mode + + opal_show_subsubsubtitle "MCA component scoll:mpi (no configuration)" + + opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: before, should_build=1" + + + + component_path="$srcdir/oshmem/mca/scoll/mpi" + want_component=0 + + # build if: + # - the component type is direct and we are that component + # - there is no opal_ignore file + # - there is an opal_ignore, but there is an empty opal_unignore + # - there is an opal_ignore, but username is in opal_unignore + if test -d $component_path ; then + # decide if we want the component to be built or not. This + # is spread out because some of the logic is a little complex + # and test's syntax isn't exactly the greatest. We want to + # build the component by default. + want_component=1 + if test -f $component_path/.opal_ignore ; then + # If there is an opal_ignore file, don't build + # the component. Note that this decision can be + # overridden by the unignore logic below. + want_component=0 + fi + if test -f $component_path/.opal_unignore ; then + # if there is an empty opal_unignore, that is + # equivalent to having your userid in the unignore file. + # If userid is in the file, unignore the ignore file. + if test ! -s $component_path/.opal_unignore ; then + want_component=1 + elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then + want_component=1 + fi + fi + # if this component type is direct and we are not it, we don't want + # to be built. Otherwise, we do want to be built. + if test ! -z "$DIRECT_scoll" ; then + if test "$DIRECT_scoll" = "mpi" ; then + want_component=1 + else + want_component=0 + fi + fi + fi + + # if we were explicitly disabled, don't build :) + if test "$DISABLE_scoll" = "1"; then : + want_component=0 +fi + if test "$DISABLE_scoll_mpi" = "1"; then : + want_component=0 +fi + + if test "$want_component" = "1"; then : + should_build=1 +else + should_build=0 +fi + + + SHARED_FRAMEWORK="$DSO_scoll" + SHARED_COMPONENT="$DSO_scoll_mpi" + + STATIC_FRAMEWORK="$STATIC_scoll" + STATIC_COMPONENT="$STATIC_scoll_mpi" + + shared_mode_override=static + + # Setup for either shared or static + if test "$STATIC_FRAMEWORK" = "1" || \ + test "$STATIC_COMPONENT" = "1" || \ + test "$STATIC_all" = "1" ; then + compile_mode="static" + elif test "$shared_mode_override" = "dso" || \ + test "$SHARED_FRAMEWORK" = "1" || \ + test "$SHARED_COMPONENT" = "1" || \ + test "$DSO_all" = "1"; then + compile_mode="dso" + else + compile_mode="static" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component scoll:mpi compile mode" >&5 +$as_echo_n "checking for MCA component scoll:mpi compile mode... " >&6; } + if test "$DIRECT_scoll" = "mpi" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 +$as_echo "$compile_mode - direct" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5 +$as_echo "$compile_mode" >&6; } + fi + + opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build" + + if test "$should_build" = "1" ; then + + + + # See if it dropped an output file for us to pick up some + # shell variables in. + infile="$srcdir/oshmem/mca/scoll/mpi/post_configure.sh" + + # Add this subdir to the mast list of all MCA component subdirs + all_components="$all_components mpi" + + if test "$compile_mode" = "dso" ; then + dso_components="$dso_components mpi" + else + if test "scoll" = "common"; then + # Static libraries in "common" frameworks are installed, and + # therefore must obey the $FRAMEWORK_LIB_PREFIX that was + # set. + static_ltlibs="mca/scoll/mpi/lib${OSHMEM_LIB_PREFIX}mca_scoll_mpi.la $static_ltlibs" + else + # Other frameworks do not have to obey the + # $FRAMEWORK_LIB_PREFIX prefix. + static_ltlibs="mca/scoll/mpi/libmca_scoll_mpi.la $static_ltlibs" + fi + echo "extern const mca_base_component_t mca_scoll_mpi_component;" >> $outfile.extern + echo " &mca_scoll_mpi_component, " >> $outfile.struct + static_components="$static_components mpi" + fi + + # Output pretty results + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:mpi can compile" >&5 +$as_echo_n "checking if MCA component scoll:mpi can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + if test -f $infile; then + # check for direct call header to include. This will be + # AC_SUBSTed later. + if test "$DIRECT_scoll" = "mpi" ; then + if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then + line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" + str="MCA_oshmem_scoll_DIRECT_CALL_HEADER=$line" + eval $str + else +as_fn_error $? "*** scoll component mpi was supposed to be direct-called, but +*** does not appear to support direct calling. +*** Aborting" "$LINENO" 5 + fi + fi + else + # were we supposed to have found something in the + # post_configure.sh, but the file didn't exist? + if test "$DIRECT_scoll" = "mpi" ; then +as_fn_error $? "*** scoll component mpi was supposed to be direct-called, but +*** does not appear to support direct calling. +*** Aborting" "$LINENO" 5 + fi + fi + + # if the component is building, add it's WRAPPER_EXTRA_LDFLAGS and + # WRAPPER_EXTRA_LIBS. If the component doesn't specify it's + # WRAPPER_EXTRA_LIBS and WRAPPER_EXTRA_LDFLAGS, try using LDFLAGS and LIBS if + # component didn't have it's own configure script (in which case, + # we know it didn't set LDFLAGS and LIBS because it can't) Don't + # have to do this if the component is building dynamically, + # because it will link against these (without a dependency from + # libmpi.so to these flags) + if test "$compile_mode" = "static"; then + if test "$scoll_mpi_WRAPPER_EXTRA_LDFLAGS" = ""; then : + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_mpi_LDFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_ldflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_ldflags"; then : + mca_wrapper_extra_ldflags=$arg +else + mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +else + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_mpi_WRAPPER_EXTRA_LDFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_ldflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_ldflags"; then : + mca_wrapper_extra_ldflags=$arg +else + mca_wrapper_extra_ldflags="$mca_wrapper_extra_ldflags $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +fi + if test "$scoll_mpi_WRAPPER_EXTRA_LIBS" = ""; then : + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_mpi_LIBS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg +else + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +else + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_mpi_WRAPPER_EXTRA_LIBS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_libs}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_libs"; then : + mca_wrapper_extra_libs=$arg +else + mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +fi + + fi + + # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script + # component can never be used in a STOP_AT_FIRST framework, we + # don't have to implement the else clause in the literal check... + if test "$scoll_mpi_WRAPPER_EXTRA_CPPFLAGS" != ""; then : + stop_at_first=0 + if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : + if test "$with_devel_headers" = "yes"; then : + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_tmp opal_append; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + for arg in $scoll_mpi_WRAPPER_EXTRA_CPPFLAGS; do + opal_tmp=`echo $arg | cut -c1-2` + opal_append=1 + if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : + for val in ${mca_wrapper_extra_cppflags}; do + if test "x$val" = "x$arg"; then : + opal_append=0 +fi + done +fi + if test "$opal_append" = "1"; then : + if test -z "$mca_wrapper_extra_cppflags"; then : + mca_wrapper_extra_cppflags=$arg +else + mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg" +fi +fi + done + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + +fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_mpi_WRAPPER_EXTRA_CPPFLAGS ($scoll_mpi_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 +$as_echo "$as_me: WARNING: ignoring scoll_mpi_WRAPPER_EXTRA_CPPFLAGS ($scoll_mpi_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} +fi +fi + + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:mpi can compile" >&5 +$as_echo_n "checking if MCA component scoll:mpi can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # If this component was requested as the default for this + # type, then abort. + if test "$with_scoll" = "mpi" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"mpi\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"mpi\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + if test ! -z "$DIRECT_scoll" ; then + if test "$DIRECT_scoll" = "mpi" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"mpi\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"mpi\" failed to configure properly" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 +$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + fi + + # add component to all component list + all_components="$all_components mpi" + fi + + # set the AM_CONDITIONAL on how we should build + if test "$compile_mode" = "dso" ; then + BUILD_oshmem_scoll_mpi_DSO=1 + else + BUILD_oshmem_scoll_mpi_DSO=0 + fi + if test "$BUILD_oshmem_scoll_mpi_DSO" = "1"; then + MCA_BUILD_oshmem_scoll_mpi_DSO_TRUE= + MCA_BUILD_oshmem_scoll_mpi_DSO_FALSE='#' +else + MCA_BUILD_oshmem_scoll_mpi_DSO_TRUE='#' + MCA_BUILD_oshmem_scoll_mpi_DSO_FALSE= +fi + + + ac_config_files="$ac_config_files oshmem/mca/scoll/mpi/Makefile" + + + unset compile_mode + + + # configure components that use built-in configuration scripts + + + + best_mca_component_priority=0 + components_looking_for_succeed=1 + components_last_result=0 + + + opal_show_subsubsubtitle "MCA component scoll:fca (m4 configuration macro)" + + opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed" + + + + component_path="$srcdir/oshmem/mca/scoll/fca" + want_component=0 + + # build if: + # - the component type is direct and we are that component + # - there is no opal_ignore file + # - there is an opal_ignore, but there is an empty opal_unignore + # - there is an opal_ignore, but username is in opal_unignore + if test -d $component_path ; then + # decide if we want the component to be built or not. This + # is spread out because some of the logic is a little complex + # and test's syntax isn't exactly the greatest. We want to + # build the component by default. + want_component=1 + if test -f $component_path/.opal_ignore ; then + # If there is an opal_ignore file, don't build + # the component. Note that this decision can be + # overridden by the unignore logic below. + want_component=0 + fi + if test -f $component_path/.opal_unignore ; then + # if there is an empty opal_unignore, that is + # equivalent to having your userid in the unignore file. + # If userid is in the file, unignore the ignore file. + if test ! -s $component_path/.opal_unignore ; then + want_component=1 + elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then + want_component=1 + fi + fi + # if this component type is direct and we are not it, we don't want + # to be built. Otherwise, we do want to be built. + if test ! -z "$DIRECT_scoll" ; then + if test "$DIRECT_scoll" = "fca" ; then + want_component=1 + else + want_component=0 + fi + fi + fi + + # if we were explicitly disabled, don't build :) + if test "$DISABLE_scoll" = "1"; then : + want_component=0 +fi + if test "$DISABLE_scoll_fca" = "1"; then : + want_component=0 +fi + + if test "$want_component" = "1"; then : + should_build=$components_looking_for_succeed +else + should_build=0 +fi + + # Allow the component to override the build mode if it really wants to. + # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE + + SHARED_FRAMEWORK="$DSO_scoll" + SHARED_COMPONENT="$DSO_scoll_fca" + + STATIC_FRAMEWORK="$STATIC_scoll" + STATIC_COMPONENT="$STATIC_scoll_fca" + + shared_mode_override=static + + # Setup for either shared or static + if test "$STATIC_FRAMEWORK" = "1" || \ + test "$STATIC_COMPONENT" = "1" || \ + test "$STATIC_all" = "1" ; then + compile_mode="static" + elif test "$shared_mode_override" = "dso" || \ + test "$SHARED_FRAMEWORK" = "1" || \ + test "$SHARED_COMPONENT" = "1" || \ + test "$DSO_all" = "1"; then + compile_mode="dso" + else + compile_mode="static" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component scoll:fca compile mode" >&5 +$as_echo_n "checking for MCA component scoll:fca compile mode... " >&6; } + if test "$DIRECT_scoll" = "fca" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 +$as_echo "$compile_mode - direct" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5 +$as_echo "$compile_mode" >&6; } + fi + + + # try to configure the component + + ac_config_files="$ac_config_files oshmem/mca/scoll/fca/Makefile" + + + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in ompi_check_fca_libs ompi_check_fca_happy CPPFLAGS_save LDFLAGS_save LIBS_save; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"ompi_check_fca_libs ompi_check_fca_happy CPPFLAGS_save LDFLAGS_save LIBS_save\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + +# Check whether --with-fca was given. +if test "${with_fca+set}" = set; then : + withval=$with_fca; +fi + + + if test "$with_fca" != "no"; then : + ompi_check_fca_libs=fca + if test ! -z "$with_fca" && test "$with_fca" != "yes"; then : + ompi_check_fca_dir=$with_fca + coll_fca_HOME="$ompi_check_fca_dir" + +else + coll_fca_HOME="/" + +fi + + CPPFLAGS_save=$CPPFLAGS + LDFLAGS_save=$LDFLAGS + LIBS_save=$LIBS + + + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:382896: scoll_fca_CPPFLAGS : $scoll_fca_CPPFLAGS" >&5 +else + echo scoll_fca_CPPFLAGS : $scoll_fca_CPPFLAGS >&5 +fi + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:382904: scoll_fca_LDFLAGS : $scoll_fca_LDFLAGS" >&5 +else + echo scoll_fca_LDFLAGS : $scoll_fca_LDFLAGS >&5 +fi + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:382912: scoll_fca_LIBS : $scoll_fca_LIBS" >&5 +else + echo scoll_fca_LIBS : $scoll_fca_LIBS >&5 +fi + + + opal_check_package_scoll_fca_save_CPPFLAGS="$CPPFLAGS" + opal_check_package_scoll_fca_save_LDFLAGS="$LDFLAGS" + opal_check_package_scoll_fca_save_LIBS="$LIBS" + + opal_check_package_scoll_fca_orig_CPPFLAGS="$scoll_fca_CPPFLAGS" + opal_check_package_scoll_fca_orig_LDFLAGS="$scoll_fca_LDFLAGS" + opal_check_package_scoll_fca_orig_LIBS="$scoll_fca_LIBS" + + + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in dir_prefix; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"dir_prefix\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + # so this sucks, but there's no way to get through the progression + # of header includes without killing off the cache variable and trying + # again... + unset ac_cv_header_fca_fca_api_h + + # get rid of the trailing slash(es) + dir_prefix=$(echo $ompi_check_fca_dir | sed -e 'sX/*$XXg') + opal_check_package_header_happy="no" + if test "$dir_prefix" = "/usr" || \ + test "$dir_prefix" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5 +$as_echo "looking for header without includes" >&6; } + for ac_header in fca/fca_api.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "fca/fca_api.h" "ac_cv_header_fca_fca_api_h" "$ac_includes_default" +if test "x$ac_cv_header_fca_fca_api_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FCA_FCA_API_H 1 +_ACEOF + opal_check_package_header_happy="yes" +fi + +done + + if test "$opal_check_package_header_happy" = "no"; then : + # no go on the as is - reset the cache and try again + unset ac_cv_header_fca_fca_api_h +fi +fi + + if test "$opal_check_package_header_happy" = "no"; then : + if test "$dir_prefix" != ""; then : + scoll_fca_CPPFLAGS="$scoll_fca_CPPFLAGS -I$dir_prefix/include" + CPPFLAGS="$CPPFLAGS -I$dir_prefix/include" +fi + for ac_header in fca/fca_api.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "fca/fca_api.h" "ac_cv_header_fca_fca_api_h" "$ac_includes_default" +if test "x$ac_cv_header_fca_fca_api_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FCA_FCA_API_H 1 +_ACEOF + opal_check_package_header_happy="yes" +fi + +done + + if test "$opal_check_package_header_happy" = "yes"; then : + + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering + + + # see comment above + unset ac_cv_search_fca_get_version + opal_check_package_lib_happy="no" + if test "" != ""; then : + # libdir was specified - search only there + scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L" + LDFLAGS="$LDFLAGS -L" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +else + # libdir was not specified - go through search path + opal_check_package_libdir="$ompi_check_fca_dir" + if test "$opal_check_package_libdir" = "" || \ + test "$opal_check_package_libdir" = "/usr" || \ + test "$opal_check_package_libdir" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 +$as_echo "looking for library without search path" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 +$as_echo "looking for library in lib" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib64" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 +$as_echo "looking for library in lib64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # libnl v1 and libnl3 are known to *not* coexist + # harmoniously in the same process. Check to see if this + # new package will introduce such a conflict. + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_libnl_sane; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_libnl_sane\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + opal_libnl_sane=1 + case $host in + *linux*) + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lib$ompi_check_fca_libs requires libnl v1 or v3" >&5 +$as_echo_n "checking if lib$ompi_check_fca_libs requires libnl v1 or v3... " >&6; } + cat > conftest_c.$ac_ext << EOF +extern void fca_get_version (void); +int main(int argc, char *argv[]) { + fca_get_version (); + return 0; +} +EOF + + this_requires_v1=0 + this_requires_v3=0 + result_msg= + +# 1 is the command +# 2 is actions to do if success +# 3 is actions to do if fail +echo "configure:383424: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS 1>&5 2>&1 +opal_status=$? + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:383431: \$? = $opal_status" >&5 +else + echo \$? = $opal_status >&5 +fi +if test "$opal_status" = "0"; then + unset opal_status + ldd_output=`ldd conftest` + if echo $ldd_output | grep -q libnl-3.so; then : + this_requires_v3=1 + result_msg="v3" +fi + if echo $ldd_output | grep -q libnl.so; then : + this_requires_v1=1 + result_msg="v1 $result_msg" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5 +$as_echo "$result_msg" >&6; } + +else + unset opal_status + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&2;} + +fi + + # Assume that our configuration is sane; this may get reset below + libnl_sane=1 + + # Note: in all the checks below, only add this library to the list + # of libraries (for v1 or v3 as relevant) if we do not fail. + # I.e., assume that a higher level will refuse to use this library + # if we return failure. + + # Does this library require both v1 and v3? If so, fail. + if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + + libnl_sane=0 +fi + + # Does this library require v1, but some prior library required + # v3? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : + if test $opal_libnl_version -eq 3; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + + libnl_sane=0 +else + opal_libnlv1_libs="$opal_libnlv1_libs $ompi_check_fca_libs" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv1_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv1_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done + +# Take all the items in the "array" and assemble them back into a +# single variable + +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=1 +fi + +fi + + # Does this library require v3, but some prior library required + # v1? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : + if test $opal_libnl_version -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + + libnl_sane=0 +else + opal_libnlv3_libs="$opal_libnlv3_libs $ompi_check_fca_libs" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv3_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv3_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done + +# Take all the items in the "array" and assemble them back into a +# single variable + +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=3 +fi + +fi + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + rm -f conftest conftest_c.$ac_ext + + opal_libnl_sane=$libnl_sane + + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + ;; + esac + + opal_check_package_libnl_check_ok=$opal_libnl_sane + + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str + + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done + + + if test $opal_check_package_libnl_check_ok -eq 0; then : + opal_check_package_lib_happy=no +fi + +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] + if test "$ac_cv_search_fca_get_version" != "no" && + test "$ac_cv_search_fca_get_version" != "none required"; then : + scoll_fca_LIBS="$ac_cv_search_fca_get_version " +else + scoll_fca_LIBS="" +fi + opal_check_package_happy="yes" +else + opal_check_package_happy="no" +fi + + +else + opal_check_package_happy="no" +fi +else + + # This is stolen from autoconf to peek under the covers to get the + # cache variable for the library check. one should not copy this + # code into other places unless you want much pain and suffering + + + # see comment above + unset ac_cv_search_fca_get_version + opal_check_package_lib_happy="no" + if test "" != ""; then : + # libdir was specified - search only there + scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L" + LDFLAGS="$LDFLAGS -L" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +else + # libdir was not specified - go through search path + opal_check_package_libdir="$ompi_check_fca_dir" + if test "$opal_check_package_libdir" = "" || \ + test "$opal_check_package_libdir" = "/usr" || \ + test "$opal_check_package_libdir" = "/usr/local"; then : + # try as is... + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 +$as_echo "looking for library without search path" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 +$as_echo "looking for library in lib" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + if test "$opal_check_package_libdir" != ""; then : + scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib64" + LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 +$as_echo "looking for library in lib64" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 +$as_echo_n "checking for library containing fca_get_version... " >&6; } +if ${ac_cv_search_fca_get_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char fca_get_version (); +int +main () +{ +return fca_get_version (); + ; + return 0; +} +_ACEOF +for ac_lib in '' $ompi_check_fca_libs; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_fca_get_version=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_fca_get_version+:} false; then : + break +fi +done +if ${ac_cv_search_fca_get_version+:} false; then : + +else + ac_cv_search_fca_get_version=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 +$as_echo "$ac_cv_search_fca_get_version" >&6; } +ac_res=$ac_cv_search_fca_get_version +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + opal_check_package_lib_happy="yes" +else + opal_check_package_lib_happy="no" +fi + + if test "$opal_check_package_lib_happy" = "no"; then : + # no go on the as is.. see what happens later... + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + unset ac_cv_search_fca_get_version +fi +fi +fi +fi + + if test "$opal_check_package_lib_happy" = "yes"; then : + # libnl v1 and libnl3 are known to *not* coexist + # harmoniously in the same process. Check to see if this + # new package will introduce such a conflict. + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in opal_libnl_sane; do + opal_str="opal_str=\"\$$opal_var\"" + eval $opal_str + + if test "x$opal_str" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 +$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 +$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + done + + # Ok, we passed the simple sanity check. Save all these names so + # that we can unset them at the end of the scope. + opal_str="opal_scope_$opal_scope_index=\"opal_libnl_sane\"" + eval $opal_str + unset opal_str + + env | grep opal_scope + opal_scope_index=`expr $opal_scope_index + 1` + + opal_libnl_sane=1 + case $host in + *linux*) + + + + # Is the private index set? If not, set it. + if test "x$opal_scope_index" = "x"; then + opal_scope_index=1 + fi + + # First, check to see if any of these variables are already set. + # This is a simple sanity check to ensure we're not already + # overwriting pre-existing variables (that have a non-empty + # value). It's not a perfect check, but at least it's something. + for opal_var in this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -379381,7 +384114,7 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" + opal_str="opal_scope_$opal_scope_index=\"this_requires_v1 libnl_sane this_requires_v3 ldd_output result_msg\"" eval $opal_str unset opal_str @@ -379389,105 +384122,276 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_basic_LIBS; do - opal_tmp=`echo $arg | cut -c1-2` - opal_append=1 - if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : - for val in ${mca_wrapper_extra_libs}; do - if test "x$val" = "x$arg"; then : - opal_append=0 + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lib$ompi_check_fca_libs requires libnl v1 or v3" >&5 +$as_echo_n "checking if lib$ompi_check_fca_libs requires libnl v1 or v3... " >&6; } + cat > conftest_c.$ac_ext << EOF +extern void fca_get_version (void); +int main(int argc, char *argv[]) { + fca_get_version (); + return 0; +} +EOF + + this_requires_v1=0 + this_requires_v3=0 + result_msg= + +# 1 is the command +# 2 is actions to do if success +# 3 is actions to do if fail +echo "configure:384149: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS 1>&5 2>&1 +opal_status=$? + +# 1 is the message +# 2 is whether to put a prefix or not +if test -n "1"; then + echo "configure:384156: \$? = $opal_status" >&5 +else + echo \$? = $opal_status >&5 fi - done +if test "$opal_status" = "0"; then + unset opal_status + ldd_output=`ldd conftest` + if echo $ldd_output | grep -q libnl-3.so; then : + this_requires_v3=1 + result_msg="v3" fi - if test "$opal_append" = "1"; then : - if test -z "$mca_wrapper_extra_libs"; then : - mca_wrapper_extra_libs=$arg -else - mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" + if echo $ldd_output | grep -q libnl.so; then : + this_requires_v1=1 + result_msg="v1 $result_msg" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result_msg" >&5 +$as_echo "$result_msg" >&6; } + +else + unset opal_status + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&2;} + fi - done + # Assume that our configuration is sane; this may get reset below + libnl_sane=1 - # Unwind the index - opal_scope_index=`expr $opal_scope_index - 1` - opal_scope_test=`expr $opal_scope_index \> 0` - if test "$opal_scope_test" = "0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi + # Note: in all the checks below, only add this library to the list + # of libraries (for v1 or v3 as relevant) if we do not fail. + # I.e., assume that a higher level will refuse to use this library + # if we return failure. - # Get the variable names from that index - opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" - eval $opal_str + # Does this library require both v1 and v3? If so, fail. + if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&2;} - # Iterate over all the variables and unset them all - for opal_var in $opal_str; do - unset $opal_var - done + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + + libnl_sane=0 +fi + + # Does this library require v1, but some prior library required + # v3? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : + if test $opal_libnl_version -eq 3; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + libnl_sane=0 else + opal_libnlv1_libs="$opal_libnlv1_libs $ompi_check_fca_libs" +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv1_libs +# Go through each item in the variable and only keep the unique ones - # Is the private index set? If not, set it. - if test "x$opal_scope_index" = "x"; then - opal_scope_index=1 - fi +opal_count=0 +for val in ${opal_libnlv1_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 - # First, check to see if any of these variables are already set. - # This is a simple sanity check to ensure we're not already - # overwriting pre-existing variables (that have a non-empty - # value). It's not a perfect check, but at least it's something. - for opal_var in opal_tmp opal_append; do - opal_str="opal_str=\"\$$opal_var\"" - eval $opal_str + # Loop over every token we've seen so far - if test "x$opal_str" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 -$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 -$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" done - # Ok, we passed the simple sanity check. Save all these names so - # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" - eval $opal_str - unset opal_str + # If we didn't find the token, add it to the "array" - env | grep opal_scope - opal_scope_index=`expr $opal_scope_index + 1` + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done +# Take all the items in the "array" and assemble them back into a +# single variable - for arg in $scoll_basic_WRAPPER_EXTRA_LIBS; do - opal_tmp=`echo $arg | cut -c1-2` - opal_append=1 - if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : - for val in ${mca_wrapper_extra_libs}; do - if test "x$val" = "x$arg"; then : - opal_append=0 +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=1 fi - done + fi - if test "$opal_append" = "1"; then : - if test -z "$mca_wrapper_extra_libs"; then : - mca_wrapper_extra_libs=$arg + + # Does this library require v3, but some prior library required + # v1? If so, fail. + if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : + if test $opal_libnl_version -eq 1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&2;} + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 +$as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + + libnl_sane=0 else - mca_wrapper_extra_libs="$mca_wrapper_extra_libs $arg" + opal_libnlv3_libs="$opal_libnlv3_libs $ompi_check_fca_libs" + +# 1 is the variable name to be uniq-ized +opal_name=opal_libnlv3_libs + +# Go through each item in the variable and only keep the unique ones + +opal_count=0 +for val in ${opal_libnlv3_libs}; do + opal_done=0 + opal_i=1 + opal_found=0 + + # Loop over every token we've seen so far + + opal_done="`expr $opal_i \> $opal_count`" + while test "$opal_found" = "0" && test "$opal_done" = "0"; do + + # Have we seen this token already? Prefix the comparison with + # "x" so that "-Lfoo" values won't be cause an error. + + opal_eval="expr x$val = x\$opal_array_$opal_i" + opal_found=`eval $opal_eval` + + # Check the ending condition + + opal_done="`expr $opal_i \>= $opal_count`" + + # Increment the counter + + opal_i="`expr $opal_i + 1`" + done + + # If we didn't find the token, add it to the "array" + + if test "$opal_found" = "0"; then + opal_eval="opal_array_$opal_i=$val" + eval $opal_eval + opal_count="`expr $opal_count + 1`" + else + opal_i="`expr $opal_i - 1`" + fi +done + +# Take all the items in the "array" and assemble them back into a +# single variable + +opal_i=1 +opal_done="`expr $opal_i \> $opal_count`" +opal_newval= +while test "$opal_done" = "0"; do + opal_eval="opal_newval=\"$opal_newval \$opal_array_$opal_i\"" + eval $opal_eval + + opal_eval="unset opal_array_$opal_i" + eval $opal_eval + + opal_done="`expr $opal_i \>= $opal_count`" + opal_i="`expr $opal_i + 1`" +done + +# Done; do the assignment + +opal_newval="`echo $opal_newval`" +opal_eval="$opal_name=\"$opal_newval\"" +eval $opal_eval + +# Clean up + +unset opal_name opal_i opal_done opal_newval opal_eval opal_count + opal_libnl_version=3 fi + fi - done + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + rm -f conftest conftest_c.$ac_ext + + opal_libnl_sane=$libnl_sane # Unwind the index @@ -379511,74 +384415,54 @@ done -fi - - fi - - # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script - # component can never be used in a STOP_AT_FIRST framework, we - # don't have to implement the else clause in the literal check... - if test "$scoll_basic_WRAPPER_EXTRA_CPPFLAGS" != ""; then : - stop_at_first=0 - if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : - if test "$with_devel_headers" = "yes"; then : - + ;; + esac + opal_check_package_libnl_check_ok=$opal_libnl_sane - # Is the private index set? If not, set it. - if test "x$opal_scope_index" = "x"; then - opal_scope_index=1 + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 fi - # First, check to see if any of these variables are already set. - # This is a simple sanity check to ensure we're not already - # overwriting pre-existing variables (that have a non-empty - # value). It's not a perfect check, but at least it's something. - for opal_var in opal_tmp opal_append; do - opal_str="opal_str=\"\$$opal_var\"" - eval $opal_str + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str - if test "x$opal_str" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash at line $LINENO!" >&5 -$as_echo "$as_me: WARNING: Found configure shell variable clash at line $LINENO!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&5 -$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$opal_var\"," >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$opal_str\"" >&5 -$as_echo "$as_me: WARNING: but it is already defined with value \"$opal_str\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 -$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var done - # Ok, we passed the simple sanity check. Save all these names so - # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"opal_tmp opal_append\"" - eval $opal_str - unset opal_str - - env | grep opal_scope - opal_scope_index=`expr $opal_scope_index + 1` + if test $opal_check_package_libnl_check_ok -eq 0; then : + opal_check_package_lib_happy=no +fi - for arg in $scoll_basic_WRAPPER_EXTRA_CPPFLAGS; do - opal_tmp=`echo $arg | cut -c1-2` - opal_append=1 - if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : - for val in ${mca_wrapper_extra_cppflags}; do - if test "x$val" = "x$arg"; then : - opal_append=0 fi - done + + if test "$opal_check_package_lib_happy" = "yes"; then : + # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] + if test "$ac_cv_search_fca_get_version" != "no" && + test "$ac_cv_search_fca_get_version" != "none required"; then : + scoll_fca_LIBS="$ac_cv_search_fca_get_version " +else + scoll_fca_LIBS="" fi - if test "$opal_append" = "1"; then : - if test -z "$mca_wrapper_extra_cppflags"; then : - mca_wrapper_extra_cppflags=$arg + opal_check_package_happy="yes" else - mca_wrapper_extra_cppflags="$mca_wrapper_extra_cppflags $arg" + opal_check_package_happy="no" fi + + fi - done + unset opal_check_package_header_happy # Unwind the index @@ -379602,205 +384486,130 @@ done -fi + + if test "$opal_check_package_happy" = "yes"; then : + ompi_check_fca_happy="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_basic_WRAPPER_EXTRA_CPPFLAGS ($scoll_basic_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 -$as_echo "$as_me: WARNING: ignoring scoll_basic_WRAPPER_EXTRA_CPPFLAGS ($scoll_basic_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} -fi + scoll_fca_CPPFLAGS="$opal_check_package_scoll_fca_orig_CPPFLAGS" + scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" + scoll_fca_LIBS="$opal_check_package_scoll_fca_orig_LIBS" + ompi_check_fca_happy="no" fi - else - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:basic can compile" >&5 -$as_echo_n "checking if MCA component scoll:basic can compile... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - # If this component was requested as the default for this - # type, then abort. - if test "$with_scoll" = "basic" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"basic\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"basic\" failed to configure properly" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 -$as_echo "$as_me: WARNING: This component was selected as the default" >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi - - if test ! -z "$DIRECT_scoll" ; then - if test "$DIRECT_scoll" = "basic" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"basic\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"basic\" failed to configure properly" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 -$as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} - as_fn_error $? "Cannot continue" "$LINENO" 5 - fi - fi + CPPFLAGS="$opal_check_package_scoll_fca_save_CPPFLAGS" + LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" + LIBS="$opal_check_package_scoll_fca_save_LIBS" - # add component to all component list - all_components="$all_components basic" - fi - # set the AM_CONDITIONAL on how we should build - if test "$compile_mode" = "dso" ; then - BUILD_oshmem_scoll_basic_DSO=1 - else - BUILD_oshmem_scoll_basic_DSO=0 - fi - if test "$BUILD_oshmem_scoll_basic_DSO" = "1"; then - MCA_BUILD_oshmem_scoll_basic_DSO_TRUE= - MCA_BUILD_oshmem_scoll_basic_DSO_FALSE='#' + CPPFLAGS=$CPPFLAGS_save + LDFLAGS=$LDFLAGS_save + LIBS=$LIBS_save else - MCA_BUILD_oshmem_scoll_basic_DSO_TRUE='#' - MCA_BUILD_oshmem_scoll_basic_DSO_FALSE= + ompi_check_fca_happy="no" fi + if test "$ompi_check_fca_happy" = "yes" && test "$enable_progress_threads" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fca driver does not currently support progress threads. Disabling FCA." >&5 +$as_echo "$as_me: WARNING: fca driver does not currently support progress threads. Disabling FCA." >&2;} + ompi_check_fca_happy="no" +fi - ac_config_files="$ac_config_files oshmem/mca/scoll/basic/Makefile" - - - unset compile_mode - - opal_show_subsubsubtitle "MCA component scoll:mpi (no configuration)" + if test "$ompi_check_fca_happy" = "yes"; then : + scoll_fca_happy="yes" +else + if test ! -z "$with_fca" && test "$with_fca" != "no"; then : + as_fn_error $? "FCA support requested but not found. Aborting" "$LINENO" 5 +fi + scoll_fca_happy="no" +fi - opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: before, should_build=1" + # Unwind the index + opal_scope_index=`expr $opal_scope_index - 1` + opal_scope_test=`expr $opal_scope_index \> 0` + if test "$opal_scope_test" = "0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&5 +$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OPAL configure scopes." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} + as_fn_error $? "Cannot continue" "$LINENO" 5 + fi + # Get the variable names from that index + opal_str="opal_str=\"\$opal_scope_$opal_scope_index\"" + eval $opal_str - component_path="$srcdir/oshmem/mca/scoll/mpi" - want_component=0 + # Iterate over all the variables and unset them all + for opal_var in $opal_str; do + unset $opal_var + done - # build if: - # - the component type is direct and we are that component - # - there is no opal_ignore file - # - there is an opal_ignore, but there is an empty opal_unignore - # - there is an opal_ignore, but username is in opal_unignore - if test -d $component_path ; then - # decide if we want the component to be built or not. This - # is spread out because some of the logic is a little complex - # and test's syntax isn't exactly the greatest. We want to - # build the component by default. - want_component=1 - if test -f $component_path/.opal_ignore ; then - # If there is an opal_ignore file, don't build - # the component. Note that this decision can be - # overridden by the unignore logic below. - want_component=0 - fi - if test -f $component_path/.opal_unignore ; then - # if there is an empty opal_unignore, that is - # equivalent to having your userid in the unignore file. - # If userid is in the file, unignore the ignore file. - if test ! -s $component_path/.opal_unignore ; then - want_component=1 - elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then - want_component=1 - fi - fi - # if this component type is direct and we are not it, we don't want - # to be built. Otherwise, we do want to be built. - if test ! -z "$DIRECT_scoll" ; then - if test "$DIRECT_scoll" = "mpi" ; then - want_component=1 - else - want_component=0 - fi - fi - fi - # if we were explicitly disabled, don't build :) - if test "$DISABLE_scoll" = "1"; then : - want_component=0 -fi - if test "$DISABLE_scoll_mpi" = "1"; then : - want_component=0 -fi - if test "$want_component" = "1"; then : - should_build=1 + if test "$scoll_fca_happy" = "yes"; then : + scoll_fca_WRAPPER_EXTRA_LDFLAGS="$scoll_fca_LDFLAGS" + scoll_fca_CPPFLAGS="$scoll_fca_CPPFLAGS" + scoll_fca_WRAPPER_EXTRA_LIBS="$scoll_fca_LIBS" + should_build=$should_build else should_build=0 fi + # substitute in the things needed to build fca - SHARED_FRAMEWORK="$DSO_scoll" - SHARED_COMPONENT="$DSO_scoll_mpi" - STATIC_FRAMEWORK="$STATIC_scoll" - STATIC_COMPONENT="$STATIC_scoll_mpi" - shared_mode_override=static - # Setup for either shared or static - if test "$STATIC_FRAMEWORK" = "1" || \ - test "$STATIC_COMPONENT" = "1" || \ - test "$STATIC_all" = "1" ; then - compile_mode="static" - elif test "$shared_mode_override" = "dso" || \ - test "$SHARED_FRAMEWORK" = "1" || \ - test "$SHARED_COMPONENT" = "1" || \ - test "$DSO_all" = "1"; then - compile_mode="dso" - else - compile_mode="static" - fi + scoll_fca_HOME="$ompi_check_fca_dir" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component scoll:mpi compile mode" >&5 -$as_echo_n "checking for MCA component scoll:mpi compile mode... " >&6; } - if test "$DIRECT_scoll" = "mpi" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 -$as_echo "$compile_mode - direct" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode" >&5 -$as_echo "$compile_mode" >&6; } - fi - opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build" + opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build" - if test "$should_build" = "1" ; then + if test "$should_build" = "1"; then : # See if it dropped an output file for us to pick up some # shell variables in. - infile="$srcdir/oshmem/mca/scoll/mpi/post_configure.sh" + infile="$srcdir/oshmem/mca/scoll/fca/post_configure.sh" # Add this subdir to the mast list of all MCA component subdirs - all_components="$all_components mpi" + all_components="$all_components fca" if test "$compile_mode" = "dso" ; then - dso_components="$dso_components mpi" + dso_components="$dso_components fca" else if test "scoll" = "common"; then # Static libraries in "common" frameworks are installed, and # therefore must obey the $FRAMEWORK_LIB_PREFIX that was # set. - static_ltlibs="mca/scoll/mpi/lib${OSHMEM_LIB_PREFIX}mca_scoll_mpi.la $static_ltlibs" + static_ltlibs="mca/scoll/fca/lib${OSHMEM_LIB_PREFIX}mca_scoll_fca.la $static_ltlibs" else # Other frameworks do not have to obey the # $FRAMEWORK_LIB_PREFIX prefix. - static_ltlibs="mca/scoll/mpi/libmca_scoll_mpi.la $static_ltlibs" + static_ltlibs="mca/scoll/fca/libmca_scoll_fca.la $static_ltlibs" fi - echo "extern const mca_base_component_t mca_scoll_mpi_component;" >> $outfile.extern - echo " &mca_scoll_mpi_component, " >> $outfile.struct - static_components="$static_components mpi" + echo "extern const mca_base_component_t mca_scoll_fca_component;" >> $outfile.extern + echo " &mca_scoll_fca_component, " >> $outfile.struct + static_components="$static_components fca" fi # Output pretty results - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:mpi can compile" >&5 -$as_echo_n "checking if MCA component scoll:mpi can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:fca can compile" >&5 +$as_echo_n "checking if MCA component scoll:fca can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } if test -f $infile; then # check for direct call header to include. This will be # AC_SUBSTed later. - if test "$DIRECT_scoll" = "mpi" ; then + if test "$DIRECT_scoll" = "fca" ; then if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" str="MCA_oshmem_scoll_DIRECT_CALL_HEADER=$line" eval $str else -as_fn_error $? "*** scoll component mpi was supposed to be direct-called, but +as_fn_error $? "*** scoll component fca was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -379808,8 +384617,8 @@ else # were we supposed to have found something in the # post_configure.sh, but the file didn't exist? - if test "$DIRECT_scoll" = "mpi" ; then -as_fn_error $? "*** scoll component mpi was supposed to be direct-called, but + if test "$DIRECT_scoll" = "fca" ; then +as_fn_error $? "*** scoll component fca was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -379824,7 +384633,7 @@ # because it will link against these (without a dependency from # libmpi.so to these flags) if test "$compile_mode" = "static"; then - if test "$scoll_mpi_WRAPPER_EXTRA_LDFLAGS" = ""; then : + if test "$scoll_fca_WRAPPER_EXTRA_LDFLAGS" = ""; then : @@ -379864,7 +384673,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_mpi_LDFLAGS; do + for arg in $scoll_fca_LDFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -379945,7 +384754,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_mpi_WRAPPER_EXTRA_LDFLAGS; do + for arg in $scoll_fca_WRAPPER_EXTRA_LDFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -379987,7 +384796,7 @@ fi - if test "$scoll_mpi_WRAPPER_EXTRA_LIBS" = ""; then : + if test "$scoll_fca_WRAPPER_EXTRA_LIBS" = ""; then : @@ -380027,7 +384836,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_mpi_LIBS; do + for arg in $scoll_fca_LIBS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -380108,7 +384917,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_mpi_WRAPPER_EXTRA_LIBS; do + for arg in $scoll_fca_WRAPPER_EXTRA_LIBS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -380156,7 +384965,7 @@ # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script # component can never be used in a STOP_AT_FIRST framework, we # don't have to implement the else clause in the literal check... - if test "$scoll_mpi_WRAPPER_EXTRA_CPPFLAGS" != ""; then : + if test "$scoll_fca_WRAPPER_EXTRA_CPPFLAGS" != ""; then : stop_at_first=0 if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : if test "$with_devel_headers" = "yes"; then : @@ -380199,7 +385008,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_mpi_WRAPPER_EXTRA_CPPFLAGS; do + for arg in $scoll_fca_WRAPPER_EXTRA_CPPFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -380242,79 +385051,78 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_mpi_WRAPPER_EXTRA_CPPFLAGS ($scoll_mpi_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 -$as_echo "$as_me: WARNING: ignoring scoll_mpi_WRAPPER_EXTRA_CPPFLAGS ($scoll_mpi_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_fca_WRAPPER_EXTRA_CPPFLAGS ($scoll_fca_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 +$as_echo "$as_me: WARNING: ignoring scoll_fca_WRAPPER_EXTRA_CPPFLAGS ($scoll_fca_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} fi fi - else +else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:mpi can compile" >&5 -$as_echo_n "checking if MCA component scoll:mpi can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:fca can compile" >&5 +$as_echo_n "checking if MCA component scoll:fca can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } # If this component was requested as the default for this # type, then abort. - if test "$with_scoll" = "mpi" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"mpi\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"mpi\" failed to configure properly" >&2;} + if test "$with_scoll" = "fca" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"fca\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"fca\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 $as_echo "$as_me: WARNING: This component was selected as the default" >&2;} as_fn_error $? "Cannot continue" "$LINENO" 5 fi if test ! -z "$DIRECT_scoll" ; then - if test "$DIRECT_scoll" = "mpi" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"mpi\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"mpi\" failed to configure properly" >&2;} + if test "$DIRECT_scoll" = "fca" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"fca\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"fca\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 $as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} as_fn_error $? "Cannot continue" "$LINENO" 5 fi fi - # add component to all component list - all_components="$all_components mpi" - fi + # add component to all component list + all_components="$all_components fca" +fi + + # set the AM_CONDITIONAL on how we should build - if test "$compile_mode" = "dso" ; then - BUILD_oshmem_scoll_mpi_DSO=1 - else - BUILD_oshmem_scoll_mpi_DSO=0 - fi - if test "$BUILD_oshmem_scoll_mpi_DSO" = "1"; then - MCA_BUILD_oshmem_scoll_mpi_DSO_TRUE= - MCA_BUILD_oshmem_scoll_mpi_DSO_FALSE='#' + if test "$compile_mode" = "dso"; then : + BUILD_oshmem_scoll_fca_DSO=1 else - MCA_BUILD_oshmem_scoll_mpi_DSO_TRUE='#' - MCA_BUILD_oshmem_scoll_mpi_DSO_FALSE= + BUILD_oshmem_scoll_fca_DSO=0 +fi + if test "$BUILD_oshmem_scoll_fca_DSO" = "1"; then + MCA_BUILD_oshmem_scoll_fca_DSO_TRUE= + MCA_BUILD_oshmem_scoll_fca_DSO_FALSE='#' +else + MCA_BUILD_oshmem_scoll_fca_DSO_TRUE='#' + MCA_BUILD_oshmem_scoll_fca_DSO_FALSE= fi - ac_config_files="$ac_config_files oshmem/mca/scoll/mpi/Makefile" - + if test "$should_build" = "1"; then : + components_last_result=1 +else + components_last_result=0 +fi unset compile_mode - # configure components that use built-in configuration scripts - - best_mca_component_priority=0 - components_looking_for_succeed=1 - components_last_result=0 - - opal_show_subsubsubtitle "MCA component scoll:fca (m4 configuration macro)" + opal_show_subsubsubtitle "MCA component scoll:ucc (m4 configuration macro)" opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: before, should_build=$components_looking_for_succeed" - component_path="$srcdir/oshmem/mca/scoll/fca" + component_path="$srcdir/oshmem/mca/scoll/ucc" want_component=0 # build if: @@ -380347,7 +385155,7 @@ # if this component type is direct and we are not it, we don't want # to be built. Otherwise, we do want to be built. if test ! -z "$DIRECT_scoll" ; then - if test "$DIRECT_scoll" = "fca" ; then + if test "$DIRECT_scoll" = "ucc" ; then want_component=1 else want_component=0 @@ -380359,7 +385167,7 @@ if test "$DISABLE_scoll" = "1"; then : want_component=0 fi - if test "$DISABLE_scoll_fca" = "1"; then : + if test "$DISABLE_scoll_ucc" = "1"; then : want_component=0 fi @@ -380373,10 +385181,10 @@ # It is, of course, free to end up calling MCA_COMPONENT_COMPILE_MODE SHARED_FRAMEWORK="$DSO_scoll" - SHARED_COMPONENT="$DSO_scoll_fca" + SHARED_COMPONENT="$DSO_scoll_ucc" STATIC_FRAMEWORK="$STATIC_scoll" - STATIC_COMPONENT="$STATIC_scoll_fca" + STATIC_COMPONENT="$STATIC_scoll_ucc" shared_mode_override=static @@ -380394,9 +385202,9 @@ compile_mode="static" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component scoll:fca compile mode" >&5 -$as_echo_n "checking for MCA component scoll:fca compile mode... " >&6; } - if test "$DIRECT_scoll" = "fca" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCA component scoll:ucc compile mode" >&5 +$as_echo_n "checking for MCA component scoll:ucc compile mode... " >&6; } + if test "$DIRECT_scoll" = "ucc" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $compile_mode - direct" >&5 $as_echo "$compile_mode - direct" >&6; } else @@ -380407,7 +385215,7 @@ # try to configure the component - ac_config_files="$ac_config_files oshmem/mca/scoll/fca/Makefile" + ac_config_files="$ac_config_files oshmem/mca/scoll/ucc/Makefile" @@ -380422,7 +385230,7 @@ # This is a simple sanity check to ensure we're not already # overwriting pre-existing variables (that have a non-empty # value). It's not a perfect check, but at least it's something. - for opal_var in ompi_check_fca_libs ompi_check_fca_happy CPPFLAGS_save LDFLAGS_save LIBS_save; do + for opal_var in ompi_check_ucc_dir ompi_check_ucc_happy CPPFLAGS_save LDFLAGS_save LIBS_save; do opal_str="opal_str=\"\$$opal_var\"" eval $opal_str @@ -380441,7 +385249,7 @@ # Ok, we passed the simple sanity check. Save all these names so # that we can unset them at the end of the scope. - opal_str="opal_scope_$opal_scope_index=\"ompi_check_fca_libs ompi_check_fca_happy CPPFLAGS_save LDFLAGS_save LIBS_save\"" + opal_str="opal_scope_$opal_scope_index=\"ompi_check_ucc_dir ompi_check_ucc_happy CPPFLAGS_save LDFLAGS_save LIBS_save\"" eval $opal_str unset opal_str @@ -380450,21 +385258,15 @@ -# Check whether --with-fca was given. -if test "${with_fca+set}" = set; then : - withval=$with_fca; +# Check whether --with-ucc was given. +if test "${with_ucc+set}" = set; then : + withval=$with_ucc; fi - if test "$with_fca" != "no"; then : - ompi_check_fca_libs=fca - if test ! -z "$with_fca" && test "$with_fca" != "yes"; then : - ompi_check_fca_dir=$with_fca - coll_fca_HOME="$ompi_check_fca_dir" - -else - coll_fca_HOME="/" - + if test "$with_ucc" != "no"; then : + if test -n "$with_ucc" && test "$with_ucc" != "yes"; then : + ompi_check_ucc_dir=$with_ucc fi CPPFLAGS_save=$CPPFLAGS @@ -380472,39 +385274,38 @@ LIBS_save=$LIBS - # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:380479: scoll_fca_CPPFLAGS : $scoll_fca_CPPFLAGS" >&5 + echo "configure:385280: scoll_ucc_CPPFLAGS : $scoll_ucc_CPPFLAGS" >&5 else - echo scoll_fca_CPPFLAGS : $scoll_fca_CPPFLAGS >&5 + echo scoll_ucc_CPPFLAGS : $scoll_ucc_CPPFLAGS >&5 fi # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:380487: scoll_fca_LDFLAGS : $scoll_fca_LDFLAGS" >&5 + echo "configure:385288: scoll_ucc_LDFLAGS : $scoll_ucc_LDFLAGS" >&5 else - echo scoll_fca_LDFLAGS : $scoll_fca_LDFLAGS >&5 + echo scoll_ucc_LDFLAGS : $scoll_ucc_LDFLAGS >&5 fi # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:380495: scoll_fca_LIBS : $scoll_fca_LIBS" >&5 + echo "configure:385296: scoll_ucc_LIBS : $scoll_ucc_LIBS" >&5 else - echo scoll_fca_LIBS : $scoll_fca_LIBS >&5 + echo scoll_ucc_LIBS : $scoll_ucc_LIBS >&5 fi - opal_check_package_scoll_fca_save_CPPFLAGS="$CPPFLAGS" - opal_check_package_scoll_fca_save_LDFLAGS="$LDFLAGS" - opal_check_package_scoll_fca_save_LIBS="$LIBS" + opal_check_package_scoll_ucc_save_CPPFLAGS="$CPPFLAGS" + opal_check_package_scoll_ucc_save_LDFLAGS="$LDFLAGS" + opal_check_package_scoll_ucc_save_LIBS="$LIBS" - opal_check_package_scoll_fca_orig_CPPFLAGS="$scoll_fca_CPPFLAGS" - opal_check_package_scoll_fca_orig_LDFLAGS="$scoll_fca_LDFLAGS" - opal_check_package_scoll_fca_orig_LIBS="$scoll_fca_LIBS" + opal_check_package_scoll_ucc_orig_CPPFLAGS="$scoll_ucc_CPPFLAGS" + opal_check_package_scoll_ucc_orig_LDFLAGS="$scoll_ucc_LDFLAGS" + opal_check_package_scoll_ucc_orig_LIBS="$scoll_ucc_LIBS" # This is stolen from autoconf to peek under the covers to get the @@ -380552,22 +385353,22 @@ # so this sucks, but there's no way to get through the progression # of header includes without killing off the cache variable and trying # again... - unset ac_cv_header_fca_fca_api_h + unset ac_cv_header_ucc_api_ucc_h # get rid of the trailing slash(es) - dir_prefix=$(echo $ompi_check_fca_dir | sed -e 'sX/*$XXg') + dir_prefix=$(echo $ompi_check_ucc_dir | sed -e 'sX/*$XXg') opal_check_package_header_happy="no" if test "$dir_prefix" = "/usr" || \ test "$dir_prefix" = "/usr/local"; then : # try as is... { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for header without includes" >&5 $as_echo "looking for header without includes" >&6; } - for ac_header in fca/fca_api.h + for ac_header in ucc/api/ucc.h do : - ac_fn_c_check_header_mongrel "$LINENO" "fca/fca_api.h" "ac_cv_header_fca_fca_api_h" "$ac_includes_default" -if test "x$ac_cv_header_fca_fca_api_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "ucc/api/ucc.h" "ac_cv_header_ucc_api_ucc_h" "$ac_includes_default" +if test "x$ac_cv_header_ucc_api_ucc_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_FCA_FCA_API_H 1 +#define HAVE_UCC_API_UCC_H 1 _ACEOF opal_check_package_header_happy="yes" fi @@ -380576,21 +385377,21 @@ if test "$opal_check_package_header_happy" = "no"; then : # no go on the as is - reset the cache and try again - unset ac_cv_header_fca_fca_api_h + unset ac_cv_header_ucc_api_ucc_h fi fi if test "$opal_check_package_header_happy" = "no"; then : if test "$dir_prefix" != ""; then : - scoll_fca_CPPFLAGS="$scoll_fca_CPPFLAGS -I$dir_prefix/include" + scoll_ucc_CPPFLAGS="$scoll_ucc_CPPFLAGS -I$dir_prefix/include" CPPFLAGS="$CPPFLAGS -I$dir_prefix/include" fi - for ac_header in fca/fca_api.h + for ac_header in ucc/api/ucc.h do : - ac_fn_c_check_header_mongrel "$LINENO" "fca/fca_api.h" "ac_cv_header_fca_fca_api_h" "$ac_includes_default" -if test "x$ac_cv_header_fca_fca_api_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "ucc/api/ucc.h" "ac_cv_header_ucc_api_ucc_h" "$ac_includes_default" +if test "x$ac_cv_header_ucc_api_ucc_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_FCA_FCA_API_H 1 +#define HAVE_UCC_API_UCC_H 1 _ACEOF opal_check_package_header_happy="yes" fi @@ -380605,15 +385406,15 @@ # see comment above - unset ac_cv_search_fca_get_version + unset ac_cv_search_ucc_init_version opal_check_package_lib_happy="no" if test "" != ""; then : # libdir was specified - search only there - scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L" + scoll_ucc_LDFLAGS="$scoll_ucc_LDFLAGS -L" LDFLAGS="$LDFLAGS -L" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -380626,16 +385427,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -380643,25 +385444,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -380670,22 +385471,22 @@ fi if test "$opal_check_package_lib_happy" = "no"; then : - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi else # libdir was not specified - go through search path - opal_check_package_libdir="$ompi_check_fca_dir" + opal_check_package_libdir="$ompi_check_ucc_dir" if test "$opal_check_package_libdir" = "" || \ test "$opal_check_package_libdir" = "/usr" || \ test "$opal_check_package_libdir" = "/usr/local"; then : # try as is... { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 $as_echo "looking for library without search path" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -380698,16 +385499,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -380715,25 +385516,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -380743,21 +385544,21 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi fi if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib" + scoll_ucc_LDFLAGS="$scoll_ucc_LDFLAGS -L$opal_check_package_libdir/lib" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 $as_echo "looking for library in lib" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -380770,16 +385571,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -380787,25 +385588,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -380815,22 +385616,22 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi fi fi if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib64" + scoll_ucc_LDFLAGS="$scoll_ucc_LDFLAGS -L$opal_check_package_libdir/lib64" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 $as_echo "looking for library in lib64" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -380843,16 +385644,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -380860,25 +385661,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -380888,9 +385689,9 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi fi fi @@ -380987,12 +385788,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lib$ompi_check_fca_libs requires libnl v1 or v3" >&5 -$as_echo_n "checking if lib$ompi_check_fca_libs requires libnl v1 or v3... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libucc requires libnl v1 or v3" >&5 +$as_echo_n "checking if libucc requires libnl v1 or v3... " >&6; } cat > conftest_c.$ac_ext << EOF -extern void fca_get_version (void); +extern void ucc_init_version (void); int main(int argc, char *argv[]) { - fca_get_version (); + ucc_init_version (); return 0; } EOF @@ -381004,14 +385805,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:381007: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS" >&5 -$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS 1>&5 2>&1 +echo "configure:385808: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $scoll_ucc_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $scoll_ucc_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:381014: \$? = $opal_status" >&5 + echo "configure:385815: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -381031,8 +385832,8 @@ else unset opal_status - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&5 -$as_echo "$as_me: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib ucc" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib ucc" >&2;} fi @@ -381046,15 +385847,15 @@ # Does this library require both v1 and v3? If so, fail. if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&5 -$as_echo "$as_me: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 $as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} libnl_sane=0 fi @@ -381063,19 +385864,19 @@ # v3? If so, fail. if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : if test $opal_libnl_version -eq 3; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&5 -$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 $as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} libnl_sane=0 else - opal_libnlv1_libs="$opal_libnlv1_libs $ompi_check_fca_libs" + opal_libnlv1_libs="$opal_libnlv1_libs ucc" # 1 is the variable name to be uniq-ized opal_name=opal_libnlv1_libs @@ -381154,19 +385955,19 @@ # v1? If so, fail. if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : if test $opal_libnl_version -eq 1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&5 -$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 $as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} libnl_sane=0 else - opal_libnlv3_libs="$opal_libnlv3_libs $ompi_check_fca_libs" + opal_libnlv3_libs="$opal_libnlv3_libs ucc" # 1 is the variable name to be uniq-ized opal_name=opal_libnlv3_libs @@ -381307,11 +386108,11 @@ if test "$opal_check_package_lib_happy" = "yes"; then : # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] - if test "$ac_cv_search_fca_get_version" != "no" && - test "$ac_cv_search_fca_get_version" != "none required"; then : - scoll_fca_LIBS="$ac_cv_search_fca_get_version " + if test "$ac_cv_search_ucc_init_version" != "no" && + test "$ac_cv_search_ucc_init_version" != "none required"; then : + scoll_ucc_LIBS="$ac_cv_search_ucc_init_version " else - scoll_fca_LIBS="" + scoll_ucc_LIBS="" fi opal_check_package_happy="yes" else @@ -381330,15 +386131,15 @@ # see comment above - unset ac_cv_search_fca_get_version + unset ac_cv_search_ucc_init_version opal_check_package_lib_happy="no" if test "" != ""; then : # libdir was specified - search only there - scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L" + scoll_ucc_LDFLAGS="$scoll_ucc_LDFLAGS -L" LDFLAGS="$LDFLAGS -L" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -381351,16 +386152,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -381368,25 +386169,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -381395,22 +386196,22 @@ fi if test "$opal_check_package_lib_happy" = "no"; then : - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi else # libdir was not specified - go through search path - opal_check_package_libdir="$ompi_check_fca_dir" + opal_check_package_libdir="$ompi_check_ucc_dir" if test "$opal_check_package_libdir" = "" || \ test "$opal_check_package_libdir" = "/usr" || \ test "$opal_check_package_libdir" = "/usr/local"; then : # try as is... { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library without search path" >&5 $as_echo "looking for library without search path" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -381423,16 +386224,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -381440,25 +386241,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -381468,21 +386269,21 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi fi if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib" + scoll_ucc_LDFLAGS="$scoll_ucc_LDFLAGS -L$opal_check_package_libdir/lib" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib" >&5 $as_echo "looking for library in lib" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -381495,16 +386296,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -381512,25 +386313,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -381540,22 +386341,22 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi fi fi if test "$opal_check_package_lib_happy" = "no"; then : if test "$opal_check_package_libdir" != ""; then : - scoll_fca_LDFLAGS="$scoll_fca_LDFLAGS -L$opal_check_package_libdir/lib64" + scoll_ucc_LDFLAGS="$scoll_ucc_LDFLAGS -L$opal_check_package_libdir/lib64" LDFLAGS="$LDFLAGS -L$opal_check_package_libdir/lib64" { $as_echo "$as_me:${as_lineno-$LINENO}: result: looking for library in lib64" >&5 $as_echo "looking for library in lib64" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing fca_get_version" >&5 -$as_echo_n "checking for library containing fca_get_version... " >&6; } -if ${ac_cv_search_fca_get_version+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucc_init_version" >&5 +$as_echo_n "checking for library containing ucc_init_version... " >&6; } +if ${ac_cv_search_ucc_init_version+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -381568,16 +386369,16 @@ #ifdef __cplusplus extern "C" #endif -char fca_get_version (); +char ucc_init_version (); int main () { -return fca_get_version (); +return ucc_init_version (); ; return 0; } _ACEOF -for ac_lib in '' $ompi_check_fca_libs; do +for ac_lib in '' ucc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -381585,25 +386386,25 @@ LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_fca_get_version=$ac_res + ac_cv_search_ucc_init_version=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if ${ac_cv_search_fca_get_version+:} false; then : + if ${ac_cv_search_ucc_init_version+:} false; then : break fi done -if ${ac_cv_search_fca_get_version+:} false; then : +if ${ac_cv_search_ucc_init_version+:} false; then : else - ac_cv_search_fca_get_version=no + ac_cv_search_ucc_init_version=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_fca_get_version" >&5 -$as_echo "$ac_cv_search_fca_get_version" >&6; } -ac_res=$ac_cv_search_fca_get_version +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucc_init_version" >&5 +$as_echo "$ac_cv_search_ucc_init_version" >&6; } +ac_res=$ac_cv_search_ucc_init_version if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" opal_check_package_lib_happy="yes" @@ -381613,9 +386414,9 @@ if test "$opal_check_package_lib_happy" = "no"; then : # no go on the as is.. see what happens later... - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - unset ac_cv_search_fca_get_version + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + unset ac_cv_search_ucc_init_version fi fi fi @@ -381712,12 +386513,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lib$ompi_check_fca_libs requires libnl v1 or v3" >&5 -$as_echo_n "checking if lib$ompi_check_fca_libs requires libnl v1 or v3... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libucc requires libnl v1 or v3" >&5 +$as_echo_n "checking if libucc requires libnl v1 or v3... " >&6; } cat > conftest_c.$ac_ext << EOF -extern void fca_get_version (void); +extern void ucc_init_version (void); int main(int argc, char *argv[]) { - fca_get_version (); + ucc_init_version (); return 0; } EOF @@ -381729,14 +386530,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:381732: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS" >&5 -$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -l$ompi_check_fca_libs $LIBS $scoll_fca_LIBS 1>&5 2>&1 +echo "configure:386533: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $scoll_ucc_LIBS" >&5 +$CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucc $LIBS $scoll_ucc_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:381739: \$? = $opal_status" >&5 + echo "configure:386540: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -381756,8 +386557,8 @@ else unset opal_status - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&5 -$as_echo "$as_me: WARNING: Could not link a simple program with lib $ompi_check_fca_libs" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link a simple program with lib ucc" >&5 +$as_echo "$as_me: WARNING: Could not link a simple program with lib ucc" >&2;} fi @@ -381771,15 +386572,15 @@ # Does this library require both v1 and v3? If so, fail. if test $this_requires_v1 -eq 1 && test $this_requires_v3 -eq 1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&5 -$as_echo "$as_me: WARNING: Unfortunately, lib$ompi_check_fca_libs links to both libnl and libnl-3." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&5 +$as_echo "$as_me: WARNING: Unfortunately, libucc links to both libnl and libnl-3." >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 $as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} libnl_sane=0 fi @@ -381788,19 +386589,19 @@ # v3? If so, fail. if test $libnl_sane -eq 1 && test $this_requires_v1 -eq 1; then : if test $opal_libnl_version -eq 3; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&5 -$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas $ompi_check_fca_libs requires libnl" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv3_libs requires libnl-3 whereas ucc requires libnl" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 $as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} libnl_sane=0 else - opal_libnlv1_libs="$opal_libnlv1_libs $ompi_check_fca_libs" + opal_libnlv1_libs="$opal_libnlv1_libs ucc" # 1 is the variable name to be uniq-ized opal_name=opal_libnlv1_libs @@ -381879,19 +386680,19 @@ # v1? If so, fail. if test $libnl_sane -eq 1 && test $this_requires_v3 -eq 1; then : if test $opal_libnl_version -eq 1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&5 -$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas lib$ompi_check_fca_libs requires libnl-3" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&5 +$as_echo "$as_me: WARNING: libnl version conflict: $opal_libnlv1_libs requires libnl whereas libucc requires libnl-3" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is a configuration that is *known* to cause run-time crashes." >&5 $as_echo "$as_me: WARNING: This is a configuration that is *known* to cause run-time crashes." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&5 -$as_echo "$as_me: WARNING: This is an error in lib$ompi_check_fca_libs (not Open MPI)." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&5 -$as_echo "$as_me: WARNING: Open MPI will therefore skip using lib$ompi_check_fca_libs." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This is an error in libucc (not Open MPI)." >&5 +$as_echo "$as_me: WARNING: This is an error in libucc (not Open MPI)." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Open MPI will therefore skip using libucc." >&5 +$as_echo "$as_me: WARNING: Open MPI will therefore skip using libucc." >&2;} libnl_sane=0 else - opal_libnlv3_libs="$opal_libnlv3_libs $ompi_check_fca_libs" + opal_libnlv3_libs="$opal_libnlv3_libs ucc" # 1 is the variable name to be uniq-ized opal_name=opal_libnlv3_libs @@ -382032,11 +386833,11 @@ if test "$opal_check_package_lib_happy" = "yes"; then : # The result of AC SEARCH_LIBS is cached in $ac_cv_search_[function] - if test "$ac_cv_search_fca_get_version" != "no" && - test "$ac_cv_search_fca_get_version" != "none required"; then : - scoll_fca_LIBS="$ac_cv_search_fca_get_version " + if test "$ac_cv_search_ucc_init_version" != "no" && + test "$ac_cv_search_ucc_init_version" != "none required"; then : + scoll_ucc_LIBS="$ac_cv_search_ucc_init_version " else - scoll_fca_LIBS="" + scoll_ucc_LIBS="" fi opal_check_package_happy="yes" else @@ -382071,39 +386872,58 @@ if test "$opal_check_package_happy" = "yes"; then : - ompi_check_fca_happy="yes" + ompi_check_ucc_happy="yes" else - scoll_fca_CPPFLAGS="$opal_check_package_scoll_fca_orig_CPPFLAGS" - scoll_fca_LDFLAGS="$opal_check_package_scoll_fca_orig_LDFLAGS" - scoll_fca_LIBS="$opal_check_package_scoll_fca_orig_LIBS" - ompi_check_fca_happy="no" + scoll_ucc_CPPFLAGS="$opal_check_package_scoll_ucc_orig_CPPFLAGS" + scoll_ucc_LDFLAGS="$opal_check_package_scoll_ucc_orig_LDFLAGS" + scoll_ucc_LIBS="$opal_check_package_scoll_ucc_orig_LIBS" + ompi_check_ucc_happy="no" fi - CPPFLAGS="$opal_check_package_scoll_fca_save_CPPFLAGS" - LDFLAGS="$opal_check_package_scoll_fca_save_LDFLAGS" - LIBS="$opal_check_package_scoll_fca_save_LIBS" + CPPFLAGS="$opal_check_package_scoll_ucc_save_CPPFLAGS" + LDFLAGS="$opal_check_package_scoll_ucc_save_LDFLAGS" + LIBS="$opal_check_package_scoll_ucc_save_LIBS" + + + if test "$ompi_check_ucc_happy" = "yes"; then : + + CPPFLAGS=$coll_ucc_CPPFLAGS + LDFLAGS=$coll_ucc_LDFLAGS + LIBS=$coll_ucc_LIBS + for ac_func in ucc_comm_free +do : + ac_fn_c_check_func "$LINENO" "ucc_comm_free" "ac_cv_func_ucc_comm_free" +if test "x$ac_cv_func_ucc_comm_free" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UCC_COMM_FREE 1 +_ACEOF + +fi +done + +fi CPPFLAGS=$CPPFLAGS_save LDFLAGS=$LDFLAGS_save LIBS=$LIBS_save else - ompi_check_fca_happy="no" + ompi_check_ucc_happy=no fi - if test "$ompi_check_fca_happy" = "yes" && test "$enable_progress_threads" = "yes"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fca driver does not currently support progress threads. Disabling FCA." >&5 -$as_echo "$as_me: WARNING: fca driver does not currently support progress threads. Disabling FCA." >&2;} - ompi_check_fca_happy="no" + if test "$ompi_check_ucc_happy" = "yes" && test "$enable_progress_threads" = "yes"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ucc driver does not currently support progress threads. Disabling UCC." >&5 +$as_echo "$as_me: WARNING: ucc driver does not currently support progress threads. Disabling UCC." >&2;} + ompi_check_ucc_happy="no" fi - if test "$ompi_check_fca_happy" = "yes"; then : - scoll_fca_happy="yes" + if test "$ompi_check_ucc_happy" = "yes"; then : + scoll_ucc_happy="yes" else - if test ! -z "$with_fca" && test "$with_fca" != "no"; then : - as_fn_error $? "FCA support requested but not found. Aborting" "$LINENO" 5 + if test -n "$with_ucc" && test "$with_ucc" != "no"; then : + as_fn_error $? "UCC support requested but not found. Aborting" "$LINENO" 5 fi - scoll_fca_happy="no" + scoll_ucc_happy="no" fi @@ -382129,21 +386949,19 @@ - if test "$scoll_fca_happy" = "yes"; then : - scoll_fca_WRAPPER_EXTRA_LDFLAGS="$scoll_fca_LDFLAGS" - scoll_fca_CPPFLAGS="$scoll_fca_CPPFLAGS" - scoll_fca_WRAPPER_EXTRA_LIBS="$scoll_fca_LIBS" + if test "$scoll_ucc_happy" = "yes"; then : + scoll_ucc_WRAPPER_EXTRA_LDFLAGS="$scoll_ucc_LDFLAGS" + scoll_ucc_CPPFLAGS="$scoll_ucc_CPPFLAGS" + scoll_ucc_WRAPPER_EXTRA_LIBS="$scoll_ucc_LIBS" should_build=$should_build else should_build=0 fi - # substitute in the things needed to build fca - + # substitute in the things needed to build ucc - scoll_fca_HOME="$ompi_check_fca_dir" opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build" @@ -382154,45 +386972,45 @@ # See if it dropped an output file for us to pick up some # shell variables in. - infile="$srcdir/oshmem/mca/scoll/fca/post_configure.sh" + infile="$srcdir/oshmem/mca/scoll/ucc/post_configure.sh" # Add this subdir to the mast list of all MCA component subdirs - all_components="$all_components fca" + all_components="$all_components ucc" if test "$compile_mode" = "dso" ; then - dso_components="$dso_components fca" + dso_components="$dso_components ucc" else if test "scoll" = "common"; then # Static libraries in "common" frameworks are installed, and # therefore must obey the $FRAMEWORK_LIB_PREFIX that was # set. - static_ltlibs="mca/scoll/fca/lib${OSHMEM_LIB_PREFIX}mca_scoll_fca.la $static_ltlibs" + static_ltlibs="mca/scoll/ucc/lib${OSHMEM_LIB_PREFIX}mca_scoll_ucc.la $static_ltlibs" else # Other frameworks do not have to obey the # $FRAMEWORK_LIB_PREFIX prefix. - static_ltlibs="mca/scoll/fca/libmca_scoll_fca.la $static_ltlibs" + static_ltlibs="mca/scoll/ucc/libmca_scoll_ucc.la $static_ltlibs" fi - echo "extern const mca_base_component_t mca_scoll_fca_component;" >> $outfile.extern - echo " &mca_scoll_fca_component, " >> $outfile.struct - static_components="$static_components fca" + echo "extern const mca_base_component_t mca_scoll_ucc_component;" >> $outfile.extern + echo " &mca_scoll_ucc_component, " >> $outfile.struct + static_components="$static_components ucc" fi # Output pretty results - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:fca can compile" >&5 -$as_echo_n "checking if MCA component scoll:fca can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:ucc can compile" >&5 +$as_echo_n "checking if MCA component scoll:ucc can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } if test -f $infile; then # check for direct call header to include. This will be # AC_SUBSTed later. - if test "$DIRECT_scoll" = "fca" ; then + if test "$DIRECT_scoll" = "ucc" ; then if test "`$GREP DIRECT_CALL_HEADER $infile`" != "" ; then line="`$GREP DIRECT_CALL_HEADER $infile | cut -d= -f2-`" str="MCA_oshmem_scoll_DIRECT_CALL_HEADER=$line" eval $str else -as_fn_error $? "*** scoll component fca was supposed to be direct-called, but +as_fn_error $? "*** scoll component ucc was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -382200,8 +387018,8 @@ else # were we supposed to have found something in the # post_configure.sh, but the file didn't exist? - if test "$DIRECT_scoll" = "fca" ; then -as_fn_error $? "*** scoll component fca was supposed to be direct-called, but + if test "$DIRECT_scoll" = "ucc" ; then +as_fn_error $? "*** scoll component ucc was supposed to be direct-called, but *** does not appear to support direct calling. *** Aborting" "$LINENO" 5 fi @@ -382216,7 +387034,7 @@ # because it will link against these (without a dependency from # libmpi.so to these flags) if test "$compile_mode" = "static"; then - if test "$scoll_fca_WRAPPER_EXTRA_LDFLAGS" = ""; then : + if test "$scoll_ucc_WRAPPER_EXTRA_LDFLAGS" = ""; then : @@ -382256,7 +387074,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_fca_LDFLAGS; do + for arg in $scoll_ucc_LDFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -382337,7 +387155,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_fca_WRAPPER_EXTRA_LDFLAGS; do + for arg in $scoll_ucc_WRAPPER_EXTRA_LDFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -382379,7 +387197,7 @@ fi - if test "$scoll_fca_WRAPPER_EXTRA_LIBS" = ""; then : + if test "$scoll_ucc_WRAPPER_EXTRA_LIBS" = ""; then : @@ -382419,7 +387237,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_fca_LIBS; do + for arg in $scoll_ucc_LIBS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -382500,7 +387318,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_fca_WRAPPER_EXTRA_LIBS; do + for arg in $scoll_ucc_WRAPPER_EXTRA_LIBS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -382548,7 +387366,7 @@ # if needed, copy over WRAPPER_EXTRA_CPPFLAGS. Since a configure script # component can never be used in a STOP_AT_FIRST framework, we # don't have to implement the else clause in the literal check... - if test "$scoll_fca_WRAPPER_EXTRA_CPPFLAGS" != ""; then : + if test "$scoll_ucc_WRAPPER_EXTRA_CPPFLAGS" != ""; then : stop_at_first=0 if test "$compile_mode" = "static" && test "$stop_at_first" = "1"; then : if test "$with_devel_headers" = "yes"; then : @@ -382591,7 +387409,7 @@ opal_scope_index=`expr $opal_scope_index + 1` - for arg in $scoll_fca_WRAPPER_EXTRA_CPPFLAGS; do + for arg in $scoll_ucc_WRAPPER_EXTRA_CPPFLAGS; do opal_tmp=`echo $arg | cut -c1-2` opal_append=1 if test "$opal_tmp" = "-I" || test "$opal_tmp" = "-L" || test "$opal_tmp" = "-l"; then : @@ -382634,32 +387452,32 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_fca_WRAPPER_EXTRA_CPPFLAGS ($scoll_fca_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 -$as_echo "$as_me: WARNING: ignoring scoll_fca_WRAPPER_EXTRA_CPPFLAGS ($scoll_fca_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring scoll_ucc_WRAPPER_EXTRA_CPPFLAGS ($scoll_ucc_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&5 +$as_echo "$as_me: WARNING: ignoring scoll_ucc_WRAPPER_EXTRA_CPPFLAGS ($scoll_ucc_WRAPPER_EXTRA_CPPFLAGS): component conditions not met" >&2;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:fca can compile" >&5 -$as_echo_n "checking if MCA component scoll:fca can compile... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if MCA component scoll:ucc can compile" >&5 +$as_echo_n "checking if MCA component scoll:ucc can compile... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } # If this component was requested as the default for this # type, then abort. - if test "$with_scoll" = "fca" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"fca\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"fca\" failed to configure properly" >&2;} + if test "$with_scoll" = "ucc" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"ucc\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"ucc\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default" >&5 $as_echo "$as_me: WARNING: This component was selected as the default" >&2;} as_fn_error $? "Cannot continue" "$LINENO" 5 fi if test ! -z "$DIRECT_scoll" ; then - if test "$DIRECT_scoll" = "fca" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"fca\" failed to configure properly" >&5 -$as_echo "$as_me: WARNING: MCA component \"fca\" failed to configure properly" >&2;} + if test "$DIRECT_scoll" = "ucc" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MCA component \"ucc\" failed to configure properly" >&5 +$as_echo "$as_me: WARNING: MCA component \"ucc\" failed to configure properly" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This component was selected as the default (direct call)" >&5 $as_echo "$as_me: WARNING: This component was selected as the default (direct call)" >&2;} as_fn_error $? "Cannot continue" "$LINENO" 5 @@ -382667,23 +387485,23 @@ fi # add component to all component list - all_components="$all_components fca" + all_components="$all_components ucc" fi # set the AM_CONDITIONAL on how we should build if test "$compile_mode" = "dso"; then : - BUILD_oshmem_scoll_fca_DSO=1 + BUILD_oshmem_scoll_ucc_DSO=1 else - BUILD_oshmem_scoll_fca_DSO=0 + BUILD_oshmem_scoll_ucc_DSO=0 fi - if test "$BUILD_oshmem_scoll_fca_DSO" = "1"; then - MCA_BUILD_oshmem_scoll_fca_DSO_TRUE= - MCA_BUILD_oshmem_scoll_fca_DSO_FALSE='#' + if test "$BUILD_oshmem_scoll_ucc_DSO" = "1"; then + MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE= + MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE='#' else - MCA_BUILD_oshmem_scoll_fca_DSO_TRUE='#' - MCA_BUILD_oshmem_scoll_fca_DSO_FALSE= + MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE='#' + MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE= fi @@ -384110,14 +388928,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:384113: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 +echo "configure:388931: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:384120: \$? = $opal_status" >&5 + echo "configure:388938: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -384835,14 +389653,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:384838: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 +echo "configure:389656: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lmxm $LIBS $ompi_check_mxm_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:384845: \$? = $opal_status" >&5 + echo "configure:389663: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -386732,14 +391550,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:386735: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:391553: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:386742: \$? = $opal_status" >&5 + echo "configure:391560: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -387457,14 +392275,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:387460: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:392278: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:387467: \$? = $opal_status" >&5 + echo "configure:392285: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -388363,14 +393181,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:388366: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:393184: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:388373: \$? = $opal_status" >&5 + echo "configure:393191: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -389088,14 +393906,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:389091: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:393909: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:389098: \$? = $opal_status" >&5 + echo "configure:393916: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -393571,14 +398389,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:393574: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:398392: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:393581: \$? = $opal_status" >&5 + echo "configure:398399: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -394296,14 +399114,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:394299: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:399117: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:394306: \$? = $opal_status" >&5 + echo "configure:399124: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -395202,14 +400020,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:395205: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:400023: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:395212: \$? = $opal_status" >&5 + echo "configure:400030: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -395927,14 +400745,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:395930: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 +echo "configure:400748: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -lucp $LIBS $ompi_check_ucx_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:395937: \$? = $opal_status" >&5 + echo "configure:400755: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -398165,14 +402983,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:398168: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:402986: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:398175: \$? = $opal_status" >&5 + echo "configure:402993: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -398890,14 +403708,14 @@ # 1 is the command # 2 is actions to do if success # 3 is actions to do if fail -echo "configure:398893: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 +echo "configure:403711: $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS" >&5 $CC -o conftest $CFLAGS $CPPFLAGS conftest_c.$ac_ext $LDFLAGS -libverbs $LIBS $opal_check_openib_LIBS 1>&5 2>&1 opal_status=$? # 1 is the message # 2 is whether to put a prefix or not if test -n "1"; then - echo "configure:398900: \$? = $opal_status" >&5 + echo "configure:403718: \$? = $opal_status" >&5 else echo \$? = $opal_status >&5 fi @@ -419677,7 +424495,7 @@ Report bugs to ." lt_cl_version="\ -Open MPI config.lt 4.1.2 +Open MPI config.lt 4.1.4 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -424229,6 +429047,10 @@ as_fn_error $? "conditional \"MCA_BUILD_ompi_coll_portals4_DSO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${MCA_BUILD_ompi_coll_ucc_DSO_TRUE}" && test -z "${MCA_BUILD_ompi_coll_ucc_DSO_FALSE}"; then + as_fn_error $? "conditional \"MCA_BUILD_ompi_coll_ucc_DSO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${MCA_BUILD_ompi_crcp_bkmrk_DSO_TRUE}" && test -z "${MCA_BUILD_ompi_crcp_bkmrk_DSO_FALSE}"; then as_fn_error $? "conditional \"MCA_BUILD_ompi_crcp_bkmrk_DSO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -424469,6 +429291,10 @@ as_fn_error $? "conditional \"MCA_BUILD_oshmem_scoll_fca_DSO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE}" && test -z "${MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE}"; then + as_fn_error $? "conditional \"MCA_BUILD_oshmem_scoll_ucc_DSO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${MCA_BUILD_oshmem_spml_ikrit_DSO_TRUE}" && test -z "${MCA_BUILD_oshmem_spml_ikrit_DSO_FALSE}"; then as_fn_error $? "conditional \"MCA_BUILD_oshmem_spml_ikrit_DSO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -424914,7 +429740,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Open MPI $as_me 4.1.2, which was +This file was extended by Open MPI $as_me 4.1.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -424980,7 +429806,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Open MPI config.status 4.1.2 +Open MPI config.status 4.1.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -425795,6 +430621,7 @@ "ompi/mca/coll/hcoll/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/coll/hcoll/Makefile" ;; "ompi/mca/coll/monitoring/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/coll/monitoring/Makefile" ;; "ompi/mca/coll/portals4/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/coll/portals4/Makefile" ;; + "ompi/mca/coll/ucc/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/coll/ucc/Makefile" ;; "ompi/mca/crcp/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/crcp/Makefile" ;; "ompi/mca/crcp/bkmrk/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/crcp/bkmrk/Makefile" ;; "ompi/mca/fbtl/Makefile") CONFIG_FILES="$CONFIG_FILES ompi/mca/fbtl/Makefile" ;; @@ -425863,6 +430690,7 @@ "oshmem/mca/scoll/basic/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/scoll/basic/Makefile" ;; "oshmem/mca/scoll/mpi/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/scoll/mpi/Makefile" ;; "oshmem/mca/scoll/fca/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/scoll/fca/Makefile" ;; + "oshmem/mca/scoll/ucc/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/scoll/ucc/Makefile" ;; "oshmem/mca/spml/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/spml/Makefile" ;; "oshmem/mca/spml/ikrit/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/spml/ikrit/Makefile" ;; "oshmem/mca/spml/ucx/Makefile") CONFIG_FILES="$CONFIG_FILES oshmem/mca/spml/ucx/Makefile" ;; diff -Nru openmpi-4.1.2/configure.ac openmpi-4.1.4/configure.ac --- openmpi-4.1.2/configure.ac 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/configure.ac 2022-05-29 09:51:40.000000000 +0000 @@ -125,29 +125,10 @@ AC_MSG_ERROR([Cannot continue.])]) ]) -AC_DEFUN([OMPI_CANONICALIZE_PATH],[ - case $host_os in - darwin*) - # MacOS does not have "readlink -f" or realpath (at least as - # of MacOS Cataline / 10.15). Instead, use Python, because we - # know MacOS comes with a /usr/bin/python that has - # os.path.realpath. - $2=`/usr/bin/python -c 'import os; print os.path.realpath("'$1'")'` - ;; - *) - $2=`readlink -f $1` - ;; - esac -]) - -OMPI_CHECK_DIR_FOR_SPACES([$srcdir], [a], [source tree]) -OMPI_CANONICALIZE_PATH([$srcdir], [ompi_dir]) -OMPI_CHECK_DIR_FOR_SPACES([$ompi_dir], [an], [absolute source tree]) -OMPI_CANONICALIZE_PATH([.], [ompi_dir]) +ompi_dir=`pwd` OMPI_CHECK_DIR_FOR_SPACES([$ompi_dir], [a], [build tree]) +OMPI_CHECK_DIR_FOR_SPACES([$srcdir], [a], [source tree]) OMPI_CHECK_DIR_FOR_SPACES([$prefix], [a], [prefix]) -OMPI_CANONICALIZE_PATH([$prefix], [ompi_dir]) -OMPI_CHECK_DIR_FOR_SPACES([$ompi_dir], [an], [absolute prefix]) opal_show_subtitle "Checking versions" diff -Nru openmpi-4.1.2/contrib/dist/mofed/debian/changelog openmpi-4.1.4/contrib/dist/mofed/debian/changelog --- openmpi-4.1.2/contrib/dist/mofed/debian/changelog 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/contrib/dist/mofed/debian/changelog 2022-05-29 09:51:40.000000000 +0000 @@ -1,4 +1,4 @@ -openmpi (4.1.2) unstable; urgency=low +openmpi (4.1.4) unstable; urgency=low * Initial release. diff -Nru openmpi-4.1.2/contrib/Makefile.in openmpi-4.1.4/contrib/Makefile.in --- openmpi-4.1.2/contrib/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/contrib/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -137,6 +137,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -375,6 +376,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -411,6 +413,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1441,6 +1444,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1590,9 +1597,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1653,6 +1657,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1666,6 +1673,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/contrib/platform/mellanox/optimized.conf openmpi-4.1.4/contrib/platform/mellanox/optimized.conf --- openmpi-4.1.2/contrib/platform/mellanox/optimized.conf 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/contrib/platform/mellanox/optimized.conf 2022-05-29 09:51:40.000000000 +0000 @@ -63,6 +63,7 @@ btl = self pml_ucx_tls = any pml_ucx_devices = any +opal_common_ucx_opal_mem_hooks = 0 # Basic behavior to smooth startup mca_base_component_show_load_errors = 0 orte_abort_timeout = 10 diff -Nru openmpi-4.1.2/debian/changelog openmpi-4.1.4/debian/changelog --- openmpi-4.1.2/debian/changelog 2022-06-02 07:00:51.000000000 +0000 +++ openmpi-4.1.4/debian/changelog 2022-09-15 19:36:38.000000000 +0000 @@ -1,4 +1,4 @@ -openmpi (4.1.2-2~16.04.sav0) xenial; urgency=medium +openmpi (4.1.4-2~16.04.sav0) xenial; urgency=medium * Backport to Xenial * debian/control: Add dh-exec BD (compat level < 13) @@ -9,9 +9,44 @@ - debian/control: Add g++ (>= 4:9.3.0-1~) BD (ppa:savoury1/gcc-defaults-9) * Due psm2 requiring kernel >= 4.5 (psm2 uses event types not in kernel 4.4): - debian/control: Remove libpsm2-dev build dependency - - debian/rules: Change "PSM2_ARCH= amd64" to "PSM2_ARCH= none" + - debian/rules: Change "PSM2_ARCH:= amd64" -> "PSM2_ARCH:= none" - -- Rob Savoury Thu, 02 Jun 2022 00:00:51 -0700 + -- Rob Savoury Thu, 15 Sep 2022 12:36:38 -0700 + +openmpi (4.1.4-2) unstable; urgency=medium + + * Fix broken oshmem symlink. Closes: #1009748 + + -- Alastair McKinstry Sat, 03 Sep 2022 15:47:37 +0100 + +openmpi (4.1.4-1) unstable; urgency=medium + + * New upstream release + * Update links: + - libmpi.so.40.30.3 -> libmpi.so.40.30.4 + - /libmca_common_ompio.so.41.29.3 -> /libmca_common_ompio.so.41.29.4 + * Standards-Versoin: 4.6.1 + + -- Alastair McKinstry Sun, 29 May 2022 10:51:27 +0100 + +openmpi (4.1.3-2) unstable; urgency=medium + + * Update links: + - libmca_common_ompio.so.41.29.2 -> libmca_common_ompio.so.41.29.3 + - libmca_common_ucx.so.40.30.1 -> libmca_common_ucx.so.40.30.2 + Closes: #1008966 + * Fix autopkgtest that was incorrectly silent: Closes: #1009263 + + -- Alastair McKinstry Mon, 11 Apr 2022 08:32:17 +0100 + +openmpi (4.1.3-1) unstable; urgency=medium + + * New upstream release + * Update links: + - libmpi.so.40.30.2 -> libmpi.so.4.0.30.2 + - libompitrace.so.40.30.0 -> libompitrace.so.40.30.1 + + -- Alastair McKinstry Sat, 02 Apr 2022 09:05:27 +0100 openmpi (4.1.2-2) unstable; urgency=medium diff -Nru openmpi-4.1.2/debian/control openmpi-4.1.4/debian/control --- openmpi-4.1.2/debian/control 2022-06-02 03:01:22.000000000 +0000 +++ openmpi-4.1.4/debian/control 2022-09-15 19:36:24.000000000 +0000 @@ -22,7 +22,7 @@ default-jdk [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !alpha !ppc64 !sparc64] , flex Build-Conflicts: libmpich-dev, libopenmpi-dev -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Homepage: https://www.open-mpi.org/ Vcs-Browser: https://salsa.debian.org/hpc-team/openmpi Vcs-Git: https://salsa.debian.org/hpc-team/openmpi.git -b debian/latest @@ -126,7 +126,7 @@ Section: doc Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends} +Depends: ${misc:Depends}, libjs-jquery-ui Conflicts: mpi-doc, lam-mpidoc, lam4-dev, openmpi-doc Replaces: libopenmpi-dev (<< 4.1.2~rc1-4) Breaks: libopenmpi-dev (<< 4.1.2~rc1-4) diff -Nru openmpi-4.1.2/debian/libopenmpi3.links openmpi-4.1.4/debian/libopenmpi3.links --- openmpi-4.1.2/debian/libopenmpi3.links 2022-06-02 02:47:37.000000000 +0000 +++ openmpi-4.1.4/debian/libopenmpi3.links 2022-09-15 19:34:29.000000000 +0000 @@ -5,11 +5,11 @@ usr/lib/${DEB_HOST_MULTIARCH}/libmpi_cxx.so.40.30.1 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_cxx.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh-gfortran.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh-gfortran.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_mpifh.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40.30.2 usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40.30.4 usr/lib/${DEB_HOST_MULTIARCH}/libmpi.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08-gfortran.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempif08-gfortran.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr-gfortran.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libmpi_usempi_ignore_tkr-gfortran.so.40 -usr/lib/${DEB_HOST_MULTIARCH}/libompitrace.so.40.30.0 usr/lib/${DEB_HOST_MULTIARCH}/libompitrace.so.40 +usr/lib/${DEB_HOST_MULTIARCH}/libompitrace.so.40.30.1 usr/lib/${DEB_HOST_MULTIARCH}/libompitrace.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libopen-pal.so.40.30.2 usr/lib/${DEB_HOST_MULTIARCH}/libopen-pal.so.40 usr/lib/${DEB_HOST_MULTIARCH}/libopen-rte.so.40.30.2 usr/lib/${DEB_HOST_MULTIARCH}/libopen-rte.so.40 diff -Nru openmpi-4.1.2/debian/rules openmpi-4.1.4/debian/rules --- openmpi-4.1.2/debian/rules 2022-06-02 06:58:49.000000000 +0000 +++ openmpi-4.1.4/debian/rules 2022-09-15 19:35:27.000000000 +0000 @@ -239,8 +239,8 @@ dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshCC.1 ; \ dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshc++.1 ; \ dh_installman -p openmpi-bin $(DESTDIR)/usr/share/man/man1/oshcxx.1 ; \ - dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/liboshmem.so.40.30.1 $(LIBDIR) ; \ - dh_link -p libopenmpi3 $(LIBDIR)/liboshmem.so.40.30.1 $(LIBDIR)/liboshmem.so.40 ; \ + dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/liboshmem.so.40.30.2 $(LIBDIR) ; \ + dh_link -p libopenmpi3 $(LIBDIR)/liboshmem.so.40.30.2 $(LIBDIR)/liboshmem.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/liboshmem.so.40 $(LIBDIR)/openmpi/lib/liboshmem.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/liboshmem.so.40 $(LIBDIR)/liboshmem.so ; \ fi @@ -253,9 +253,9 @@ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_java.so.40 $(LIBDIR)/openmpi/lib/libmpi_java.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmpi_java.so.40 $(LIBDIR)/libmpi_java.so ; \ fi - if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.1 ; then \ - dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.1 $(LIBDIR); \ - dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ucx.so.40.30.1 $(LIBDIR)/libmca_common_ucx.so.40 ; \ + if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 ; then \ + dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ucx.so.40.30.2 $(LIBDIR); \ + dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ucx.so.40.30.2 $(LIBDIR)/libmca_common_ucx.so.40 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ucx.so.40 $(LIBDIR)/openmpi/lib/libmca_common_ucx.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ucx.so.40 $(LIBDIR)/libmca_common_ucx.so ; \ fi @@ -272,9 +272,9 @@ dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ofi.so.10 $(LIBDIR)/openmpi/lib/libmca_common_ofi.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ofi.so.10 $(LIBDIR)/libmca_common_ofi.so ; \ fi - if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.2; then \ - dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.2 $(LIBDIR) ; \ - dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ompio.so.41.29.2 $(LIBDIR)/libmca_common_ompio.so.41 ; \ + if test -f $(DESTDIR)/$(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4; then \ + dh_install -p libopenmpi3 $(LIBDIR)/openmpi/lib/libmca_common_ompio.so.41.29.4 $(LIBDIR) ; \ + dh_link -p libopenmpi3 $(LIBDIR)/libmca_common_ompio.so.41.29.4 $(LIBDIR)/libmca_common_ompio.so.41 ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ompio.so.41 $(LIBDIR)/openmpi/lib/libmca_common_ompio.so ; \ dh_link -p libopenmpi-dev $(LIBDIR)/libmca_common_ompio.so.41 $(LIBDIR)/libmca_common_ompio.so ; \ fi diff -Nru openmpi-4.1.2/debian/tests/check_shared_objs openmpi-4.1.4/debian/tests/check_shared_objs --- openmpi-4.1.2/debian/tests/check_shared_objs 2022-03-01 12:39:43.000000000 +0000 +++ openmpi-4.1.4/debian/tests/check_shared_objs 2022-09-03 14:47:37.000000000 +0000 @@ -3,7 +3,7 @@ # Ensure all mca shared objects, etc are ok -ompi_info --all 2>&1 | grep -q "cannot open shared object file" +ompi_info --all 2>&1 | grep "cannot open shared object file" [ $? -eq 1 ] diff -Nru openmpi-4.1.2/examples/ring_c.c openmpi-4.1.4/examples/ring_c.c --- openmpi-4.1.2/examples/ring_c.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/examples/ring_c.c 2022-05-29 09:51:40.000000000 +0000 @@ -27,7 +27,7 @@ next = (rank + 1) % size; prev = (rank + size - 1) % size; - /* If we are the "master" process (i.e., MPI_COMM_WORLD rank 0), + /* If we are the "manager" process (i.e., MPI_COMM_WORLD rank 0), put the number of times to go around the ring in the message. */ diff -Nru openmpi-4.1.2/examples/ring_cxx.cc openmpi-4.1.4/examples/ring_cxx.cc --- openmpi-4.1.2/examples/ring_cxx.cc 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/examples/ring_cxx.cc 2022-05-29 09:51:40.000000000 +0000 @@ -34,7 +34,7 @@ next = (rank + 1) % size; prev = (rank + size - 1) % size; - // If we are the "master" process (i.e., MPI_COMM_WORLD rank 0), + // If we are the "manager" process (i.e., MPI_COMM_WORLD rank 0), // put the number of times to go around the ring in the message. if (0 == rank) { diff -Nru openmpi-4.1.2/examples/Ring.java openmpi-4.1.4/examples/Ring.java --- openmpi-4.1.2/examples/Ring.java 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/examples/Ring.java 2022-05-29 09:51:40.000000000 +0000 @@ -29,7 +29,7 @@ next = (myrank + 1) % size; prev = (myrank + size - 1) % size; - /* If we are the "master" process (i.e., MPI_COMM_WORLD rank 0), + /* If we are the "manager" process (i.e., MPI_COMM_WORLD rank 0), put the number of times to go around the ring in the message. */ diff -Nru openmpi-4.1.2/examples/ring_mpifh.f openmpi-4.1.4/examples/ring_mpifh.f --- openmpi-4.1.2/examples/ring_mpifh.f 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/examples/ring_mpifh.f 2022-05-29 09:51:40.000000000 +0000 @@ -2,7 +2,7 @@ C Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana C University Research and Technology C Corporation. All rights reserved. -C Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. +C Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved C $COPYRIGHT$ C C Simple ring test program using the mpif.h Fortran bindings. @@ -26,7 +26,7 @@ next = mod((rank + 1), size) from = mod((rank + size - 1), size) -C If we are the "master" process (i.e., MPI_COMM_WORLD rank 0), put +C If we are the "manager" process (i.e., MPI_COMM_WORLD rank 0), put C the number of times to go around the ring in the message. if (rank .eq. 0) then diff -Nru openmpi-4.1.2/examples/ring_usempif08.f90 openmpi-4.1.4/examples/ring_usempif08.f90 --- openmpi-4.1.2/examples/ring_usempif08.f90 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/examples/ring_usempif08.f90 2022-05-29 09:51:40.000000000 +0000 @@ -3,7 +3,7 @@ ! Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana ! University Research and Technology ! Corporation. All rights reserved. -! Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. +! Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved ! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! All rights reserved. ! $COPYRIGHT$ @@ -29,7 +29,7 @@ next = mod((rank + 1), size) from = mod((rank + size - 1), size) -! If we are the "master" process (i.e., MPI_COMM_WORLD rank 0), put +! If we are the "manager" process (i.e., MPI_COMM_WORLD rank 0), put ! the number of times to go around the ring in the message. if (rank .eq. 0) then diff -Nru openmpi-4.1.2/examples/ring_usempi.f90 openmpi-4.1.4/examples/ring_usempi.f90 --- openmpi-4.1.2/examples/ring_usempi.f90 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/examples/ring_usempi.f90 2022-05-29 09:51:40.000000000 +0000 @@ -2,7 +2,7 @@ ! Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana ! University Research and Technology ! Corporation. All rights reserved. -! Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. +! Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved ! $COPYRIGHT$ ! ! Simple ring test program using the Fortran mpi module bindings. @@ -25,7 +25,7 @@ next = mod((rank + 1), size) from = mod((rank + size - 1), size) -! If we are the "master" process (i.e., MPI_COMM_WORLD rank 0), put +! If we are the "manager" process (i.e., MPI_COMM_WORLD rank 0), put ! the number of times to go around the ring in the message. if (rank .eq. 0) then diff -Nru openmpi-4.1.2/Makefile.in openmpi-4.1.4/Makefile.in --- openmpi-4.1.2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -163,6 +163,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -401,6 +402,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -437,6 +439,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1537,6 +1540,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1686,9 +1693,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1749,6 +1753,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1762,6 +1769,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/NEWS openmpi-4.1.4/NEWS --- openmpi-4.1.2/NEWS 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/NEWS 2022-05-29 09:51:40.000000000 +0000 @@ -8,7 +8,7 @@ University of Stuttgart. All rights reserved. Copyright (c) 2004-2006 The Regents of the University of California. All rights reserved. -Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved. +Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved. Copyright (c) 2006 Voltaire, Inc. All rights reserved. Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. @@ -20,7 +20,7 @@ Copyright (c) 2012 University of Houston. All rights reserved. Copyright (c) 2013 NVIDIA Corporation. All rights reserved. Copyright (c) 2013-2018 Intel, Inc. All rights reserved. -Copyright (c) 2018-2021 Amazon.com, Inc. or its affiliates. All Rights +Copyright (c) 2018-2022 Amazon.com, Inc. or its affiliates. All Rights reserved. Copyright (c) 2019-2021 Triad National Security, LLC. All rights reserved. @@ -58,6 +58,64 @@ (** also appeared: A.B.C) -- indicating that this item was previously included in release version vA.B.C. +4.1.4 -- May, 2022 +------------------ + +- Fix possible length integer overflow in numerous non-blocking collective + operations. +- Fix segmentation fault in UCX if MPI Tool interface is finalized before + MPI_Init is called. +- Remove /usr/bin/python dependency in configure. +- Fix OMPIO issue with long double etypes. +- Update treematch topology component to fix numerous correctness issues. +- Fix memory leak in UCX MCA parameter registration. +- Fix long operation closing file descriptors on non-Linux systems that + can appear as a hang to users. +- Fix for attribute handling on GCC 11 due to pointer aliasing. +- Fix multithreaded race in UCX PML's datatype handling. +- Fix a correctness issue in CUDA Reduce algorithm. +- Fix compilation issue with CUDA GPUDirect RDMA support. +- Fix to make shmem_calloc(..., 0) conform to the OpenSHMEM specification. +- Add UCC collectives component. +- Fix divide by zero issue in OMPI IO component. +- Fix compile issue with libnl when not in standard search locations. + + +4.1.3 -- March, 2022 +-------------------- + +- Fixed a seg fault in the smcuda BTL. Thanks to Moritz Kreutzer and + @Stadik for reporting the issue. +- Added support for ELEMENTAL to the MPI handle comparison functions + in the mpi_f08 module. Thanks to Salvatore Filippone for raising + the issue. +- Minor datatype performance improvements in the CUDA-based code paths. +- Fix MPI_ALLTOALLV when used with MPI_IN_PLACE. +- Fix MPI_BOTTOM handling for non-blocking collectives. Thanks to + Lisandro Dalcin for reporting the problem. +- Enable OPAL memory hooks by default for UCX. +- Many compiler warnings fixes, particularly for newer versions of + GCC. +- Fix intercommunicator overflow with large payload collectives. Also + fixed MPI_REDUCE_SCATTER_BLOCK for similar issues with large payload + collectives. +- Back-port ROMIO 3.3 fix to use stat64() instead of stat() on GPFS. +- Fixed several non-blocking MPI collectives to not round fractions + based on float precision. +- Fix compile failure for --enable-heterogeneous. Also updated the + README to clarify that --enable-heterogeneous is functional, but + still not recomended for most environments. +- Minor fixes to OMPIO, including: + - Fixing the open behavior of shared memory shared file pointers. + Thanks to Axel Huebl for reporting the issue + - Fixes to clean up lockfiles when closing files. Thanks to Eric + Chamberland for reporting the issue. +- Update LSF configure failure output to be more clear (e.g., on RHEL + platforms). +- Update if_[in|ex]clude behavior in btl_tcp and oob_tcp to select + *all* interfaces that fall within the specified subnet range. + + 4.1.2 -- November, 2021 ----------------------- diff -Nru openmpi-4.1.2/ompi/attribute/attribute.c openmpi-4.1.4/ompi/attribute/attribute.c --- openmpi-4.1.2/ompi/attribute/attribute.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/attribute/attribute.c 2022-05-29 09:51:40.000000000 +0000 @@ -124,15 +124,15 @@ * ompi_set_attr_int(..., foo, ...) * * 4. C reads the attribute value. The value returned is a pointer - * that points to an int that has a value - * of 7. + * that points to an int that has a value of 7. * * Example: int *ret; * MPI_Attr_get(..., &ret); * -> *ret will equal 7. * - * 5. Fortran MPI-1 reads the attribute value. This is the unity - * case; the same value is returned. + * 5. Fortran MPI-1 reads the attribute value. The C int value is + * cast to a fortran INTEGER (i.e., MPI_Fint) -- potentially being + * truncated if sizeof(int) > sizeof(INTEGER). * * Example: INTEGER ret * CALL MPI_ATTR_GET(..., ret, ierr) @@ -158,7 +158,7 @@ * that points to an INTEGER (i.e., an MPI_Fint) that has a value * of 7. * --> NOTE: The external MPI interface does not distinguish between - * this case and case 7. It is the programer's responsibility + * this case and case 10. It is the programer's responsibility * to code accordingly. * * Example: MPI_Fint *ret; @@ -197,7 +197,7 @@ * that points to an INTEGER(KIND=MPI_ADDRESS_KIND) (i.e., a void*) * that has a value of 12. * --> NOTE: The external MPI interface does not distinguish between - * this case and case 4. It is the programer's responsibility + * this case and case 7. It is the programer's responsibility * to code accordingly. * * Example A: MPI_Aint *ret; @@ -346,8 +346,8 @@ if (MPI_SUCCESS != OMPI_FINT_2_INT(f_err)) { \ err = OMPI_FINT_2_INT(f_err); \ } else { \ - out_attr->av_value = (void*) 0; \ - *out_attr->av_fint_pointer = out; \ + out_attr->av_value.av_fint = out; \ + out_attr->av_set_from = OMPI_ATTRIBUTE_FINT; \ flag = OMPI_LOGICAL_2_INT(f_flag); \ } \ } \ @@ -364,7 +364,8 @@ if (MPI_SUCCESS != OMPI_FINT_2_INT(f_err)) { \ err = OMPI_FINT_2_INT(f_err); \ } else { \ - out_attr->av_value = (void *) out; \ + out_attr->av_value.av_aint = out; \ + out_attr->av_set_from = OMPI_ATTRIBUTE_AINT; \ flag = OMPI_LOGICAL_2_INT(f_flag); \ } \ } \ @@ -376,8 +377,9 @@ if ((err = (*((keyval_obj->copy_attr_fn).attr_##type##_copy_fn)) \ ((ompi_##type##_t *)old_object, key, keyval_obj->extra_state.c_ptr, \ in, &out, &flag, (ompi_##type##_t *)(new_object))) == MPI_SUCCESS) { \ - out_attr->av_value = out; \ - } \ + out_attr->av_value.av_pointer = out; \ + out_attr->av_set_from = OMPI_ATTRIBUTE_C; \ + } \ } \ OPAL_THREAD_LOCK(&attribute_lock); \ } while (0) @@ -386,52 +388,57 @@ * Cases for attribute values */ typedef enum ompi_attribute_translate_t { + OMPI_ATTRIBUTE_INVALID = -1, OMPI_ATTRIBUTE_C, OMPI_ATTRIBUTE_INT, OMPI_ATTRIBUTE_FINT, - OMPI_ATTRIBUTE_AINT + OMPI_ATTRIBUTE_AINT, } ompi_attribute_translate_t; +typedef union attribute_value_t { + MPI_Fint av_fint; + MPI_Aint av_aint; + int av_int; + void *av_pointer; +} attribute_value_t; + /* * struct to hold attribute values on each MPI object */ -typedef struct attribute_value_t { +typedef struct attribute_key_value_t { opal_object_t super; int av_key; - void *av_value; - int *av_int_pointer; - MPI_Fint *av_fint_pointer; - MPI_Aint *av_aint_pointer; - int av_set_from; + attribute_value_t av_value; + ompi_attribute_translate_t av_set_from; int av_sequence; -} attribute_value_t; +} attribute_key_value_t; /* * Local functions */ -static void attribute_value_construct(attribute_value_t *item); +static void attribute_key_value_construct(attribute_key_value_t *item); static void ompi_attribute_keyval_construct(ompi_attribute_keyval_t *keyval); static void ompi_attribute_keyval_destruct(ompi_attribute_keyval_t *keyval); static int set_value(ompi_attribute_type_t type, void *object, opal_hash_table_t **attr_hash, int key, - attribute_value_t *new_attr, + attribute_key_value_t *new_attr, bool predefined); static int get_value(opal_hash_table_t *attr_hash, int key, - attribute_value_t **attribute, int *flag); -static void *translate_to_c(attribute_value_t *val); -static MPI_Fint translate_to_fint(attribute_value_t *val); -static MPI_Aint translate_to_aint(attribute_value_t *val); + attribute_key_value_t **attribute, int *flag); +static void *translate_to_c(attribute_key_value_t *val); +static MPI_Fint translate_to_fint(attribute_key_value_t *val); +static MPI_Aint translate_to_aint(attribute_key_value_t *val); static int compare_attr_sequence(const void *attr1, const void *attr2); /* - * attribute_value_t class + * attribute_key_value_t class */ -static OBJ_CLASS_INSTANCE(attribute_value_t, +static OBJ_CLASS_INSTANCE(attribute_key_value_t, opal_object_t, - attribute_value_construct, + attribute_key_value_construct, NULL); @@ -451,8 +458,6 @@ static opal_hash_table_t *keyval_hash; static opal_bitmap_t *key_bitmap; static int attr_sequence; -static unsigned int int_pos = 12345; -static unsigned int integer_pos = 12345; /* * MPI attributes are *not* high performance, so just use a One Big Lock @@ -461,17 +466,14 @@ */ static opal_mutex_t attribute_lock; - /* - * attribute_value_t constructor function + * attribute_key_value_t constructor function */ -static void attribute_value_construct(attribute_value_t *item) +static void attribute_key_value_construct(attribute_key_value_t *item) { item->av_key = MPI_KEYVAL_INVALID; - item->av_aint_pointer = (MPI_Aint*) &item->av_value; - item->av_int_pointer = (int *)&item->av_value + int_pos; - item->av_fint_pointer = (MPI_Fint *)&item->av_value + integer_pos; - item->av_set_from = 0; + item->av_value.av_aint = 0; + item->av_set_from = OMPI_ATTRIBUTE_INVALID; item->av_sequence = -1; } @@ -520,8 +522,6 @@ int ompi_attr_init(void) { int ret; - void *bogus = (void*) 1; - int *p = (int *) &bogus; keyval_hash = OBJ_NEW(opal_hash_table_t); if (NULL == keyval_hash) { @@ -536,20 +536,6 @@ return OMPI_ERR_OUT_OF_RESOURCE; } - for (int_pos = 0; int_pos < (sizeof(void*) / sizeof(int)); - ++int_pos) { - if (p[int_pos] == 1) { - break; - } - } - - for (integer_pos = 0; integer_pos < (sizeof(void*) / sizeof(MPI_Fint)); - ++integer_pos) { - if (p[integer_pos] == 1) { - break; - } - } - OBJ_CONSTRUCT(&attribute_lock, opal_mutex_t); if (OMPI_SUCCESS != (ret = opal_hash_table_init(keyval_hash, @@ -721,14 +707,14 @@ int key, void *attribute, bool predefined) { int ret; - attribute_value_t *new_attr = OBJ_NEW(attribute_value_t); + attribute_key_value_t *new_attr = OBJ_NEW(attribute_key_value_t); if (NULL == new_attr) { return OMPI_ERR_OUT_OF_RESOURCE; } OPAL_THREAD_LOCK(&attribute_lock); - new_attr->av_value = attribute; + new_attr->av_value.av_pointer = attribute; new_attr->av_set_from = OMPI_ATTRIBUTE_C; ret = set_value(type, object, attr_hash, key, new_attr, predefined); if (OMPI_SUCCESS != ret) { @@ -751,15 +737,14 @@ int key, int attribute, bool predefined) { int ret; - attribute_value_t *new_attr = OBJ_NEW(attribute_value_t); + attribute_key_value_t *new_attr = OBJ_NEW(attribute_key_value_t); if (NULL == new_attr) { return OMPI_ERR_OUT_OF_RESOURCE; } OPAL_THREAD_LOCK(&attribute_lock); - new_attr->av_value = (void *) 0; - *new_attr->av_int_pointer = attribute; + new_attr->av_value.av_int = attribute; new_attr->av_set_from = OMPI_ATTRIBUTE_INT; ret = set_value(type, object, attr_hash, key, new_attr, predefined); if (OMPI_SUCCESS != ret) { @@ -783,15 +768,14 @@ bool predefined) { int ret; - attribute_value_t *new_attr = OBJ_NEW(attribute_value_t); + attribute_key_value_t *new_attr = OBJ_NEW(attribute_key_value_t); if (NULL == new_attr) { return OMPI_ERR_OUT_OF_RESOURCE; } OPAL_THREAD_LOCK(&attribute_lock); - new_attr->av_value = (void *) 0; - *new_attr->av_fint_pointer = attribute; + new_attr->av_value.av_fint = attribute; new_attr->av_set_from = OMPI_ATTRIBUTE_FINT; ret = set_value(type, object, attr_hash, key, new_attr, predefined); if (OMPI_SUCCESS != ret) { @@ -815,14 +799,14 @@ bool predefined) { int ret; - attribute_value_t *new_attr = OBJ_NEW(attribute_value_t); + attribute_key_value_t *new_attr = OBJ_NEW(attribute_key_value_t); if (NULL == new_attr) { return OMPI_ERR_OUT_OF_RESOURCE; } OPAL_THREAD_LOCK(&attribute_lock); - new_attr->av_value = (void *) attribute; + new_attr->av_value.av_aint = attribute; new_attr->av_set_from = OMPI_ATTRIBUTE_AINT; ret = set_value(type, object, attr_hash, key, new_attr, predefined); if (OMPI_SUCCESS != ret) { @@ -844,7 +828,7 @@ int ompi_attr_get_c(opal_hash_table_t *attr_hash, int key, void **attribute, int *flag) { - attribute_value_t *val = NULL; + attribute_key_value_t *val = NULL; int ret; OPAL_THREAD_LOCK(&attribute_lock); @@ -867,7 +851,7 @@ int ompi_attr_get_fint(opal_hash_table_t *attr_hash, int key, MPI_Fint *attribute, int *flag) { - attribute_value_t *val = NULL; + attribute_key_value_t *val = NULL; int ret; OPAL_THREAD_LOCK(&attribute_lock); @@ -890,7 +874,7 @@ int ompi_attr_get_aint(opal_hash_table_t *attr_hash, int key, MPI_Aint *attribute, int *flag) { - attribute_value_t *val = NULL; + attribute_key_value_t *val = NULL; int ret; OPAL_THREAD_LOCK(&attribute_lock); @@ -921,7 +905,7 @@ uint32_t key; int flag; void *node, *in_node; - attribute_value_t *old_attr, *new_attr; + attribute_key_value_t *old_attr, *new_attr; ompi_attribute_keyval_t *hash_value; /* If there's nothing to do, just return */ @@ -951,7 +935,7 @@ } err = 0; - new_attr = OBJ_NEW(attribute_value_t); + new_attr = OBJ_NEW(attribute_key_value_t); switch (type) { case COMM_ATTR: /* Now call the copy_attr_fn */ @@ -1033,7 +1017,7 @@ { ompi_attribute_keyval_t *keyval; int ret = OMPI_SUCCESS; - attribute_value_t *attr; + attribute_key_value_t *attr; /* Check if the key is valid in the master keyval hash */ ret = opal_hash_table_get_value_uint32(keyval_hash, key, @@ -1123,7 +1107,7 @@ int ret, i, num_attrs; uint32_t key; void *node, *in_node, *attr; - attribute_value_t **attrs; + attribute_key_value_t **attrs; /* Ensure that the table is not empty */ @@ -1140,7 +1124,7 @@ return MPI_SUCCESS; } - attrs = malloc(sizeof(attribute_value_t *) * num_attrs); + attrs = malloc(sizeof(attribute_key_value_t *) * num_attrs); if (NULL == attrs) { OPAL_THREAD_UNLOCK(&attribute_lock); return OMPI_ERR_OUT_OF_RESOURCE; @@ -1155,7 +1139,7 @@ } /* Sort attributes in the order that they were set */ - qsort(attrs, num_attrs, sizeof(attribute_value_t *), compare_attr_sequence); + qsort(attrs, num_attrs, sizeof(attribute_key_value_t *), compare_attr_sequence); /* Delete attributes in the reverse order that they were set. Actually this ordering is required only for MPI_COMM_SELF, as @@ -1186,12 +1170,12 @@ */ static int set_value(ompi_attribute_type_t type, void *object, opal_hash_table_t **attr_hash, int key, - attribute_value_t *new_attr, + attribute_key_value_t *new_attr, bool predefined) { ompi_attribute_keyval_t *keyval; int ret; - attribute_value_t *old_attr; + attribute_key_value_t *old_attr; bool had_old = false; /* Note that this function can be invoked by ompi_attr_copy_all() @@ -1275,7 +1259,7 @@ * Assumes that you do NOT already have the attribute lock. */ static int get_value(opal_hash_table_t *attr_hash, int key, - attribute_value_t **attribute, int *flag) + attribute_key_value_t **attribute, int *flag) { int ret; void *attr; @@ -1301,7 +1285,7 @@ ret = opal_hash_table_get_value_uint32(attr_hash, key, &attr); if (OMPI_SUCCESS == ret) { - *attribute = (attribute_value_t*)attr; + *attribute = (attribute_key_value_t*)attr; *flag = 1; } @@ -1317,25 +1301,25 @@ * This function does not fail -- it is only invoked in "safe" * situations. */ -static void *translate_to_c(attribute_value_t *val) +static void *translate_to_c(attribute_key_value_t *val) { switch (val->av_set_from) { case OMPI_ATTRIBUTE_C: /* Case 1: wrote a C pointer, read a C pointer (unity) */ - return val->av_value; + return val->av_value.av_pointer; case OMPI_ATTRIBUTE_INT: /* Case 4: wrote an int, read a C pointer */ - return (void *) val->av_int_pointer; + return &val->av_value.av_int; case OMPI_ATTRIBUTE_FINT: /* Case 7: wrote a MPI_Fint, read a C pointer */ - return (void *) val->av_fint_pointer; + return &val->av_value.av_fint; case OMPI_ATTRIBUTE_AINT: /* Case 10: wrote a MPI_Aint, read a C pointer */ - return (void *) val->av_aint_pointer; + return &val->av_value.av_aint; default: /* Should never reach here */ @@ -1351,25 +1335,25 @@ * This function does not fail -- it is only invoked in "safe" * situations. */ -static MPI_Fint translate_to_fint(attribute_value_t *val) +static MPI_Fint translate_to_fint(attribute_key_value_t *val) { switch (val->av_set_from) { case OMPI_ATTRIBUTE_C: /* Case 2: wrote a C pointer, read a MPI_Fint */ - return (MPI_Fint)*val->av_int_pointer; + return (MPI_Fint)(intptr_t)val->av_value.av_pointer; case OMPI_ATTRIBUTE_INT: /* Case 5: wrote an int, read a MPI_Fint */ - return (MPI_Fint)*val->av_int_pointer; + return (MPI_Fint)val->av_value.av_int; case OMPI_ATTRIBUTE_FINT: /* Case 8: wrote a MPI_Fint, read a MPI_Fint (unity) */ - return *val->av_fint_pointer; + return val->av_value.av_fint; case OMPI_ATTRIBUTE_AINT: /* Case 11: wrote a MPI_Aint, read a MPI_Fint */ - return (MPI_Fint)*val->av_fint_pointer; + return (MPI_Fint)val->av_value.av_aint; default: /* Should never reach here */ @@ -1385,25 +1369,25 @@ * This function does not fail -- it is only invoked in "safe" * situations. */ -static MPI_Aint translate_to_aint(attribute_value_t *val) +static MPI_Aint translate_to_aint(attribute_key_value_t *val) { switch (val->av_set_from) { case OMPI_ATTRIBUTE_C: /* Case 3: wrote a C pointer, read a MPI_Aint */ - return (MPI_Aint) val->av_value; + return (MPI_Aint) val->av_value.av_pointer; case OMPI_ATTRIBUTE_INT: /* Case 6: wrote an int, read a MPI_Aint */ - return (MPI_Aint) *val->av_int_pointer; + return (MPI_Aint) val->av_value.av_int; case OMPI_ATTRIBUTE_FINT: /* Case 9: wrote a MPI_Fint, read a MPI_Aint */ - return (MPI_Aint) *val->av_fint_pointer; + return (MPI_Aint) val->av_value.av_fint; case OMPI_ATTRIBUTE_AINT: /* Case 12: wrote a MPI_Aint, read a MPI_Aint (unity) */ - return (MPI_Aint) val->av_value; + return val->av_value.av_aint; default: /* Should never reach here */ @@ -1416,6 +1400,6 @@ */ static int compare_attr_sequence(const void *attr1, const void *attr2) { - return (*(attribute_value_t **)attr1)->av_sequence - - (*(attribute_value_t **)attr2)->av_sequence; + return (*(attribute_key_value_t **)attr1)->av_sequence - + (*(attribute_key_value_t **)attr2)->av_sequence; } diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/allgather.c openmpi-4.1.4/ompi/contrib/libompitrace/allgather.c --- openmpi-4.1.2/ompi/contrib/libompitrace/allgather.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/allgather.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -38,8 +38,18 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(sendtype, sendtypename, &len); - PMPI_Type_get_name(recvtype, recvtypename, &len); + if (sendtype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(sendtype, sendtypename, &len); + } else { + strncpy(sendtypename, "MPI_DATATYPE_NULL", + sizeof(sendtypename)); + } + if (recvtype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(recvtype, recvtypename, &len); + } else { + strncpy(recvtypename, "MPI_DATATYPE_NULL", + sizeof(recvtypename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_ALLGATHER[%d]: sendbuf %0" PRIxPTR " sendcount %d sendtype %s\n\trecvbuf %0" PRIxPTR " recvcount %d recvtype %s comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/allgatherv.c openmpi-4.1.4/ompi/contrib/libompitrace/allgatherv.c --- openmpi-4.1.2/ompi/contrib/libompitrace/allgatherv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/allgatherv.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -38,8 +38,18 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(sendtype, sendtypename, &len); - PMPI_Type_get_name(recvtype, recvtypename, &len); + if (sendtype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(sendtype, sendtypename, &len); + } else { + strncpy(sendtypename, "MPI_DATATYPE_NULL", + sizeof(sendtypename)); + } + if (recvtype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(recvtype, recvtypename, &len); + } else { + strncpy(recvtypename, "MPI_DATATYPE_NULL", + sizeof(recvtypename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_ALLGATHERV[%d]: sendbuf %0" PRIxPTR " sendcount %d sendtype %s\n\trecvbuf %0" PRIxPTR " recvtype %s comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/allreduce.c openmpi-4.1.4/ompi/contrib/libompitrace/allreduce.c --- openmpi-4.1.2/ompi/contrib/libompitrace/allreduce.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/allreduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -36,7 +36,11 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(datatype, typename, &len); + if (datatype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(datatype, typename, &len); + } else { + strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_ALLREDUCE[%d]: sendbuf %0" PRIxPTR " recvbuf %0" PRIxPTR " count %d datatype %s op %s comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/bcast.c openmpi-4.1.4/ompi/contrib/libompitrace/bcast.c --- openmpi-4.1.2/ompi/contrib/libompitrace/bcast.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/bcast.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -34,7 +34,11 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(datatype, typename, &len); + if (datatype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(datatype, typename, &len); + } else { + strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_BCAST[%d]: buffer %0" PRIxPTR " count %d datatype %s root %d comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/isend.c openmpi-4.1.4/ompi/contrib/libompitrace/isend.c --- openmpi-4.1.2/ompi/contrib/libompitrace/isend.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/isend.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -36,7 +36,11 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(type, typename, &len); + if (type != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(type, typename, &len); + } else { + strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_ISEND[%d]: buf %0" PRIxPTR " count %d datatype %s dest %d tag %d comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/Makefile.in openmpi-4.1.4/ompi/contrib/libompitrace/Makefile.in --- openmpi-4.1.2/ompi/contrib/libompitrace/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/recv.c openmpi-4.1.4/ompi/contrib/libompitrace/recv.c --- openmpi-4.1.2/ompi/contrib/libompitrace/recv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/recv.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -33,7 +33,11 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(type, typename, &len); + if (type != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(type, typename, &len); + } else { + strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_RECV[%d]: buf %0" PRIxPTR " count %d datatype %s source %d tag %d comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/reduce.c openmpi-4.1.4/ompi/contrib/libompitrace/reduce.c --- openmpi-4.1.2/ompi/contrib/libompitrace/reduce.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/reduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -37,7 +37,11 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(datatype, typename, &len); + if (datatype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(datatype, typename, &len); + } else { + strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr,"MPI_REDUCE[%d]: sendbuf %0" PRIxPTR " recvbuf %0" PRIxPTR " count %d datatype %s op %s root %d comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/send.c openmpi-4.1.4/ompi/contrib/libompitrace/send.c --- openmpi-4.1.2/ompi/contrib/libompitrace/send.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/send.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -36,7 +36,11 @@ int rank; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(type, typename, &len); + if (type != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(type, typename, &len); + } else { + strncpy(typename, "MPI_DATATYPE_NULL", sizeof(typename)); + } PMPI_Comm_get_name(comm, commname, &len); fprintf(stderr, "MPI_SEND[%d]: : buf %0" PRIxPTR " count %d datatype %s dest %d tag %d comm %s\n", diff -Nru openmpi-4.1.2/ompi/contrib/libompitrace/sendrecv.c openmpi-4.1.4/ompi/contrib/libompitrace/sendrecv.c --- openmpi-4.1.2/ompi/contrib/libompitrace/sendrecv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/contrib/libompitrace/sendrecv.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2009-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2013 Los Alamos National Security, LLC. All rights * reserved. * $COPYRIGHT$ @@ -41,8 +41,18 @@ int size; PMPI_Comm_rank(MPI_COMM_WORLD, &rank); - PMPI_Type_get_name(sendtype, sendtypename, &len); - PMPI_Type_get_name(sendtype, recvtypename, &len); + if (sendtype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(sendtype, sendtypename, &len); + } else { + strncpy(sendtypename, "MPI_DATATYPE_NULL", + sizeof(sendtypename)); + } + if (recvtype != MPI_DATATYPE_NULL) { + PMPI_Type_get_name(recvtype, recvtypename, &len); + } else { + strncpy(recvtypename, "MPI_DATATYPE_NULL", + sizeof(recvtypename)); + } PMPI_Comm_get_name(comm, commname, &len); PMPI_Type_size(recvtype, &size); diff -Nru openmpi-4.1.2/ompi/datatype/Makefile.in openmpi-4.1.4/ompi/datatype/Makefile.in --- openmpi-4.1.2/ompi/datatype/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/datatype/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/datatype/ompi_datatype_module.c openmpi-4.1.4/ompi/datatype/ompi_datatype_module.c --- openmpi-4.1.2/ompi/datatype/ompi_datatype_module.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/datatype/ompi_datatype_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -361,7 +361,7 @@ [OMPI_DATATYPE_MPI_UB] = &ompi_mpi_ub.dt, [OMPI_DATATYPE_MPI_LONG] = &ompi_mpi_long.dt, - [OMPI_DATATYPE_MPI_UNSIGNED_LONG] = &ompi_mpi_long.dt, + [OMPI_DATATYPE_MPI_UNSIGNED_LONG] = &ompi_mpi_unsigned_long.dt, /* MPI 3.0 types */ [OMPI_DATATYPE_MPI_COUNT] = &ompi_mpi_count.dt, diff -Nru openmpi-4.1.2/ompi/debuggers/Makefile.in openmpi-4.1.4/ompi/debuggers/Makefile.in --- openmpi-4.1.2/ompi/debuggers/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/debuggers/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1699,6 +1702,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1848,9 +1855,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1911,6 +1915,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1924,6 +1931,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/debuggers/ompi_msgq_dll.c openmpi-4.1.4/ompi/debuggers/ompi_msgq_dll.c --- openmpi-4.1.2/ompi/debuggers/ompi_msgq_dll.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/debuggers/ompi_msgq_dll.c 2022-05-29 09:51:40.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2007-2016 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2004-2010 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. @@ -1157,8 +1157,18 @@ mqs_fetch_data( proc, ompi_datatype + i_info->ompi_datatype_t.offset.name, 64, data_name ); if( '\0' != data_name[0] ) { - snprintf( (char*)res->extra_text[1], 64, "Data: %d * %s", - (int)res->desired_length, data_name ); + // res->extra_text[x] is only 64 chars long -- same as + // data_name. If you try to snprintf it into + // res->extra_text with additional text, some compilers + // will warn that we might truncate the string (because it + // can see the static char array lengths). So just put + // data_name in res->extra_text[2] (vs. extra_text[1]), + // where it is guaranteed to fit. + data_name[4] = '\0'; + snprintf( (char*)res->extra_text[1], 64, "Data: %d instances of MPI datatype", + (int)res->desired_length); + snprintf( (char*)res->extra_text[2], 64, "%s", + data_name ); } /* And now compute the real length as specified by the user */ res->desired_length *= diff -Nru openmpi-4.1.2/ompi/etc/Makefile.in openmpi-4.1.4/ompi/etc/Makefile.in --- openmpi-4.1.2/ompi/etc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/etc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1395,6 +1398,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1544,9 +1551,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1607,6 +1611,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1620,6 +1627,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/include/Makefile.in openmpi-4.1.4/ompi/include/Makefile.in --- openmpi-4.1.2/ompi/include/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/include/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -176,6 +176,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -414,6 +415,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -450,6 +452,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1510,6 +1513,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1659,9 +1666,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1722,6 +1726,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1735,6 +1742,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/Makefile.in openmpi-4.1.4/ompi/Makefile.in --- openmpi-4.1.2/ompi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -637,6 +637,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -875,6 +876,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -911,6 +913,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -2152,6 +2155,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -2301,9 +2308,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -2364,6 +2368,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -2377,6 +2384,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/bml/Makefile.in openmpi-4.1.4/ompi/mca/bml/Makefile.in --- openmpi-4.1.2/ompi/mca/bml/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/bml/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/bml/r2/Makefile.in openmpi-4.1.4/ompi/mca/bml/r2/Makefile.in --- openmpi-4.1.2/ompi/mca/bml/r2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/bml/r2/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/adapt/Makefile.in openmpi-4.1.4/ompi/mca/coll/adapt/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/adapt/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/adapt/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/base/coll_base_alltoall.c openmpi-4.1.4/ompi/mca/coll/base/coll_base_alltoall.c --- openmpi-4.1.2/ompi/mca/coll/base/coll_base_alltoall.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/base/coll_base_alltoall.c 2022-05-29 09:51:40.000000000 +0000 @@ -29,6 +29,7 @@ #include "mpi.h" #include "ompi/constants.h" #include "ompi/datatype/ompi_datatype.h" +#include "opal/datatype/opal_convertor_internal.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" diff -Nru openmpi-4.1.2/ompi/mca/coll/base/coll_base_alltoallv.c openmpi-4.1.4/ompi/mca/coll/base/coll_base_alltoallv.c --- openmpi-4.1.2/ompi/mca/coll/base/coll_base_alltoallv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/base/coll_base_alltoallv.c 2022-05-29 09:51:40.000000000 +0000 @@ -31,6 +31,7 @@ #include "mpi.h" #include "ompi/constants.h" #include "ompi/datatype/ompi_datatype.h" +#include "opal/datatype/opal_convertor_internal.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" @@ -42,7 +43,7 @@ /* * We want to minimize the amount of temporary memory needed while allowing as many ranks * to exchange data simultaneously. We use a variation of the ring algorithm, where in a - * single step a process echange the data with both neighbors at distance k (on the left + * single step a process exchange the data with both neighbors at distance k (on the left * and the right on a logical ring topology). With this approach we need to pack the data * for a single of the two neighbors, as we can then use the original buffer (and datatype * and count) to send the data to the other. @@ -57,16 +58,22 @@ ptrdiff_t extent; ompi_request_t *req = MPI_REQUEST_NULL; char *tmp_buffer; - size_t packed_size = 0, max_size; + size_t packed_size = 0, max_size, type_size; opal_convertor_t convertor; /* Initialize. */ size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); + ompi_datatype_type_size(rdtype, &type_size); - ompi_datatype_type_size(rdtype, &max_size); - max_size *= rcounts[rank]; + for (i = 0, max_size = 0 ; i < size ; ++i) { + if (i == rank) { + continue; + } + packed_size = rcounts[i] * type_size; + max_size = packed_size > max_size ? packed_size : max_size; + } /* Easy way out */ if ((1 == size) || (0 == max_size) ) { diff -Nru openmpi-4.1.2/ompi/mca/coll/base/coll_base_reduce_scatter_block.c openmpi-4.1.4/ompi/mca/coll/base/coll_base_reduce_scatter_block.c --- openmpi-4.1.2/ompi/mca/coll/base/coll_base_reduce_scatter_block.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/base/coll_base_reduce_scatter_block.c 2022-05-29 09:51:40.000000000 +0000 @@ -17,6 +17,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2018 Siberian State University of Telecommunications * and Information Sciences. All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -58,7 +59,8 @@ struct ompi_communicator_t *comm, mca_coll_base_module_t *module) { - int rank, size, count, err = OMPI_SUCCESS; + int rank, size, err = OMPI_SUCCESS; + size_t count; ptrdiff_t gap, span; char *recv_buf = NULL, *recv_buf_free = NULL; @@ -67,40 +69,106 @@ size = ompi_comm_size(comm); /* short cut the trivial case */ - count = rcount * size; + count = rcount * (size_t)size; if (0 == count) { return OMPI_SUCCESS; } - /* get datatype information */ - span = opal_datatype_span(&dtype->super, count, &gap); - /* Handle MPI_IN_PLACE */ if (MPI_IN_PLACE == sbuf) { sbuf = rbuf; } - if (0 == rank) { - /* temporary receive buffer. See coll_basic_reduce.c for - details on sizing */ - recv_buf_free = (char*) malloc(span); - if (NULL == recv_buf_free) { - err = OMPI_ERR_OUT_OF_RESOURCE; - goto cleanup; + /* + * For large payload (defined as a count greater than INT_MAX) + * to reduce the memory footprint on the root we segment the + * reductions per rank, then send to each rank. + * + * Additionally, sending the message in the coll_reduce() as + * "rcount*size" would exceed the 'int count' parameter in the + * coll_reduce() function. So another technique is required + * for count values that exceed INT_MAX. + */ + if ( OPAL_UNLIKELY(count > INT_MAX) ) { + int i; + void *sbuf_ptr; + + /* Get datatype information for an individual block */ + span = opal_datatype_span(&dtype->super, rcount, &gap); + + if (0 == rank) { + /* temporary receive buffer. See coll_basic_reduce.c for + details on sizing */ + recv_buf_free = (char*) malloc(span); + if (NULL == recv_buf_free) { + err = OMPI_ERR_OUT_OF_RESOURCE; + goto cleanup; + } + recv_buf = recv_buf_free - gap; + } + + for( i = 0; i < size; ++i ) { + /* Calculate the portion of the send buffer to reduce over */ + sbuf_ptr = (char*)sbuf + span * (size_t)i; + + /* Reduction for this peer */ + err = comm->c_coll->coll_reduce(sbuf_ptr, recv_buf, rcount, + dtype, op, 0, comm, + comm->c_coll->coll_reduce_module); + if (MPI_SUCCESS != err) { + goto cleanup; + } + + /* Send reduce results to this peer */ + if (0 == rank ) { + if( i == rank ) { + err = ompi_datatype_copy_content_same_ddt(dtype, rcount, rbuf, recv_buf); + } else { + err = MCA_PML_CALL(send(recv_buf, rcount, dtype, i, + MCA_COLL_BASE_TAG_REDUCE_SCATTER_BLOCK, + MCA_PML_BASE_SEND_STANDARD, comm)); + } + if (MPI_SUCCESS != err) { + goto cleanup; + } + } + else if( i == rank ) { + err = MCA_PML_CALL(recv(rbuf, rcount, dtype, 0, + MCA_COLL_BASE_TAG_REDUCE_SCATTER_BLOCK, + comm, MPI_STATUS_IGNORE)); + if (MPI_SUCCESS != err) { + goto cleanup; + } + } } - recv_buf = recv_buf_free - gap; } + else { + /* get datatype information */ + span = opal_datatype_span(&dtype->super, count, &gap); + + if (0 == rank) { + /* temporary receive buffer. See coll_basic_reduce.c for + details on sizing */ + recv_buf_free = (char*) malloc(span); + if (NULL == recv_buf_free) { + err = OMPI_ERR_OUT_OF_RESOURCE; + goto cleanup; + } + recv_buf = recv_buf_free - gap; + } - /* reduction */ - err = - comm->c_coll->coll_reduce(sbuf, recv_buf, count, dtype, op, 0, - comm, comm->c_coll->coll_reduce_module); + /* reduction */ + err = + comm->c_coll->coll_reduce(sbuf, recv_buf, (int)count, dtype, op, 0, + comm, comm->c_coll->coll_reduce_module); + if (MPI_SUCCESS != err) { + goto cleanup; + } - /* scatter */ - if (MPI_SUCCESS == err) { + /* scatter */ err = comm->c_coll->coll_scatter(recv_buf, rcount, dtype, - rbuf, rcount, dtype, 0, - comm, comm->c_coll->coll_scatter_module); + rbuf, rcount, dtype, 0, + comm, comm->c_coll->coll_scatter_module); } cleanup: @@ -146,7 +214,16 @@ if (comm_size < 2) return MPI_SUCCESS; - totalcount = comm_size * rcount; + totalcount = comm_size * (size_t)rcount; + if( OPAL_UNLIKELY(totalcount > INT_MAX) ) { + /* + * Large payload collectives are not supported by this algorithm. + * The blocklens and displs calculations in the loop below + * will overflow an int data type. + * Fallback to the linear algorithm. + */ + return ompi_coll_base_reduce_scatter_block_basic_linear(sbuf, rbuf, rcount, dtype, op, comm, module); + } ompi_datatype_type_extent(dtype, &extent); span = opal_datatype_span(&dtype->super, totalcount, &gap); tmpbuf_raw = malloc(span); @@ -347,7 +424,8 @@ return ompi_coll_base_reduce_scatter_block_basic_linear(sbuf, rbuf, rcount, dtype, op, comm, module); } - totalcount = comm_size * rcount; + + totalcount = comm_size * (size_t)rcount; ompi_datatype_type_extent(dtype, &extent); span = opal_datatype_span(&dtype->super, totalcount, &gap); tmpbuf_raw = malloc(span); @@ -431,22 +509,22 @@ * have their result calculated by the process to their * right (rank + 1). */ - int send_count = 0, recv_count = 0; + size_t send_count = 0, recv_count = 0; if (vrank < vpeer) { /* Send the right half of the buffer, recv the left half */ send_index = recv_index + mask; - send_count = rcount * ompi_range_sum(send_index, last_index - 1, nprocs_rem - 1); - recv_count = rcount * ompi_range_sum(recv_index, send_index - 1, nprocs_rem - 1); + send_count = rcount * (size_t)ompi_range_sum(send_index, last_index - 1, nprocs_rem - 1); + recv_count = rcount * (size_t)ompi_range_sum(recv_index, send_index - 1, nprocs_rem - 1); } else { /* Send the left half of the buffer, recv the right half */ recv_index = send_index + mask; - send_count = rcount * ompi_range_sum(send_index, recv_index - 1, nprocs_rem - 1); - recv_count = rcount * ompi_range_sum(recv_index, last_index - 1, nprocs_rem - 1); + send_count = rcount * (size_t)ompi_range_sum(send_index, recv_index - 1, nprocs_rem - 1); + recv_count = rcount * (size_t)ompi_range_sum(recv_index, last_index - 1, nprocs_rem - 1); } - ptrdiff_t rdispl = rcount * ((recv_index <= nprocs_rem - 1) ? - 2 * recv_index : nprocs_rem + recv_index); - ptrdiff_t sdispl = rcount * ((send_index <= nprocs_rem - 1) ? - 2 * send_index : nprocs_rem + send_index); + ptrdiff_t rdispl = rcount * (size_t)((recv_index <= nprocs_rem - 1) ? + 2 * recv_index : nprocs_rem + recv_index); + ptrdiff_t sdispl = rcount * (size_t)((send_index <= nprocs_rem - 1) ? + 2 * send_index : nprocs_rem + send_index); struct ompi_request_t *request = NULL; if (recv_count > 0) { @@ -587,7 +665,7 @@ sbuf, rbuf, rcount, dtype, op, comm, module); } - totalcount = comm_size * rcount; + totalcount = comm_size * (size_t)rcount; ompi_datatype_type_extent(dtype, &extent); span = opal_datatype_span(&dtype->super, totalcount, &gap); tmpbuf[0] = malloc(span); @@ -677,13 +755,17 @@ /* Send the upper half of reduction buffer, recv the lower half */ recv_index += nblocks; } - int send_count = rcount * ompi_range_sum(send_index, - send_index + nblocks - 1, nprocs_rem - 1); - int recv_count = rcount * ompi_range_sum(recv_index, - recv_index + nblocks - 1, nprocs_rem - 1); - ptrdiff_t sdispl = rcount * ((send_index <= nprocs_rem - 1) ? + size_t send_count = rcount * + (size_t)ompi_range_sum(send_index, + send_index + nblocks - 1, + nprocs_rem - 1); + size_t recv_count = rcount * + (size_t)ompi_range_sum(recv_index, + recv_index + nblocks - 1, + nprocs_rem - 1); + ptrdiff_t sdispl = rcount * (size_t)((send_index <= nprocs_rem - 1) ? 2 * send_index : nprocs_rem + send_index); - ptrdiff_t rdispl = rcount * ((recv_index <= nprocs_rem - 1) ? + ptrdiff_t rdispl = rcount * (size_t)((recv_index <= nprocs_rem - 1) ? 2 * recv_index : nprocs_rem + recv_index); err = ompi_coll_base_sendrecv(psend + (ptrdiff_t)sdispl * extent, send_count, @@ -719,7 +801,7 @@ * Process has two blocks: for excluded process and own. * Send result to the excluded process. */ - ptrdiff_t sdispl = rcount * ((send_index <= nprocs_rem - 1) ? + ptrdiff_t sdispl = rcount * (size_t)((send_index <= nprocs_rem - 1) ? 2 * send_index : nprocs_rem + send_index); err = MCA_PML_CALL(send(psend + (ptrdiff_t)sdispl * extent, rcount, dtype, peer - 1, @@ -729,7 +811,7 @@ } /* Send result to a remote process according to a mirror permutation */ - ptrdiff_t sdispl = rcount * ((send_index <= nprocs_rem - 1) ? + ptrdiff_t sdispl = rcount * (size_t)((send_index <= nprocs_rem - 1) ? 2 * send_index : nprocs_rem + send_index); /* If process has two blocks, then send the second block (own block) */ if (vpeer < nprocs_rem) @@ -821,7 +903,7 @@ if (rcount == 0 || comm_size < 2) return MPI_SUCCESS; - totalcount = comm_size * rcount; + totalcount = comm_size * (size_t)rcount; ompi_datatype_type_extent(dtype, &extent); span = opal_datatype_span(&dtype->super, totalcount, &gap); tmpbuf[0] = malloc(span); @@ -843,7 +925,7 @@ if (MPI_SUCCESS != err) { goto cleanup_and_return; } } - int nblocks = totalcount, send_index = 0, recv_index = 0; + size_t nblocks = totalcount, send_index = 0, recv_index = 0; for (int mask = 1; mask < comm_size; mask <<= 1) { int peer = rank ^ mask; nblocks /= 2; diff -Nru openmpi-4.1.2/ompi/mca/coll/base/coll_tags.h openmpi-4.1.4/ompi/mca/coll/base/coll_tags.h --- openmpi-4.1.2/ompi/mca/coll/base/coll_tags.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/base/coll_tags.h 2022-05-29 09:51:40.000000000 +0000 @@ -45,6 +45,7 @@ #define MCA_COLL_BASE_TAG_NONBLOCKING_END ((-1 * INT_MAX/2) + 1) #define MCA_COLL_BASE_TAG_NEIGHBOR_BASE (MCA_COLL_BASE_TAG_NONBLOCKING_END - 1) #define MCA_COLL_BASE_TAG_NEIGHBOR_END (MCA_COLL_BASE_TAG_NEIGHBOR_BASE - 1024) -#define MCA_COLL_BASE_TAG_HCOLL_BASE (-1 * INT_MAX/2) +#define MCA_COLL_BASE_TAG_UCC (MCA_COLL_BASE_TAG_NEIGHBOR_END - 1) +#define MCA_COLL_BASE_TAG_HCOLL_BASE (MCA_COLL_BASE_TAG_UCC - 1) #define MCA_COLL_BASE_TAG_HCOLL_END (-1 * INT_MAX) #endif /* MCA_COLL_BASE_TAGS_H */ diff -Nru openmpi-4.1.2/ompi/mca/coll/basic/Makefile.in openmpi-4.1.4/ompi/mca/coll/basic/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/basic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/basic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1507,6 +1510,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1656,9 +1663,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1719,6 +1723,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1732,6 +1739,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/cuda/coll_cuda_reduce.c openmpi-4.1.4/ompi/mca/coll/cuda/coll_cuda_reduce.c --- openmpi-4.1.2/ompi/mca/coll/cuda/coll_cuda_reduce.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/cuda/coll_cuda_reduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -34,6 +34,7 @@ mca_coll_base_module_t *module) { mca_coll_cuda_module_t *s = (mca_coll_cuda_module_t*) module; + int rank = ompi_comm_rank(comm); ptrdiff_t gap; char *rbuf1 = NULL, *sbuf1 = NULL, *rbuf2 = NULL; const char *sbuf2; @@ -53,7 +54,7 @@ sbuf = sbuf1 - gap; } - if (opal_cuda_check_bufs(rbuf, NULL)) { + if ((rank == root) && (opal_cuda_check_bufs((char *)rbuf, NULL))) { rbuf1 = (char*)malloc(bufsize); if (NULL == rbuf1) { if (NULL != sbuf1) free(sbuf1); diff -Nru openmpi-4.1.2/ompi/mca/coll/cuda/Makefile.in openmpi-4.1.4/ompi/mca/coll/cuda/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/cuda/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/cuda/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -108,6 +108,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -346,6 +347,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -382,6 +384,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1476,6 +1479,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1625,9 +1632,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1688,6 +1692,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1701,6 +1708,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/fca/Makefile.in openmpi-4.1.4/ompi/mca/coll/fca/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/fca/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/fca/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/han/Makefile.in openmpi-4.1.4/ompi/mca/coll/han/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/han/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/han/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1487,6 +1490,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1636,9 +1643,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1699,6 +1703,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1712,6 +1719,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/hcoll/Makefile.in openmpi-4.1.4/ompi/mca/coll/hcoll/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/hcoll/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/hcoll/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_allgather.c openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_allgather.c --- openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_allgather.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_allgather.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,6 +12,7 @@ * Copyright (c) 2006-2010 University of Houston. All rights reserved. * Copyright (c) 2015-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,9 +49,10 @@ struct ompi_communicator_t *comm, mca_coll_base_module_t *module) { - int rank, root = 0, size, rsize, err = OMPI_SUCCESS; + int rank, root = 0, size, rsize, err = OMPI_SUCCESS, i; char *ptmp_free = NULL, *ptmp = NULL; ptrdiff_t gap, span; + void *rbuf_ptr; rank = ompi_comm_rank(comm); size = ompi_comm_size(comm->c_local_comm); @@ -76,9 +78,9 @@ if (rank == root) { /* Do a send-recv between the two root procs. to avoid deadlock */ - err = ompi_coll_base_sendrecv_actual(ptmp, scount*size, sdtype, 0, + err = ompi_coll_base_sendrecv_actual(ptmp, scount*(size_t)size, sdtype, 0, MCA_COLL_BASE_TAG_ALLGATHER, - rbuf, rcount*rsize, rdtype, 0, + rbuf, rcount*(size_t)rsize, rdtype, 0, MCA_COLL_BASE_TAG_ALLGATHER, comm, MPI_STATUS_IGNORE); if (OMPI_SUCCESS != err) { @@ -87,12 +89,28 @@ } /* bcast the message to all the local processes */ if ( rcount > 0 ) { - err = comm->c_local_comm->c_coll->coll_bcast(rbuf, rcount*rsize, rdtype, - root, comm->c_local_comm, - comm->c_local_comm->c_coll->coll_bcast_module); - if (OMPI_SUCCESS != err) { - goto exit; - } + if ( OPAL_UNLIKELY(rcount*(size_t)rsize > INT_MAX) ) { + // Sending the message in the coll_bcast as "rcount*rsize" would exceed + // the 'int count' parameter in the coll_bcast() function. Instead broadcast + // the result in "rcount" chunks to the local group. + span = opal_datatype_span(&rdtype->super, rcount, &gap); + for( i = 0; i < rsize; ++i) { + rbuf_ptr = (char*)rbuf + span * (size_t)i; + err = comm->c_local_comm->c_coll->coll_bcast(rbuf_ptr, rcount, rdtype, + root, comm->c_local_comm, + comm->c_local_comm->c_coll->coll_bcast_module); + if (OMPI_SUCCESS != err) { + goto exit; + } + } + } else { + err = comm->c_local_comm->c_coll->coll_bcast(rbuf, rcount*rsize, rdtype, + root, comm->c_local_comm, + comm->c_local_comm->c_coll->coll_bcast_module); + if (OMPI_SUCCESS != err) { + goto exit; + } + } } exit: diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_allgatherv.c openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_allgatherv.c --- openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_allgatherv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_allgatherv.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,6 +12,7 @@ * Copyright (c) 2006-2010 University of Houston. All rights reserved. * Copyright (c) 2015-2017 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -47,7 +48,8 @@ struct ompi_communicator_t *comm, mca_coll_base_module_t *module) { - int i, rank, size, size_local, total=0, err; + int i, rank, size, size_local, err; + size_t total = 0; int *count=NULL,*displace=NULL; char *ptmp_free=NULL, *ptmp=NULL; ompi_datatype_t *ndtype = NULL; diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_gather.c openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_gather.c --- openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_gather.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_gather.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,6 +12,7 @@ * Copyright (c) 2006-2007 University of Houston. All rights reserved. * Copyright (c) 2015-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -76,7 +77,7 @@ comm->c_local_comm->c_coll->coll_gather_module); if (0 == rank) { /* First process sends data to the root */ - err = MCA_PML_CALL(send(ptmp, scount*size_local, sdtype, root, + err = MCA_PML_CALL(send(ptmp, scount*(size_t)size_local, sdtype, root, MCA_COLL_BASE_TAG_GATHER, MCA_PML_BASE_SEND_STANDARD, comm)); if (OMPI_SUCCESS != err) { @@ -86,7 +87,7 @@ free(ptmp_free); } else { /* I am the root, loop receiving the data. */ - err = MCA_PML_CALL(recv(rbuf, rcount*size, rdtype, 0, + err = MCA_PML_CALL(recv(rbuf, rcount*(size_t)size, rdtype, 0, MCA_COLL_BASE_TAG_GATHER, comm, MPI_STATUS_IGNORE)); if (OMPI_SUCCESS != err) { diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_gatherv.c openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_gatherv.c --- openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_gatherv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_gatherv.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,6 +12,7 @@ * Copyright (c) 2006-2010 University of Houston. All rights reserved. * Copyright (c) 2015-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -44,7 +45,8 @@ struct ompi_communicator_t *comm, mca_coll_base_module_t *module) { - int i, rank, size, size_local, total=0, err; + int i, rank, size, size_local, err; + size_t total = 0; int *count=NULL, *displace=NULL; char *ptmp_free=NULL, *ptmp=NULL; ompi_datatype_t *ndtype; diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_scatter.c openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_scatter.c --- openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_scatter.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_scatter.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,6 +12,7 @@ * Copyright (c) 2006-2008 University of Houston. All rights reserved. * Copyright (c) 2015-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -69,7 +70,7 @@ } ptmp = ptmp_free - gap; - err = MCA_PML_CALL(recv(ptmp, rcount*size_local, rdtype, + err = MCA_PML_CALL(recv(ptmp, rcount*(size_t)size_local, rdtype, root, MCA_COLL_BASE_TAG_SCATTER, comm, MPI_STATUS_IGNORE)); if (OMPI_SUCCESS != err) { @@ -86,7 +87,7 @@ } } else { /* Root sends data to the first process in the remote group */ - err = MCA_PML_CALL(send(sbuf, scount*size, sdtype, 0, + err = MCA_PML_CALL(send(sbuf, scount*(size_t)size, sdtype, 0, MCA_COLL_BASE_TAG_SCATTER, MCA_PML_BASE_SEND_STANDARD, comm)); if (OMPI_SUCCESS != err) { diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_scatterv.c openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_scatterv.c --- openmpi-4.1.2/ompi/mca/coll/inter/coll_inter_scatterv.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/coll_inter_scatterv.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,6 +12,7 @@ * Copyright (c) 2006-2010 University of Houston. All rights reserved. * Copyright (c) 2015-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -45,7 +46,8 @@ struct ompi_communicator_t *comm, mca_coll_base_module_t *module) { - int i, rank, size, err, total=0, size_local; + int i, rank, size, err, size_local; + size_t total = 0; int *counts=NULL,*displace=NULL; char *ptmp_free=NULL, *ptmp=NULL; ompi_datatype_t *ndtype; diff -Nru openmpi-4.1.2/ompi/mca/coll/inter/Makefile.in openmpi-4.1.4/ompi/mca/coll/inter/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/inter/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/inter/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/Makefile.in openmpi-4.1.4/ompi/mca/coll/libnbc/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/libnbc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1505,6 +1508,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1654,9 +1661,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1717,6 +1721,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1730,6 +1737,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_iallgather.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_iallgather.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_iallgather.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_iallgather.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -92,7 +92,7 @@ sendcount = recvcount; } else if (!persistent) { /* for persistent, the copy must be scheduled */ /* copy my data to receive buffer */ - rbuf = (char *) recvbuf + rank * recvcount * rcvext; + rbuf = (char *) recvbuf + (MPI_Aint)rcvext * rank * recvcount; res = NBC_Copy (sendbuf, sendcount, sendtype, rbuf, recvcount, recvtype, comm); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; @@ -121,7 +121,7 @@ if (persistent && !inplace) { /* for nonblocking, data has been copied already */ /* copy my data to receive buffer (= send buffer of NBC_Sched_send) */ - rbuf = (char *)recvbuf + rank * recvcount * rcvext; + rbuf = (char *)recvbuf + (MPI_Aint) rcvext * rank * recvcount; res = NBC_Sched_copy((void *)sendbuf, false, sendcount, sendtype, rbuf, false, recvcount, recvtype, schedule, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { @@ -237,7 +237,7 @@ /* do rsize - 1 rounds */ for (int r = 0 ; r < rsize ; ++r) { /* recv from rank r */ - rbuf = (char *) recvbuf + r * recvcount * rcvext; + rbuf = (char *) recvbuf + (MPI_Aint) rcvext * r * recvcount; res = NBC_Sched_recv (rbuf, false, recvcount, recvtype, r, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { OBJ_RELEASE(schedule); @@ -303,12 +303,12 @@ ptrdiff_t rlb, rext; res = ompi_datatype_get_extent(rdtype, &rlb, &rext); - char *sbuf = (char *)recvbuf + rank * rcount * rext; + char *sbuf = (char *)recvbuf + (MPI_Aint) rext * rank * rcount; for (int remote = 0; remote < comm_size ; ++remote) { if (remote != rank) { /* Recv from rank remote */ - char *rbuf = (char *)recvbuf + remote * rcount * rext; + char *rbuf = (char *)recvbuf + (MPI_Aint) rext * remote * rcount; res = NBC_Sched_recv(rbuf, false, rcount, rdtype, remote, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { goto cleanup_and_return; } diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_iallreduce.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_iallreduce.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_iallreduce.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_iallreduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * reserved. * Copyright (c) 2014-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -366,7 +366,7 @@ root = 0; /* this makes the code for ireduce and iallreduce nearly identical - could be changed to improve performance */ RANK2VRANK(rank, vrank, root); - maxr = (int)ceil((log((double)p)/LOG2)); + maxr = ceil_of_log2(p); /* ensure the result ends up in recvbuf on vrank 0 */ if (0 == (maxr%2)) { rbuf = (void *)(-gap); @@ -768,9 +768,9 @@ /* first p-1 rounds are reductions */ for (int round = 0 ; round < p - 1 ; ++round) { int selement = (r+1-round + 2*p /*2*p avoids negative mod*/)%p; /* the element I am sending */ - int soffset = segoffsets[selement]*ext; + size_t soffset = segoffsets[selement]*(size_t)ext; int relement = (r-round + 2*p /*2*p avoids negative mod*/)%p; /* the element that I receive from my neighbor */ - int roffset = segoffsets[relement]*ext; + size_t roffset = segoffsets[relement]*(size_t)ext; /* first message come out of sendbuf */ if (round == 0) { @@ -807,9 +807,9 @@ } for (int round = p - 1 ; round < 2 * p - 2 ; ++round) { int selement = (r+1-round + 2*p /*2*p avoids negative mod*/)%p; /* the element I am sending */ - int soffset = segoffsets[selement]*ext; + size_t soffset = segoffsets[selement]*(size_t)ext; int relement = (r-round + 2*p /*2*p avoids negative mod*/)%p; /* the element that I receive from my neighbor */ - int roffset = segoffsets[relement]*ext; + size_t roffset = segoffsets[relement]*(size_t)ext; res = NBC_Sched_send ((char *) recvbuf + soffset, false, segsizes[selement], datatype, speer, schedule, false); diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ialltoall.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ialltoall.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ialltoall.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ialltoall.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. * Copyright (c) 2014-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -331,14 +331,14 @@ for (int i = 0; i < rsize; i++) { /* post all sends */ - sbuf = (char *) sendbuf + i * sendcount * sndext; + sbuf = (char *) sendbuf + (MPI_Aint) sndext * i * sendcount; res = NBC_Sched_send (sbuf, false, sendcount, sendtype, i, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { break; } /* post all receives */ - rbuf = (char *) recvbuf + i * recvcount * rcvext; + rbuf = (char *) recvbuf + (MPI_Aint) rcvext * i * recvcount; res = NBC_Sched_recv (rbuf, false, recvcount, recvtype, i, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { break; @@ -397,13 +397,13 @@ int sndpeer = (rank + r) % p; int rcvpeer = (rank - r + p) % p; - char *rbuf = (char *) recvbuf + rcvpeer * recvcount * rcvext; + char *rbuf = (char *) recvbuf + (MPI_Aint) rcvext * rcvpeer * recvcount; res = NBC_Sched_recv (rbuf, false, recvcount, recvtype, rcvpeer, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; } - char *sbuf = (char *) sendbuf + sndpeer * sendcount * sndext; + char *sbuf = (char *) sendbuf + (MPI_Aint) sndext * sndpeer * sendcount; res = NBC_Sched_send (sbuf, false, sendcount, sendtype, sndpeer, schedule, true); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { return res; @@ -523,7 +523,7 @@ /* phase 3 - reorder - data is now in wrong order in tmpbuf - reorder it into recvbuf */ for (int i = 0 ; i < p; ++i) { - rbuf = (char *) recvbuf + ((rank - i + p) % p) * recvcount * rcvext; + rbuf = (char *) recvbuf + (MPI_Aint) rcvext * ((rank - i + p) % p) * recvcount; res = NBC_Sched_unpack ((void *)(intptr_t) (i * datasize), true, recvcount, recvtype, rbuf, false, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ibarrier.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ibarrier.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ibarrier.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ibarrier.c 2022-05-29 09:51:40.000000000 +0000 @@ -45,7 +45,7 @@ return OMPI_ERR_OUT_OF_RESOURCE; } - maxround = (int)ceil((log((double)p)/LOG2)-1); + maxround = ceil_of_log2(p) -1; for (int round = 0 ; round <= maxround ; ++round) { sendpeer = (rank + (1 << round)) % p; diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ibcast.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ibcast.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ibcast.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ibcast.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. + * Copyright (c) 2016-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -238,7 +238,7 @@ static inline int bcast_sched_binomial(int rank, int p, int root, NBC_Schedule *schedule, void *buffer, int count, MPI_Datatype datatype) { int maxr, vrank, peer, res; - maxr = (int)ceil((log((double)p)/LOG2)); + maxr = ceil_of_log2(p); RANK2VRANK(rank, vrank, root); @@ -327,11 +327,11 @@ fragcount = count/numfrag; for (int fragnum = 0 ; fragnum < numfrag ; ++fragnum) { - buf = (char *) buffer + fragnum * fragcount * ext; + buf = (char *) buffer + (MPI_Aint)ext * fragnum * fragcount; thiscount = fragcount; if (fragnum == numfrag-1) { /* last fragment may not be full */ - thiscount = count - fragcount * fragnum; + thiscount = count - (size_t)fragcount * fragnum; } /* root does not receive */ diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_igather.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_igather.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_igather.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_igather.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,7 +12,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -103,7 +103,7 @@ } } else { for (int i = 0 ; i < p ; ++i) { - rbuf = (char *)recvbuf + i * recvcount * rcvext; + rbuf = (char *)recvbuf + (MPI_Aint) rcvext * i * recvcount; if (i == root) { if (!inplace) { /* if I am the root - just copy the message */ @@ -228,7 +228,7 @@ } } else if (MPI_ROOT == root) { for (int i = 0 ; i < rsize ; ++i) { - rbuf = ((char *)recvbuf) + (i * recvcount * rcvext); + rbuf = ((char *)recvbuf) + ((MPI_Aint) rcvext * i * recvcount); /* root receives message to the right buffer */ res = NBC_Sched_recv (rbuf, false, recvcount, recvtype, i, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ineighbor_allgather.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -86,7 +86,7 @@ for (int i = 0 ; i < indegree ; ++i) { if (MPI_PROC_NULL != srcs[i]) { - res = NBC_Sched_recv ((char *) rbuf + i * rcount * rcvext, true, rcount, rtype, srcs[i], schedule, false); + res = NBC_Sched_recv ((char *) rbuf + (MPI_Aint) rcvext * i * rcount, true, rcount, rtype, srcs[i], schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { break; } diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ineighbor_alltoall.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -89,7 +89,7 @@ for (int i = 0 ; i < indegree ; ++i) { if (MPI_PROC_NULL != srcs[i]) { - res = NBC_Sched_recv ((char *) rbuf + i * rcount * rcvext, true, rcount, rtype, srcs[i], schedule, false); + res = NBC_Sched_recv ((char *) rbuf + (MPI_Aint) rcvext * i * rcount, true, rcount, rtype, srcs[i], schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { break; } @@ -106,7 +106,7 @@ for (int i = 0 ; i < outdegree ; ++i) { if (MPI_PROC_NULL != dsts[i]) { - res = NBC_Sched_send ((char *) sbuf + i * scount * sndext, false, scount, stype, dsts[i], schedule, false); + res = NBC_Sched_send ((char *) sbuf + (MPI_Aint) sndext * i * scount, false, scount, stype, dsts[i], schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { break; } diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_internal.h openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_internal.h --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_internal.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_internal.h 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014 NVIDIA Corporation. All rights reserved. - * Copyright (c) 2015-2018 Research Organization for Information Science + * Copyright (c) 2015-2021 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. @@ -51,8 +51,15 @@ extern "C" { #endif -/* log(2) */ -#define LOG2 0.69314718055994530941 +/* Dividing very close floats may lead to unexpected roundings */ +static inline int +ceil_of_log2 (int val) { + int ret = 0; + while (1 << ret < val) { + ret ++; + } + return ret; +} /* true/false */ #define true 1 @@ -565,7 +572,7 @@ #define NBC_IN_PLACE(sendbuf, recvbuf, inplace) \ { \ inplace = 0; \ - if(recvbuf == sendbuf) { \ + if(recvbuf == sendbuf && MPI_BOTTOM != sendbuf) { \ inplace = 1; \ } else \ if(sendbuf == MPI_IN_PLACE) { \ diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ireduce.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ireduce.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ireduce.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ireduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,7 +9,7 @@ * reserved. * Copyright (c) 2014-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -29,7 +29,7 @@ static inline int red_sched_binomial (int rank, int p, int root, const void *sendbuf, void *redbuf, char tmpredbuf, int count, MPI_Datatype datatype, MPI_Op op, char inplace, NBC_Schedule *schedule, void *tmpbuf); static inline int red_sched_chain (int rank, int p, int root, const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int ext, size_t size, NBC_Schedule *schedule, void *tmpbuf, int fragsize); + MPI_Op op, MPI_Aint ext, size_t size, NBC_Schedule *schedule, void *tmpbuf, int fragsize); static inline int red_sched_linear (int rank, int rsize, int root, const void *sendbuf, void *recvbuf, void *tmpbuf, int count, MPI_Datatype datatype, MPI_Op op, NBC_Schedule *schedule); @@ -367,7 +367,7 @@ vroot = 0; } RANK2VRANK(rank, vrank, vroot); - maxr = (int)ceil((log((double)p)/LOG2)); + maxr = ceil_of_log2(p); if (rank != root) { inplace = 0; @@ -459,7 +459,7 @@ /* chain send ... */ static inline int red_sched_chain (int rank, int p, int root, const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, int ext, size_t size, NBC_Schedule *schedule, void *tmpbuf, int fragsize) { + MPI_Op op, MPI_Aint ext, size_t size, NBC_Schedule *schedule, void *tmpbuf, int fragsize) { int res, vrank, rpeer, speer, numfrag, fragcount, thiscount; long offset; @@ -479,11 +479,11 @@ fragcount = count / numfrag; for (int fragnum = 0 ; fragnum < numfrag ; ++fragnum) { - offset = fragnum * fragcount * ext; + offset = (MPI_Aint) ext * fragnum * fragcount; thiscount = fragcount; if(fragnum == numfrag - 1) { /* last fragment may not be full */ - thiscount = count - fragcount * fragnum; + thiscount = count - (size_t)fragcount * fragnum; } /* last node does not recv */ diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * reserved. * Copyright (c) 2014-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2017-2021 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -68,9 +68,9 @@ return OMPI_ERR_OUT_OF_RESOURCE; } - maxr = (int)ceil((log((double)p)/LOG2)); + maxr = ceil_of_log2(p); - count = p * recvcount; + count = (size_t) p * recvcount; if (0 < count) { char *rbuf, *lbuf, *buf; @@ -248,7 +248,7 @@ return res; } - count = rcount * lsize; + count = (size_t)rcount * lsize; span = opal_datatype_span(&dtype->super, count, &gap); span_align = OPAL_ALIGN(span, dtype->super.align, ptrdiff_t); diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c 2022-05-29 09:51:40.000000000 +0000 @@ -83,7 +83,7 @@ return nbc_get_noop_request(persistent, request); } - maxr = (int) ceil ((log((double) p) / LOG2)); + maxr = ceil_of_log2(p); span = opal_datatype_span(&datatype->super, count, &gap); span_align = OPAL_ALIGN(span, datatype->super.align, ptrdiff_t); diff -Nru openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_iscatter.c openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_iscatter.c --- openmpi-4.1.2/ompi/mca/coll/libnbc/nbc_iscatter.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/libnbc/nbc_iscatter.c 2022-05-29 09:51:40.000000000 +0000 @@ -12,7 +12,7 @@ * reserved. * Copyright (c) 2014-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2017 IBM Corporation. All rights reserved. + * Copyright (c) 2017-2022 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ * @@ -99,7 +99,7 @@ } } else { for (int i = 0 ; i < p ; ++i) { - sbuf = (char *) sendbuf + i * sendcount * sndext; + sbuf = (char *) sendbuf + (MPI_Aint) sndext * i * sendcount; if (i == root) { if (!inplace) { /* if I am the root - just copy the message */ @@ -222,7 +222,7 @@ } } else if (MPI_ROOT == root) { for (int i = 0 ; i < rsize ; ++i) { - sbuf = ((char *)sendbuf) + (i * sendcount * sndext); + sbuf = ((char *)sendbuf) + ((MPI_Aint) sndext * i * sendcount); /* root sends the right buffer to the right receiver */ res = NBC_Sched_send(sbuf, false, sendcount, sendtype, i, schedule, false); if (OPAL_UNLIKELY(OMPI_SUCCESS != res)) { diff -Nru openmpi-4.1.2/ompi/mca/coll/Makefile.in openmpi-4.1.4/ompi/mca/coll/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1512,6 +1515,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1661,9 +1668,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1724,6 +1728,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1737,6 +1744,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/monitoring/Makefile.in openmpi-4.1.4/ompi/mca/coll/monitoring/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/monitoring/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/monitoring/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/portals4/Makefile.in openmpi-4.1.4/ompi/mca/coll/portals4/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/portals4/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/portals4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1489,6 +1492,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1638,9 +1645,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1701,6 +1705,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1714,6 +1721,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/self/Makefile.in openmpi-4.1.4/ompi/mca/coll/self/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/self/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/self/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/sm/Makefile.in openmpi-4.1.4/ompi/mca/coll/sm/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/sm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/sm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/sync/Makefile.in openmpi-4.1.4/ompi/mca/coll/sync/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/sync/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/sync/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/tuned/Makefile.in openmpi-4.1.4/ompi/mca/coll/tuned/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/tuned/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/tuned/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1505,6 +1508,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1654,9 +1661,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1717,6 +1721,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1730,6 +1737,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_allgather.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_allgather.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_allgather.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_allgather.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,108 @@ + +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_allgather_init(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_sdt, ucc_rdt; + int comm_size = ompi_comm_size(ucc_module->comm); + + if (!ompi_datatype_is_contiguous_memory_layout(sdtype, scount) || + !ompi_datatype_is_contiguous_memory_layout(rdtype, rcount * comm_size)) { + goto fallback; + } + ucc_sdt = ompi_dtype_to_ucc_dtype(sdtype); + ucc_rdt = ompi_dtype_to_ucc_dtype(rdtype); + if (COLL_UCC_DT_UNSUPPORTED == ucc_sdt || + COLL_UCC_DT_UNSUPPORTED == ucc_rdt) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", + (COLL_UCC_DT_UNSUPPORTED == ucc_sdt) ? + sdtype->super.name : rdtype->super.name); + goto fallback; + } + + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLGATHER, + .src.info = { + .buffer = (void*)sbuf, + .count = scount, + .datatype = ucc_sdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = (void*)rbuf, + .count = rcount * comm_size, + .datatype = ucc_rdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + } + }; + + if (MPI_IN_PLACE == sbuf) { + coll.mask = UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_allgather(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc allgather"); + COLL_UCC_CHECK(mca_coll_ucc_allgather_init(sbuf, scount, sdtype, + rbuf, rcount, rdtype, + ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback allgather"); + return ucc_module->previous_allgather(sbuf, scount, sdtype, rbuf, rcount, rdtype, + comm, ucc_module->previous_allgather_module); +} + +int mca_coll_ucc_iallgather(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc iallgather"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_allgather_init(sbuf, scount, sdtype, + rbuf, rcount, rdtype, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback iallgather"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_iallgather(sbuf, scount, sdtype, rbuf, rcount, rdtype, + comm, request, ucc_module->previous_iallgather_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_allgatherv.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_allgatherv.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_allgatherv.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_allgatherv.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,113 @@ + +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_allgatherv_init(const void *sbuf, int scount, + struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_sdt, ucc_rdt; + + ucc_sdt = ompi_dtype_to_ucc_dtype(sdtype); + ucc_rdt = ompi_dtype_to_ucc_dtype(rdtype); + if (COLL_UCC_DT_UNSUPPORTED == ucc_sdt || + COLL_UCC_DT_UNSUPPORTED == ucc_rdt) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", + (COLL_UCC_DT_UNSUPPORTED == ucc_sdt) ? + sdtype->super.name : rdtype->super.name); + goto fallback; + } + + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLGATHERV, + .src.info = { + .buffer = (void*)sbuf, + .count = scount, + .datatype = ucc_sdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info_v = { + .buffer = (void*)rbuf, + .counts = (ucc_count_t*)rcounts, + .displacements = (ucc_aint_t*)rdisps, + .datatype = ucc_rdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + } + }; + + if (MPI_IN_PLACE == sbuf) { + coll.mask = UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_allgatherv(const void *sbuf, int scount, + struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc allgatherv"); + + COLL_UCC_CHECK(mca_coll_ucc_allgatherv_init(sbuf, scount, sdtype, + rbuf, rcounts, rdisps, rdtype, + ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback allgatherv"); + return ucc_module->previous_allgatherv(sbuf, scount, sdtype, + rbuf, rcounts, rdisps, rdtype, + comm, ucc_module->previous_allgatherv_module); +} + +int mca_coll_ucc_iallgatherv(const void *sbuf, int scount, + struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc iallgatherv"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_allgatherv_init(sbuf, scount, sdtype, + rbuf, rcounts, rdisps, rdtype, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback iallgatherv"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_iallgatherv(sbuf, scount, sdtype, + rbuf, rcounts, rdisps, rdtype, + comm, request, ucc_module->previous_iallgatherv_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_allreduce.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_allreduce.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_allreduce.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_allreduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,104 @@ + +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *rbuf, int count, + struct ompi_datatype_t *dtype, + struct ompi_op_t *op, mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_dt; + ucc_reduction_op_t ucc_op; + + ucc_dt = ompi_dtype_to_ucc_dtype(dtype); + ucc_op = ompi_op_to_ucc_op(op); + if (OPAL_UNLIKELY(COLL_UCC_DT_UNSUPPORTED == ucc_dt)) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", + dtype->super.name); + goto fallback; + } + if (OPAL_UNLIKELY(COLL_UCC_OP_UNSUPPORTED == ucc_op)) { + UCC_VERBOSE(5, "ompi_op is not supported: op = %s", + op->o_name); + goto fallback; + } + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLREDUCE, + .src.info = { + .buffer = (void*)sbuf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = rbuf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .op = ucc_op, + }; + if (MPI_IN_PLACE == sbuf) { + coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_allreduce(const void *sbuf, void *rbuf, int count, + struct ompi_datatype_t *dtype, + struct ompi_op_t *op, struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc allreduce"); + COLL_UCC_CHECK(mca_coll_ucc_allreduce_init(sbuf, rbuf, count, dtype, op, + ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback allreduce"); + return ucc_module->previous_allreduce(sbuf, rbuf, count, dtype, op, + comm, ucc_module->previous_allreduce_module); +} + +int mca_coll_ucc_iallreduce(const void *sbuf, void *rbuf, int count, + struct ompi_datatype_t *dtype, + struct ompi_op_t *op, struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc iallreduce"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_allreduce_init(sbuf, rbuf, count, dtype, op, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback iallreduce"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_iallreduce(sbuf, rbuf, count, dtype, op, + comm, request, ucc_module->previous_iallreduce_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_alltoall.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_alltoall.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_alltoall.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_alltoall.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,108 @@ + +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_alltoall_init(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_sdt, ucc_rdt; + int comm_size = ompi_comm_size(ucc_module->comm); + + if (!ompi_datatype_is_contiguous_memory_layout(sdtype, scount * comm_size) || + !ompi_datatype_is_contiguous_memory_layout(rdtype, rcount * comm_size)) { + goto fallback; + } + ucc_sdt = ompi_dtype_to_ucc_dtype(sdtype); + ucc_rdt = ompi_dtype_to_ucc_dtype(rdtype); + if (COLL_UCC_DT_UNSUPPORTED == ucc_sdt || + COLL_UCC_DT_UNSUPPORTED == ucc_rdt) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", + (COLL_UCC_DT_UNSUPPORTED == ucc_sdt) ? + sdtype->super.name : rdtype->super.name); + goto fallback; + } + + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLTOALL, + .src.info = { + .buffer = (void*)sbuf, + .count = scount * comm_size, + .datatype = ucc_sdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = (void*)rbuf, + .count = rcount * comm_size, + .datatype = ucc_rdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + } + }; + + if (MPI_IN_PLACE == sbuf) { + coll.mask = UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_alltoall(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc alltoall"); + COLL_UCC_CHECK(mca_coll_ucc_alltoall_init(sbuf, scount, sdtype, + rbuf, rcount, rdtype, + ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback alltoall"); + return ucc_module->previous_alltoall(sbuf, scount, sdtype, rbuf, rcount, rdtype, + comm, ucc_module->previous_alltoall_module); +} + +int mca_coll_ucc_ialltoall(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc ialltoall"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_alltoall_init(sbuf, scount, sdtype, + rbuf, rcount, rdtype, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback ialltoall"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_ialltoall(sbuf, scount, sdtype, rbuf, rcount, rdtype, + comm, request, ucc_module->previous_ialltoall_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_alltoallv.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_alltoallv.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_alltoallv.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_alltoallv.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,114 @@ + +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_alltoallv_init(const void *sbuf, const int *scounts, + const int *sdisps, struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_sdt, ucc_rdt; + + ucc_sdt = ompi_dtype_to_ucc_dtype(sdtype); + ucc_rdt = ompi_dtype_to_ucc_dtype(rdtype); + if (COLL_UCC_DT_UNSUPPORTED == ucc_sdt || + COLL_UCC_DT_UNSUPPORTED == ucc_rdt) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", + (COLL_UCC_DT_UNSUPPORTED == ucc_sdt) ? + sdtype->super.name : rdtype->super.name); + goto fallback; + } + + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLTOALLV, + .src.info_v = { + .buffer = (void*)sbuf, + .counts = (ucc_count_t*)scounts, + .displacements = (ucc_aint_t*)sdisps, + .datatype = ucc_sdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info_v = { + .buffer = (void*)rbuf, + .counts = (ucc_count_t*)rcounts, + .displacements = (ucc_aint_t*)rdisps, + .datatype = ucc_rdt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + } + }; + + if (MPI_IN_PLACE == sbuf) { + coll.mask = UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_alltoallv(const void *sbuf, const int *scounts, + const int *sdisps, struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc alltoallv"); + + COLL_UCC_CHECK(mca_coll_ucc_alltoallv_init(sbuf, scounts, sdisps, sdtype, + rbuf, rcounts, rdisps, rdtype, + ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback alltoallv"); + return ucc_module->previous_alltoallv(sbuf, scounts, sdisps, sdtype, + rbuf, rcounts, rdisps, rdtype, + comm, ucc_module->previous_alltoallv_module); +} + +int mca_coll_ucc_ialltoallv(const void *sbuf, const int *scounts, + const int *sdisps, struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc ialltoallv"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_alltoallv_init(sbuf, scounts, sdisps, sdtype, + rbuf, rcounts, rdisps, rdtype, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback ialltoallv"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_ialltoallv(sbuf, scounts, sdisps, sdtype, + rbuf, rcounts, rdisps, rdtype, + comm, request, ucc_module->previous_ialltoallv_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_barrier.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_barrier.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_barrier.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_barrier.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,62 @@ +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_barrier_init(mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_BARRIER + }; + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_barrier(struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc barrier"); + COLL_UCC_CHECK(mca_coll_ucc_barrier_init(ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback barrier"); + return ucc_module->previous_barrier(comm, ucc_module->previous_barrier_module); +} + +int mca_coll_ucc_ibarrier(struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc ibarrier"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_barrier_init(ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback ibarrier"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_ibarrier(comm, request, + ucc_module->previous_ibarrier_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_bcast.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_bcast.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_bcast.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_bcast.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_bcast_init(void *buf, int count, struct ompi_datatype_t *dtype, + int root, mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_dt = ompi_dtype_to_ucc_dtype(dtype); + if (COLL_UCC_DT_UNSUPPORTED == ucc_dt) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", dtype->super.name); + goto fallback; + } + + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_BCAST, + .root = root, + .src.info = { + .buffer = buf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + } + }; + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_bcast(void *buf, int count, struct ompi_datatype_t *dtype, + int root, struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + UCC_VERBOSE(3, "running ucc bcast"); + COLL_UCC_CHECK(mca_coll_ucc_bcast_init(buf, count, dtype, root, + ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback bcast"); + return ucc_module->previous_bcast(buf, count, dtype, root, + comm, ucc_module->previous_bcast_module); +} + +int mca_coll_ucc_ibcast(void *buf, int count, struct ompi_datatype_t *dtype, + int root, struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc ibcast"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_bcast_init(buf, count, dtype, root, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback ibcast"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_ibcast(buf, count, dtype, root, + comm, request, ucc_module->previous_ibcast_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_common.h openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_common.h --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_common.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_common.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,77 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + Additional copyrights may follow + $HEADER$ + */ + +#ifndef MCA_COLL_UCC_COMMON_H +#define MCA_COLL_UCC_COMMON_H + +#include "ompi/constants.h" +#include "coll_ucc.h" +#include "coll_ucc_dtypes.h" + +#define COLL_UCC_CHECK(_call) do { \ + if (UCC_OK != (_call)) { \ + goto fallback; \ + } \ + } while(0) + +#define COLL_UCC_POST_AND_CHECK(_req) do { \ + if (UCC_OK != ucc_collective_post(_req)) { \ + ucc_collective_finalize(_req); \ + goto fallback; \ + } \ + } while(0) + +#define COLL_UCC_GET_REQ(_coll_req) do { \ + opal_free_list_item_t *item; \ + item = opal_free_list_wait (&mca_coll_ucc_component.requests); \ + if (OPAL_UNLIKELY(NULL == item)) { \ + UCC_ERROR("failed to get mca_coll_ucc_req from free_list"); \ + goto fallback; \ + } \ + _coll_req = (mca_coll_ucc_req_t*)item; \ + OMPI_REQUEST_INIT(&_coll_req->super, false); \ + _coll_req->super.req_complete_cb = NULL; \ + _coll_req->super.req_complete_cb_data = NULL; \ + _coll_req->super.req_status.MPI_ERROR = MPI_SUCCESS; \ + _coll_req->super.req_state = OMPI_REQUEST_ACTIVE; \ + _coll_req->super.req_free = mca_coll_ucc_req_free; \ + _coll_req->super.req_type = OMPI_REQUEST_COLL; \ + } while(0) + +#define COLL_UCC_REQ_INIT(_coll_req, _req, _coll, _module) do{ \ + if (_coll_req) { \ + _coll.mask |= UCC_COLL_ARGS_FIELD_CB; \ + _coll.cb.cb = mca_coll_ucc_completion; \ + _coll.cb.data = (void*)_coll_req; \ + } \ + COLL_UCC_CHECK(ucc_collective_init(&_coll, _req, \ + _module->ucc_team)); \ + if (_coll_req) { \ + _coll_req->ucc_req = *(_req); \ + } \ + } while(0) + +static inline ucc_status_t coll_ucc_req_wait(ucc_coll_req_h req) +{ + ucc_status_t status; + while (UCC_OK != (status = ucc_collective_test(req))) { + if (status < 0) { + UCC_ERROR("ucc_collective_test failed: %s", + ucc_status_string(status)); + ucc_collective_finalize(req); + return status; + } + ucc_context_progress(mca_coll_ucc_component.ucc_context); + opal_progress(); + } + return ucc_collective_finalize(req); +} + +int mca_coll_ucc_req_free(struct ompi_request_t **ompi_req); +void mca_coll_ucc_completion(void *data, ucc_status_t status); + +#endif diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_component.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_component.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_component.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,179 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include "ompi_config.h" +#include "coll_ucc.h" +#include "coll_ucc_dtypes.h" +#include "opal/util/argv.h" + +static int mca_coll_ucc_open(void); +static int mca_coll_ucc_close(void); +static int mca_coll_ucc_register(void); + +int mca_coll_ucc_output = -1; + +mca_coll_ucc_component_t mca_coll_ucc_component = { + /* First, the mca_component_t struct containing meta information + about the component */ + { + .collm_version = { + MCA_COLL_BASE_VERSION_2_0_0, + + /* Component name and version */ + .mca_component_name = "ucc", + MCA_BASE_MAKE_VERSION(component, OMPI_MAJOR_VERSION, OMPI_MINOR_VERSION, + OMPI_RELEASE_VERSION), + + /* Component open and close functions */ + .mca_open_component = mca_coll_ucc_open, + .mca_close_component = mca_coll_ucc_close, + .mca_register_component_params = mca_coll_ucc_register, + .mca_query_component = NULL, + }, + .collm_data = { + /* The component is not checkpoint ready */ + MCA_BASE_METADATA_PARAM_NONE + }, + + /* Initialization / querying functions */ + .collm_init_query = mca_coll_ucc_init_query, + .collm_comm_query = mca_coll_ucc_comm_query, + }, + 10, /* ucc_priority */ + 0, /* ucc_verbose */ + 0, /* ucc_enable */ + 2, /* ucc_np */ + "basic", /* cls */ + COLL_UCC_CTS_STR, /* requested coll_types string */ + UCC_VERSION_STRING /* ucc version */ +}; + +static int mca_coll_ucc_register(void) +{ + mca_coll_ucc_component_t *cm = &mca_coll_ucc_component; + mca_base_component_t *c = &cm->super.collm_version; + mca_base_component_var_register(c, "priority", "Priority of the UCC coll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, + MCA_BASE_VAR_SCOPE_READONLY, &cm->ucc_priority); + + mca_base_component_var_register(c, "verbose", "Verbose level of the UCC coll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, + MCA_BASE_VAR_SCOPE_READONLY, &cm->ucc_verbose); + + mca_base_component_var_register(c, "enable", "[0|1] Enable/Disable the UCC coll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, + MCA_BASE_VAR_SCOPE_READONLY, &cm->ucc_enable); + + mca_base_component_var_register(c, "np", "Minimal communicator size for the UCC coll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, + MCA_BASE_VAR_SCOPE_READONLY, &cm->ucc_np); + + mca_base_component_var_register(c, MCA_COMPILETIME_VER, + "Version of the libucc library with which Open MPI was compiled", + MCA_BASE_VAR_TYPE_VERSION_STRING, NULL, 0, 0, + OPAL_INFO_LVL_3, MCA_BASE_VAR_SCOPE_READONLY, + &cm->compiletime_version); + + mca_base_component_var_register(c, MCA_RUNTIME_VER, + "Version of the libucc library with which Open MPI is running", + MCA_BASE_VAR_TYPE_VERSION_STRING, NULL, 0, 0, + OPAL_INFO_LVL_3, MCA_BASE_VAR_SCOPE_READONLY, + &cm->runtime_version); + + mca_base_component_var_register(c, "cls", + "Comma separated list of UCC CLS to be used for team creation", + MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, + OPAL_INFO_LVL_6, MCA_BASE_VAR_SCOPE_READONLY, &cm->cls); + + mca_base_component_var_register(c, "cts", + "Comma separated list of UCC coll types to be enabled", + MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, + OPAL_INFO_LVL_6, MCA_BASE_VAR_SCOPE_READONLY, &cm->cts); + return OMPI_SUCCESS; +} + +static ucc_coll_type_t mca_coll_ucc_str_to_type(const char *str) +{ + if (0 == strcasecmp(str, "barrier")) { + return UCC_COLL_TYPE_BARRIER; + } else if (0 == strcasecmp(str, "bcast")) { + return UCC_COLL_TYPE_BCAST; + } else if (0 == strcasecmp(str, "allreduce")) { + return UCC_COLL_TYPE_ALLREDUCE; + } else if (0 == strcasecmp(str, "alltoall")) { + return UCC_COLL_TYPE_ALLTOALL; + } else if (0 == strcasecmp(str, "alltoallv")) { + return UCC_COLL_TYPE_ALLTOALLV; + } else if (0 == strcasecmp(str, "allgather")) { + return UCC_COLL_TYPE_ALLGATHER; + } else if (0 == strcasecmp(str, "allgatherv")) { + return UCC_COLL_TYPE_ALLGATHERV; + } else if (0 == strcasecmp(str, "reduce")) { + return UCC_COLL_TYPE_REDUCE; + } + UCC_ERROR("incorrect value for cts: %s, allowed: %s", + str, COLL_UCC_CTS_STR); + return UCC_COLL_TYPE_LAST; +} + +static void mca_coll_ucc_init_default_cts(void) +{ + mca_coll_ucc_component_t *cm = &mca_coll_ucc_component; + bool disable; + char** cts; + int n_cts, i; + char* str; + ucc_coll_type_t *ct, c; + + disable = (cm->cts[0] == '^') ? true : false; + cts = opal_argv_split(disable ? (cm->cts + 1) : cm->cts, ','); + n_cts = opal_argv_count(cts); + cm->cts_requested = disable ? COLL_UCC_CTS : 0; + cm->nb_cts_requested = disable ? COLL_UCC_CTS : 0; + for (i = 0; i < n_cts; i++) { + if (('i' == cts[i][0]) || ('I' == cts[i][0])) { + /* non blocking collective setting */ + str = cts[i] + 1; + ct = &cm->nb_cts_requested; + } else { + str = cts[i]; + ct = &cm->cts_requested; + } + c = mca_coll_ucc_str_to_type(str); + if (UCC_COLL_TYPE_LAST == c) { + *ct = COLL_UCC_CTS; + break; + } + if (disable) { + (*ct) &= ~c; + } else { + (*ct) |= c; + } + } + opal_argv_free(cts); +} + +static int mca_coll_ucc_open(void) +{ + mca_coll_ucc_component_t *cm = &mca_coll_ucc_component; + mca_coll_ucc_output = opal_output_open(NULL); + cm->libucc_initialized = false; + opal_output_set_verbosity(mca_coll_ucc_output, cm->ucc_verbose); + mca_coll_ucc_init_default_cts(); + return OMPI_SUCCESS; +} + +static int mca_coll_ucc_close(void) +{ + return OMPI_SUCCESS; +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_debug.h openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_debug.h --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_debug.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_debug.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,30 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ + +#ifndef COLL_UCC_DEBUG_H +#define COLL_UCC_DEBUG_H +#include "ompi_config.h" +#pragma GCC system_header + +#ifdef __BASE_FILE__ +#define __UCC_FILE__ __BASE_FILE__ +#else +#define __UCC_FILE__ __FILE__ +#endif + +#define UCC_VERBOSE(level, format, ...) \ + opal_output_verbose(level, mca_coll_ucc_output, "%s:%d - %s() " format, \ + __UCC_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__) + +#define UCC_ERROR(format, ... ) \ + opal_output_verbose(0, mca_coll_ucc_output, "Error: %s:%d - %s() " format, \ + __UCC_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__) + +extern int mca_coll_ucc_output; +#endif diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_dtypes.h openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_dtypes.h --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_dtypes.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_dtypes.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#ifndef COLL_UCC_DTYPES_H +#define COLL_UCC_DTYPES_H +#include "ompi/datatype/ompi_datatype.h" +#include "ompi/datatype/ompi_datatype_internal.h" +#include "ompi/mca/op/op.h" +#include + +#define COLL_UCC_DT_UNSUPPORTED ((ucc_datatype_t)-1) +#define COLL_UCC_OP_UNSUPPORTED ((ucc_reduction_op_t)-1) + +static ucc_datatype_t ompi_datatype_2_ucc_dt[OPAL_DATATYPE_MAX_PREDEFINED] = { + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_LOOP 0 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_END_LOOP 1 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_LB 2 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_UB 3 */ + UCC_DT_INT8, /*OPAL_DATATYPE_INT1 4 */ + UCC_DT_INT16, /*OPAL_DATATYPE_INT2 5 */ + UCC_DT_INT32, /*OPAL_DATATYPE_INT4 6 */ + UCC_DT_INT64, /*OPAL_DATATYPE_INT8 7 */ + UCC_DT_INT128, /*OPAL_DATATYPE_INT16 8 */ + UCC_DT_UINT8, /*OPAL_DATATYPE_UINT1 9 */ + UCC_DT_UINT16, /*OPAL_DATATYPE_UINT2 10 */ + UCC_DT_UINT32, /*OPAL_DATATYPE_UINT4 11 */ + UCC_DT_UINT64, /*OPAL_DATATYPE_UINT8 12 */ + UCC_DT_UINT128, /*OPAL_DATATYPE_UINT16 13 */ + UCC_DT_FLOAT16, /*OPAL_DATATYPE_FLOAT2 14 */ + UCC_DT_FLOAT32, /*OPAL_DATATYPE_FLOAT4 15 */ + UCC_DT_FLOAT64, /*OPAL_DATATYPE_FLOAT8 16 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_FLOAT12 17 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_FLOAT16 18 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_FLOAT_COMPLEX 19 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_DOUBLE_COMPLEX 20 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_LONG_DOUBLE_COMPLEX 21 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_BOOL 22 */ + COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_WCHAR 23 */ + UCC_DT_INT64, /*OPAL_DATATYPE_LONG 24 */ + UCC_DT_UINT64, /*OPAL_DATATYPE_UNSIGNED_LONG 25 */ + COLL_UCC_DT_UNSUPPORTED /*OPAL_DATATYPE_UNAVAILABLE 26 */ +}; + +static inline ucc_datatype_t ompi_dtype_to_ucc_dtype(ompi_datatype_t *dtype) +{ + int ompi_type_id = dtype->id; + int opal_type_id = dtype->super.id; + + if (ompi_type_id < OMPI_DATATYPE_MPI_MAX_PREDEFINED && + dtype->super.flags & OMPI_DATATYPE_FLAG_PREDEFINED) { + if (opal_type_id > 0 && opal_type_id < OPAL_DATATYPE_MAX_PREDEFINED) { + return ompi_datatype_2_ucc_dt[opal_type_id]; + } + } + return COLL_UCC_DT_UNSUPPORTED; +} + +static ucc_reduction_op_t ompi_op_to_ucc_op_map[OMPI_OP_BASE_FORTRAN_OP_MAX + 1] = { + COLL_UCC_OP_UNSUPPORTED, /* OMPI_OP_BASE_FORTRAN_NULL = 0 */ + UCC_OP_MAX, /* OMPI_OP_BASE_FORTRAN_MAX */ + UCC_OP_MIN, /* OMPI_OP_BASE_FORTRAN_MIN */ + UCC_OP_SUM, /* OMPI_OP_BASE_FORTRAN_SUM */ + UCC_OP_PROD, /* OMPI_OP_BASE_FORTRAN_PROD */ + UCC_OP_LAND, /* OMPI_OP_BASE_FORTRAN_LAND */ + UCC_OP_BAND, /* OMPI_OP_BASE_FORTRAN_BAND */ + UCC_OP_LOR, /* OMPI_OP_BASE_FORTRAN_LOR */ + UCC_OP_BOR, /* OMPI_OP_BASE_FORTRAN_BOR */ + UCC_OP_LXOR, /* OMPI_OP_BASE_FORTRAN_LXOR */ + UCC_OP_BXOR, /* OMPI_OP_BASE_FORTRAN_BXOR */ + COLL_UCC_OP_UNSUPPORTED, /* OMPI_OP_BASE_FORTRAN_MAXLOC */ + COLL_UCC_OP_UNSUPPORTED, /* OMPI_OP_BASE_FORTRAN_MINLOC */ + COLL_UCC_OP_UNSUPPORTED, /* OMPI_OP_BASE_FORTRAN_REPLACE */ + COLL_UCC_OP_UNSUPPORTED, /* OMPI_OP_BASE_FORTRAN_NO_OP */ + COLL_UCC_OP_UNSUPPORTED /* OMPI_OP_BASE_FORTRAN_OP_MAX */ +}; + +static inline ucc_reduction_op_t ompi_op_to_ucc_op(ompi_op_t *op) { + if (op->o_f_to_c_index > OMPI_OP_BASE_FORTRAN_OP_MAX) { + return COLL_UCC_OP_UNSUPPORTED; + } + return ompi_op_to_ucc_op_map[op->o_f_to_c_index]; +} + +#endif /* COLL_UCC_DTYPES_H */ diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc.h openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc.h --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,199 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ + +#ifndef MCA_COLL_UCC_H +#define MCA_COLL_UCC_H + +#include "ompi_config.h" +#include "mpi.h" +#include "ompi/mca/mca.h" +#include "opal/memoryhooks/memory.h" +#include "opal/mca/memory/base/base.h" +#include "ompi/mca/coll/coll.h" +#include "ompi/communicator/communicator.h" +#include "ompi/attribute/attribute.h" +#include "ompi/op/op.h" +#include "coll_ucc_debug.h" +#include + +BEGIN_C_DECLS + +#define COLL_UCC_CTS (UCC_COLL_TYPE_BARRIER | UCC_COLL_TYPE_BCAST | \ + UCC_COLL_TYPE_ALLREDUCE | UCC_COLL_TYPE_ALLTOALL | \ + UCC_COLL_TYPE_ALLTOALLV | UCC_COLL_TYPE_ALLGATHER | \ + UCC_COLL_TYPE_REDUCE | UCC_COLL_TYPE_ALLGATHERV) + +#define COLL_UCC_CTS_STR "barrier,bcast,allreduce,alltoall,alltoallv,allgather,allgatherv,reduce," \ + "ibarrier,ibcast,iallreduce,ialltoall,ialltoallv,iallgather,iallgatherv,ireduce" + +typedef struct mca_coll_ucc_req { + ompi_request_t super; + ucc_coll_req_h ucc_req; +} mca_coll_ucc_req_t; +OBJ_CLASS_DECLARATION(mca_coll_ucc_req_t); + +struct mca_coll_ucc_component_t { + mca_coll_base_component_2_0_0_t super; + int ucc_priority; + int ucc_verbose; + int ucc_enable; + int ucc_np; + char *cls; + char *cts; + const char *compiletime_version; + const char *runtime_version; + bool libucc_initialized; + ucc_lib_h ucc_lib; + ucc_lib_attr_t ucc_lib_attr; + ucc_coll_type_t cts_requested; + ucc_coll_type_t nb_cts_requested; + ucc_context_h ucc_context; + opal_free_list_t requests; +}; +typedef struct mca_coll_ucc_component_t mca_coll_ucc_component_t; + +OMPI_MODULE_DECLSPEC extern mca_coll_ucc_component_t mca_coll_ucc_component; + +/** + * UCC enabled communicator + */ +struct mca_coll_ucc_module_t { + mca_coll_base_module_t super; + ompi_communicator_t* comm; + int rank; + ucc_team_h ucc_team; + mca_coll_base_module_allreduce_fn_t previous_allreduce; + mca_coll_base_module_t* previous_allreduce_module; + mca_coll_base_module_iallreduce_fn_t previous_iallreduce; + mca_coll_base_module_t* previous_iallreduce_module; + mca_coll_base_module_reduce_fn_t previous_reduce; + mca_coll_base_module_t* previous_reduce_module; + mca_coll_base_module_ireduce_fn_t previous_ireduce; + mca_coll_base_module_t* previous_ireduce_module; + mca_coll_base_module_barrier_fn_t previous_barrier; + mca_coll_base_module_t* previous_barrier_module; + mca_coll_base_module_ibarrier_fn_t previous_ibarrier; + mca_coll_base_module_t* previous_ibarrier_module; + mca_coll_base_module_bcast_fn_t previous_bcast; + mca_coll_base_module_t* previous_bcast_module; + mca_coll_base_module_ibcast_fn_t previous_ibcast; + mca_coll_base_module_t* previous_ibcast_module; + mca_coll_base_module_alltoall_fn_t previous_alltoall; + mca_coll_base_module_t* previous_alltoall_module; + mca_coll_base_module_ialltoall_fn_t previous_ialltoall; + mca_coll_base_module_t* previous_ialltoall_module; + mca_coll_base_module_alltoallv_fn_t previous_alltoallv; + mca_coll_base_module_t* previous_alltoallv_module; + mca_coll_base_module_ialltoallv_fn_t previous_ialltoallv; + mca_coll_base_module_t* previous_ialltoallv_module; + mca_coll_base_module_allgather_fn_t previous_allgather; + mca_coll_base_module_t* previous_allgather_module; + mca_coll_base_module_iallgather_fn_t previous_iallgather; + mca_coll_base_module_t* previous_iallgather_module; + mca_coll_base_module_allgatherv_fn_t previous_allgatherv; + mca_coll_base_module_t* previous_allgatherv_module; + mca_coll_base_module_iallgatherv_fn_t previous_iallgatherv; + mca_coll_base_module_t* previous_iallgatherv_module; +}; +typedef struct mca_coll_ucc_module_t mca_coll_ucc_module_t; +OBJ_CLASS_DECLARATION(mca_coll_ucc_module_t); + +int mca_coll_ucc_init_query(bool enable_progress_threads, bool enable_mpi_threads); +mca_coll_base_module_t *mca_coll_ucc_comm_query(struct ompi_communicator_t *comm, int *priority); + +int mca_coll_ucc_allreduce(const void *sbuf, void *rbuf, int count, + struct ompi_datatype_t *dtype, struct ompi_op_t *op, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_iallreduce(const void *sbuf, void *rbuf, int count, + struct ompi_datatype_t *dtype, struct ompi_op_t *op, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_reduce(const void *sbuf, void* rbuf, int count, + struct ompi_datatype_t *dtype, struct ompi_op_t *op, + int root, struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_ireduce(const void *sbuf, void* rbuf, int count, + struct ompi_datatype_t *dtype, struct ompi_op_t *op, + int root, struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_barrier(struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_ibarrier(struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_bcast(void *buf, int count, struct ompi_datatype_t *dtype, + int root, struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_ibcast(void *buf, int count, struct ompi_datatype_t *dtype, + int root, struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_alltoall(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_ialltoall(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_alltoallv(const void *sbuf, const int *scounts, const int *sdips, + struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_ialltoallv(const void *sbuf, const int *scounts, const int *sdips, + struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_allgather(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_iallgather(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, int rcount, struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +int mca_coll_ucc_allgatherv(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module); + +int mca_coll_ucc_iallgatherv(const void *sbuf, int scount, struct ompi_datatype_t *sdtype, + void* rbuf, const int *rcounts, const int *rdisps, + struct ompi_datatype_t *rdtype, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module); + +END_C_DECLS +#endif diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_module.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_module.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_module.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,522 @@ +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * Copyright (c) 2022 Amazon.com, Inc. or its affiliates. + * All Rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "ompi_config.h" +#include "coll_ucc.h" +#include "coll_ucc_dtypes.h" +#include "ompi/mca/coll/base/coll_tags.h" +#include "ompi/mca/pml/pml.h" + +#define OBJ_RELEASE_IF_NOT_NULL( obj ) if( NULL != (obj) ) OBJ_RELEASE( obj ); + +static int ucc_comm_attr_keyval; +/* + * Initial query function that is invoked during MPI_INIT, allowing + * this module to indicate what level of thread support it provides. + */ +int mca_coll_ucc_init_query(bool enable_progress_threads, bool enable_mpi_threads) +{ + return OMPI_SUCCESS; +} + +static void mca_coll_ucc_module_clear(mca_coll_ucc_module_t *ucc_module) +{ + ucc_module->ucc_team = NULL; + ucc_module->previous_allreduce = NULL; + ucc_module->previous_iallreduce = NULL; + ucc_module->previous_barrier = NULL; + ucc_module->previous_ibarrier = NULL; + ucc_module->previous_bcast = NULL; + ucc_module->previous_ibcast = NULL; + ucc_module->previous_alltoall = NULL; + ucc_module->previous_ialltoall = NULL; + ucc_module->previous_alltoallv = NULL; + ucc_module->previous_ialltoallv = NULL; + ucc_module->previous_allgather = NULL; + ucc_module->previous_iallgather = NULL; + ucc_module->previous_allgatherv = NULL; + ucc_module->previous_iallgatherv = NULL; + ucc_module->previous_reduce = NULL; + ucc_module->previous_ireduce = NULL; +} + +static void mca_coll_ucc_module_construct(mca_coll_ucc_module_t *ucc_module) +{ + mca_coll_ucc_module_clear(ucc_module); +} + +int mca_coll_ucc_progress(void) +{ + ucc_context_progress(mca_coll_ucc_component.ucc_context); + return OPAL_SUCCESS; +} + +static void mca_coll_ucc_module_destruct(mca_coll_ucc_module_t *ucc_module) +{ + if (ucc_module->comm == &ompi_mpi_comm_world.comm){ + if (OMPI_SUCCESS != ompi_attr_free_keyval(COMM_ATTR, &ucc_comm_attr_keyval, 0)) { + UCC_ERROR("ucc ompi_attr_free_keyval failed"); + } + } + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_allreduce_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_iallreduce_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_barrier_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_ibarrier_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_bcast_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_ibcast_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_alltoall_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_ialltoall_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_alltoallv_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_ialltoallv_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_allgather_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_iallgather_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_allgatherv_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_iallgatherv_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_reduce_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_ireduce_module); + mca_coll_ucc_module_clear(ucc_module); +} + +#define SAVE_PREV_COLL_API(__api) do { \ + ucc_module->previous_ ## __api = comm->c_coll->coll_ ## __api; \ + ucc_module->previous_ ## __api ## _module = comm->c_coll->coll_ ## __api ## _module; \ + if (!comm->c_coll->coll_ ## __api || !comm->c_coll->coll_ ## __api ## _module) { \ + return OMPI_ERROR; \ + } \ + OBJ_RETAIN(ucc_module->previous_ ## __api ## _module); \ + } while(0) + +static int mca_coll_ucc_save_coll_handlers(mca_coll_ucc_module_t *ucc_module) +{ + ompi_communicator_t *comm = ucc_module->comm; + SAVE_PREV_COLL_API(allreduce); + SAVE_PREV_COLL_API(iallreduce); + SAVE_PREV_COLL_API(barrier); + SAVE_PREV_COLL_API(ibarrier); + SAVE_PREV_COLL_API(bcast); + SAVE_PREV_COLL_API(ibcast); + SAVE_PREV_COLL_API(alltoall); + SAVE_PREV_COLL_API(ialltoall); + SAVE_PREV_COLL_API(alltoallv); + SAVE_PREV_COLL_API(ialltoallv); + SAVE_PREV_COLL_API(allgather); + SAVE_PREV_COLL_API(iallgather); + SAVE_PREV_COLL_API(allgatherv); + SAVE_PREV_COLL_API(iallgatherv); + SAVE_PREV_COLL_API(reduce); + SAVE_PREV_COLL_API(ireduce); + return OMPI_SUCCESS; +} + +/* +** Communicator free callback +*/ +static int ucc_comm_attr_del_fn(MPI_Comm comm, int keyval, void *attr_val, void *extra) +{ + + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*) attr_val; + ucc_team_destroy(ucc_module->ucc_team); + if (ucc_module->comm == &ompi_mpi_comm_world.comm) { + if (mca_coll_ucc_component.libucc_initialized) { + UCC_VERBOSE(1,"finalizing ucc library"); + opal_progress_unregister(mca_coll_ucc_progress); + ucc_context_destroy(mca_coll_ucc_component.ucc_context); + ucc_finalize(mca_coll_ucc_component.ucc_lib); + } + } + return OMPI_SUCCESS; +} + +typedef struct oob_allgather_req{ + void *sbuf; + void *rbuf; + void *oob_coll_ctx; + size_t msglen; + int iter; + ompi_request_t *reqs[2]; +} oob_allgather_req_t; + +static ucc_status_t oob_allgather_test(void *req) +{ + oob_allgather_req_t *oob_req = (oob_allgather_req_t*)req; + ompi_communicator_t *comm = (ompi_communicator_t *)oob_req->oob_coll_ctx; + char *tmpsend = NULL; + char *tmprecv = NULL; + size_t msglen = oob_req->msglen; + int probe_count = 5; + int rank, size, sendto, recvfrom, recvdatafrom, + senddatafrom, completed, probe; + + size = ompi_comm_size(comm); + rank = ompi_comm_rank(comm); + if (oob_req->iter == 0) { + tmprecv = (char*) oob_req->rbuf + (ptrdiff_t)rank * (ptrdiff_t)msglen; + memcpy(tmprecv, oob_req->sbuf, msglen); + } + sendto = (rank + 1) % size; + recvfrom = (rank - 1 + size) % size; + for (; oob_req->iter < size - 1; oob_req->iter++) { + if (oob_req->iter > 0) { + probe = 0; + do { + ompi_request_test_all(2, oob_req->reqs, &completed, MPI_STATUS_IGNORE); + probe++; + } while (!completed && probe < probe_count); + if (!completed) { + return UCC_INPROGRESS; + } + } + recvdatafrom = (rank - oob_req->iter - 1 + size) % size; + senddatafrom = (rank - oob_req->iter + size) % size; + tmprecv = (char*)oob_req->rbuf + (ptrdiff_t)recvdatafrom * (ptrdiff_t)msglen; + tmpsend = (char*)oob_req->rbuf + (ptrdiff_t)senddatafrom * (ptrdiff_t)msglen; + MCA_PML_CALL(isend(tmpsend, msglen, MPI_BYTE, sendto, MCA_COLL_BASE_TAG_UCC, + MCA_PML_BASE_SEND_STANDARD, comm, &oob_req->reqs[0])); + MCA_PML_CALL(irecv(tmprecv, msglen, MPI_BYTE, recvfrom, + MCA_COLL_BASE_TAG_UCC, comm, &oob_req->reqs[1])); + } + probe = 0; + do { + ompi_request_test_all(2, oob_req->reqs, &completed, MPI_STATUS_IGNORE); + probe++; + } while (!completed && probe < probe_count); + if (!completed) { + return UCC_INPROGRESS; + } + return UCC_OK; +} + +static ucc_status_t oob_allgather_free(void *req) +{ + free(req); + return UCC_OK; +} + +static ucc_status_t oob_allgather(void *sbuf, void *rbuf, size_t msglen, + void *oob_coll_ctx, void **req) +{ + oob_allgather_req_t *oob_req = malloc(sizeof(*oob_req)); + oob_req->sbuf = sbuf; + oob_req->rbuf = rbuf; + oob_req->msglen = msglen; + oob_req->oob_coll_ctx = oob_coll_ctx; + oob_req->iter = 0; + *req = oob_req; + return UCC_OK; +} + + +static int mca_coll_ucc_init_ctx() { + mca_coll_ucc_component_t *cm = &mca_coll_ucc_component; + char str_buf[256]; + ompi_attribute_fn_ptr_union_t del_fn; + ompi_attribute_fn_ptr_union_t copy_fn; + ucc_lib_config_h lib_config; + ucc_context_config_h ctx_config; + ucc_thread_mode_t tm_requested; + ucc_lib_params_t lib_params; + ucc_context_params_t ctx_params; + + tm_requested = ompi_mpi_thread_multiple ? UCC_THREAD_MULTIPLE : + UCC_THREAD_SINGLE; + lib_params.mask = UCC_LIB_PARAM_FIELD_THREAD_MODE; + lib_params.thread_mode = tm_requested; + + if (UCC_OK != ucc_lib_config_read("OMPI", NULL, &lib_config)) { + UCC_ERROR("UCC lib config read failed"); + return OMPI_ERROR; + } + if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) { + ucc_lib_config_release(lib_config); + UCC_ERROR("failed to modify UCC lib config to set CLS"); + return OMPI_ERROR; + } + + if (UCC_OK != ucc_init(&lib_params, lib_config, &cm->ucc_lib)) { + UCC_ERROR("UCC lib init failed"); + ucc_lib_config_release(lib_config); + cm->ucc_enable = 0; + return OMPI_ERROR; + } + ucc_lib_config_release(lib_config); + + cm->ucc_lib_attr.mask = UCC_LIB_ATTR_FIELD_THREAD_MODE | + UCC_LIB_ATTR_FIELD_COLL_TYPES; + if (UCC_OK != ucc_lib_get_attr(cm->ucc_lib, &cm->ucc_lib_attr)) { + UCC_ERROR("UCC get lib attr failed"); + goto cleanup_lib; + } + + if (cm->ucc_lib_attr.thread_mode < tm_requested) { + UCC_ERROR("UCC library doesn't support MPI_THREAD_MULTIPLE"); + goto cleanup_lib; + } + ctx_params.mask = UCC_CONTEXT_PARAM_FIELD_OOB; + ctx_params.oob.allgather = oob_allgather; + ctx_params.oob.req_test = oob_allgather_test; + ctx_params.oob.req_free = oob_allgather_free; + ctx_params.oob.coll_info = (void*)MPI_COMM_WORLD; + ctx_params.oob.n_oob_eps = ompi_comm_size(&ompi_mpi_comm_world.comm); + ctx_params.oob.oob_ep = ompi_comm_rank(&ompi_mpi_comm_world.comm); + if (UCC_OK != ucc_context_config_read(cm->ucc_lib, NULL, &ctx_config)) { + UCC_ERROR("UCC context config read failed"); + goto cleanup_lib; + } + + sprintf(str_buf, "%u", ompi_proc_world_size()); + if (UCC_OK != ucc_context_config_modify(ctx_config, NULL, "ESTIMATED_NUM_EPS", + str_buf)) { + UCC_ERROR("UCC context config modify failed for estimated_num_eps"); + goto cleanup_lib; + } + + sprintf(str_buf, "%u", opal_process_info.num_local_peers + 1); + if (UCC_OK != ucc_context_config_modify(ctx_config, NULL, "ESTIMATED_NUM_PPN", + str_buf)) { + UCC_ERROR("UCC context config modify failed for estimated_num_eps"); + goto cleanup_lib; + } + + if (UCC_OK != ucc_context_create(cm->ucc_lib, &ctx_params, + ctx_config, &cm->ucc_context)) { + UCC_ERROR("UCC context create failed"); + ucc_context_config_release(ctx_config); + goto cleanup_lib; + } + ucc_context_config_release(ctx_config); + + copy_fn.attr_communicator_copy_fn = (MPI_Comm_internal_copy_attr_function*) + MPI_COMM_NULL_COPY_FN; + del_fn.attr_communicator_delete_fn = ucc_comm_attr_del_fn; + if (OMPI_SUCCESS != ompi_attr_create_keyval(COMM_ATTR, copy_fn, del_fn, + &ucc_comm_attr_keyval, NULL ,0, NULL)) { + UCC_ERROR("UCC comm keyval create failed"); + goto cleanup_ctx; + } + + OBJ_CONSTRUCT(&cm->requests, opal_free_list_t); + opal_free_list_init(&cm->requests, sizeof(mca_coll_ucc_req_t), + opal_cache_line_size, OBJ_CLASS(mca_coll_ucc_req_t), + 0, 0, /* no payload data */ + 8, -1, 8, /* num_to_alloc, max, per alloc */ + NULL, 0, NULL, NULL, NULL /* no Mpool or init function */); + + opal_progress_register(mca_coll_ucc_progress); + UCC_VERBOSE(1, "initialized ucc context"); + cm->libucc_initialized = true; + return OMPI_SUCCESS; +cleanup_ctx: + ucc_context_destroy(cm->ucc_context); + +cleanup_lib: + ucc_finalize(cm->ucc_lib); + cm->ucc_enable = 0; + cm->libucc_initialized = false; + return OMPI_ERROR; +} + +uint64_t rank_map_cb(uint64_t ep, void *cb_ctx) +{ + struct ompi_communicator_t *comm = cb_ctx; + + return ((ompi_process_name_t*)&ompi_comm_peer_lookup(comm, ep)->super. + proc_name)->vpid; +} + +static inline ucc_ep_map_t get_rank_map(struct ompi_communicator_t *comm) +{ + ucc_ep_map_t map; + int64_t r1, r2, stride, i; + int is_strided; + + map.ep_num = ompi_comm_size(comm); + if (comm == &ompi_mpi_comm_world.comm) { + map.type = UCC_EP_MAP_FULL; + return map; + } + + /* try to detect strided pattern */ + is_strided = 1; + r1 = rank_map_cb(0, comm); + r2 = rank_map_cb(1, comm); + stride = r2 - r1; + for (i = 2; i < map.ep_num; i++) { + r1 = r2; + r2 = rank_map_cb(i, comm); + if (r2 - r1 != stride) { + is_strided = 0; + break; + } + } + + if (is_strided) { + map.type = UCC_EP_MAP_STRIDED; + map.strided.start = r1; + map.strided.stride = stride; + } else { + map.type = UCC_EP_MAP_CB; + map.cb.cb = rank_map_cb; + map.cb.cb_ctx = (void*)comm; + } + + return map; +} +/* + * Initialize module on the communicator + */ +static int mca_coll_ucc_module_enable(mca_coll_base_module_t *module, + struct ompi_communicator_t *comm) +{ + mca_coll_ucc_component_t *cm = &mca_coll_ucc_component; + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t *)module; + ucc_status_t status; + int rc; + ucc_team_params_t team_params = { + .mask = UCC_TEAM_PARAM_FIELD_EP_MAP | + UCC_TEAM_PARAM_FIELD_EP | + UCC_TEAM_PARAM_FIELD_EP_RANGE | + UCC_TEAM_PARAM_FIELD_ID, + .ep_map = { + .type = (comm == &ompi_mpi_comm_world.comm) ? + UCC_EP_MAP_FULL : UCC_EP_MAP_CB, + .ep_num = ompi_comm_size(comm), + .cb.cb = rank_map_cb, + .cb.cb_ctx = (void*)comm + }, + .ep = ompi_comm_rank(comm), + .ep_range = UCC_COLLECTIVE_EP_RANGE_CONTIG, + .id = comm->c_contextid + }; + UCC_VERBOSE(2,"creating ucc_team for comm %p, comm_id %d, comm_size %d", + (void*)comm,comm->c_contextid,ompi_comm_size(comm)); + + if (OMPI_SUCCESS != mca_coll_ucc_save_coll_handlers(ucc_module)){ + UCC_ERROR("mca_coll_ucc_save_coll_handlers failed"); + goto err; + } + + if (UCC_OK != ucc_team_create_post(&cm->ucc_context, 1, + &team_params, &ucc_module->ucc_team)) { + UCC_ERROR("ucc_team_create_post failed"); + goto err; + } + while (UCC_INPROGRESS == (status = ucc_team_create_test( + ucc_module->ucc_team))) { + opal_progress(); + } + if (UCC_OK != status) { + UCC_ERROR("ucc_team_create_test failed"); + goto err; + } + + rc = ompi_attr_set_c(COMM_ATTR, comm, &comm->c_keyhash, + ucc_comm_attr_keyval, (void *)module, false); + if (OMPI_SUCCESS != rc) { + UCC_ERROR("ucc ompi_attr_set_c failed"); + goto err; + } + return OMPI_SUCCESS; + +err: + ucc_module->ucc_team = NULL; + cm->ucc_enable = 0; + opal_progress_unregister(mca_coll_ucc_progress); + return OMPI_ERROR; +} + + +#define SET_COLL_PTR(_module, _COLL, _coll) do { \ + _module->super.coll_ ## _coll = NULL; \ + _module->super.coll_i ## _coll = NULL; \ + if ((mca_coll_ucc_component.ucc_lib_attr.coll_types & \ + UCC_COLL_TYPE_ ## _COLL)) { \ + if (mca_coll_ucc_component.cts_requested & \ + UCC_COLL_TYPE_ ## _COLL) { \ + _module->super.coll_ ## _coll = mca_coll_ucc_ ## _coll; \ + } \ + if (mca_coll_ucc_component.nb_cts_requested & \ + UCC_COLL_TYPE_ ## _COLL) { \ + _module->super.coll_i ## _coll = mca_coll_ucc_i ## _coll; \ + } \ + } \ + } while(0) + +/* + * Invoked when there's a new communicator that has been created. + * Look at the communicator and decide which set of functions and + * priority we want to return. + */ +mca_coll_base_module_t * +mca_coll_ucc_comm_query(struct ompi_communicator_t *comm, int *priority) +{ + mca_coll_ucc_component_t *cm = &mca_coll_ucc_component; + mca_coll_ucc_module_t *ucc_module; + *priority = 0; + + if (!cm->ucc_enable){ + return NULL; + } + + if (OMPI_COMM_IS_INTER(comm) || ompi_comm_size(comm) < cm->ucc_np + || ompi_comm_size(comm) < 2){ + return NULL; + } + + if (!cm->libucc_initialized) { + if (OMPI_SUCCESS != mca_coll_ucc_init_ctx()) { + cm->ucc_enable = 0; + return NULL; + } + } + + ucc_module = OBJ_NEW(mca_coll_ucc_module_t); + if (!ucc_module) { + cm->ucc_enable = 0; + return NULL; + } + ucc_module->comm = comm; + ucc_module->super.coll_module_enable = mca_coll_ucc_module_enable; + *priority = cm->ucc_priority; + SET_COLL_PTR(ucc_module, BARRIER, barrier); + SET_COLL_PTR(ucc_module, BCAST, bcast); + SET_COLL_PTR(ucc_module, ALLREDUCE, allreduce); + SET_COLL_PTR(ucc_module, ALLTOALL, alltoall); + SET_COLL_PTR(ucc_module, ALLTOALLV, alltoallv); + SET_COLL_PTR(ucc_module, REDUCE, reduce); + SET_COLL_PTR(ucc_module, ALLGATHER, allgather); + SET_COLL_PTR(ucc_module, ALLGATHERV, allgatherv); + return &ucc_module->super; +} + + +OBJ_CLASS_INSTANCE(mca_coll_ucc_module_t, + mca_coll_base_module_t, + mca_coll_ucc_module_construct, + mca_coll_ucc_module_destruct); + +OBJ_CLASS_INSTANCE(mca_coll_ucc_req_t, ompi_request_t, + NULL, NULL); + +int mca_coll_ucc_req_free(struct ompi_request_t **ompi_req) +{ + opal_free_list_return (&mca_coll_ucc_component.requests, + (opal_free_list_item_t *)(*ompi_req)); + *ompi_req = &ompi_request_empty; + return OMPI_SUCCESS; +} + + +void mca_coll_ucc_completion(void *data, ucc_status_t status) +{ + mca_coll_ucc_req_t *coll_req = (mca_coll_ucc_req_t*)data; + ucc_collective_finalize(coll_req->ucc_req); + ompi_request_complete(&coll_req->super, true); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_reduce.c openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_reduce.c --- openmpi-4.1.2/ompi/mca/coll/ucc/coll_ucc_reduce.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/coll_ucc_reduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,107 @@ +/** + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + */ + +#include "coll_ucc_common.h" + +static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf, int count, + struct ompi_datatype_t *dtype, + struct ompi_op_t *op, int root, + mca_coll_ucc_module_t *ucc_module, + ucc_coll_req_h *req, + mca_coll_ucc_req_t *coll_req) +{ + ucc_datatype_t ucc_dt; + ucc_reduction_op_t ucc_op; + + ucc_dt = ompi_dtype_to_ucc_dtype(dtype); + ucc_op = ompi_op_to_ucc_op(op); + if (OPAL_UNLIKELY(COLL_UCC_DT_UNSUPPORTED == ucc_dt)) { + UCC_VERBOSE(5, "ompi_datatype is not supported: dtype = %s", + dtype->super.name); + goto fallback; + } + if (OPAL_UNLIKELY(COLL_UCC_OP_UNSUPPORTED == ucc_op)) { + UCC_VERBOSE(5, "ompi_op is not supported: op = %s", + op->o_name); + goto fallback; + } + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_REDUCE, + .root = root, + .src.info = { + .buffer = (void*)sbuf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = rbuf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .op = ucc_op, + }; + if (MPI_IN_PLACE == sbuf) { + coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + COLL_UCC_REQ_INIT(coll_req, req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_coll_ucc_reduce(const void *sbuf, void* rbuf, int count, + struct ompi_datatype_t *dtype, + struct ompi_op_t *op, int root, + struct ompi_communicator_t *comm, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + + UCC_VERBOSE(3, "running ucc reduce"); + COLL_UCC_CHECK(mca_coll_ucc_reduce_init(sbuf, rbuf, count, dtype, op, + root, ucc_module, &req, NULL)); + COLL_UCC_POST_AND_CHECK(req); + COLL_UCC_CHECK(coll_ucc_req_wait(req)); + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback reduce"); + return ucc_module->previous_reduce(sbuf, rbuf, count, dtype, op, root, + comm, ucc_module->previous_reduce_module); +} + +int mca_coll_ucc_ireduce(const void *sbuf, void* rbuf, int count, + struct ompi_datatype_t *dtype, + struct ompi_op_t *op, int root, + struct ompi_communicator_t *comm, + ompi_request_t** request, + mca_coll_base_module_t *module) +{ + mca_coll_ucc_module_t *ucc_module = (mca_coll_ucc_module_t*)module; + ucc_coll_req_h req; + mca_coll_ucc_req_t *coll_req = NULL; + + UCC_VERBOSE(3, "running ucc ireduce"); + COLL_UCC_GET_REQ(coll_req); + COLL_UCC_CHECK(mca_coll_ucc_reduce_init(sbuf, rbuf, count, dtype, op, root, + ucc_module, &req, coll_req)); + COLL_UCC_POST_AND_CHECK(req); + *request = &coll_req->super; + return OMPI_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback ireduce"); + if (coll_req) { + mca_coll_ucc_req_free((ompi_request_t **)&coll_req); + } + return ucc_module->previous_ireduce(sbuf, rbuf, count, dtype, op, root, + comm, request, ucc_module->previous_ireduce_module); +} diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/configure.m4 openmpi-4.1.4/ompi/mca/coll/ucc/configure.m4 --- openmpi-4.1.2/ompi/mca/coll/ucc/configure.m4 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/configure.m4 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,39 @@ +# -*- shell-script -*- +# +# +# Copyright (c) 2021 Mellanox Technologies. All rights reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + + +# MCA_coll_ucc_CONFIG([action-if-can-compile], +# [action-if-cant-compile]) +# ------------------------------------------------ +AC_DEFUN([MCA_ompi_coll_ucc_CONFIG],[ + AC_CONFIG_FILES([ompi/mca/coll/ucc/Makefile]) + + OMPI_CHECK_UCC([coll_ucc], + [coll_ucc_happy="yes"], + [coll_ucc_happy="no"]) + + AS_IF([test "$coll_ucc_happy" = "yes"], + [coll_ucc_WRAPPER_EXTRA_LDFLAGS="$coll_ucc_LDFLAGS" + coll_ucc_CPPFLAGS="$coll_ucc_CPPFLAGS" + coll_ucc_WRAPPER_EXTRA_LIBS="$coll_ucc_LIBS" + $1], + [$2]) + + OPAL_SUMMARY_ADD([[Miscellaneous]],[[Open UCC]],[$1],[$coll_ucc_happy])])]) + + # substitute in the things needed to build ucc + AC_SUBST([coll_ucc_CFLAGS]) + AC_SUBST([coll_ucc_CPPFLAGS]) + AC_SUBST([coll_ucc_LDFLAGS]) + AC_SUBST([coll_ucc_LIBS]) +])dnl diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/Makefile.am openmpi-4.1.4/ompi/mca/coll/ucc/Makefile.am --- openmpi-4.1.2/ompi/mca/coll/ucc/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/Makefile.am 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,53 @@ +# -*- shell-script -*- +# +# +# Copyright (c) 2021 Mellanox Technologies. All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# +# + +AM_CPPFLAGS = $(coll_ucc_CPPFLAGS) + +coll_ucc_sources = \ + coll_ucc.h \ + coll_ucc_debug.h \ + coll_ucc_dtypes.h \ + coll_ucc_common.h \ + coll_ucc_module.c \ + coll_ucc_component.c \ + coll_ucc_barrier.c \ + coll_ucc_bcast.c \ + coll_ucc_allreduce.c \ + coll_ucc_reduce.c \ + coll_ucc_alltoall.c \ + coll_ucc_alltoallv.c \ + coll_ucc_allgather.c \ + coll_ucc_allgatherv.c + +# Make the output library in this directory, and name it either +# mca__.la (for DSO builds) or libmca__.la +# (for static builds). + +if MCA_BUILD_ompi_coll_ucc_DSO +component_noinst = +component_install = mca_coll_ucc.la +else +component_noinst = libmca_coll_ucc.la +component_install = +endif + +mcacomponentdir = $(ompilibdir) +mcacomponent_LTLIBRARIES = $(component_install) +mca_coll_ucc_la_SOURCES = $(coll_ucc_sources) +mca_coll_ucc_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ + $(coll_ucc_LIBS) +mca_coll_ucc_la_LDFLAGS = -module -avoid-version $(coll_ucc_LDFLAGS) + +noinst_LTLIBRARIES = $(component_noinst) +libmca_coll_ucc_la_SOURCES = $(coll_ucc_sources) +libmca_coll_ucc_la_LIBADD = $(coll_ucc_LIBS) +libmca_coll_ucc_la_LDFLAGS = -module -avoid-version $(coll_ucc_LDFLAGS) diff -Nru openmpi-4.1.2/ompi/mca/coll/ucc/Makefile.in openmpi-4.1.4/ompi/mca/coll/ucc/Makefile.in --- openmpi-4.1.2/ompi/mca/coll/ucc/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/coll/ucc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,2135 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# -*- shell-script -*- +# +# +# Copyright (c) 2021 Mellanox Technologies. All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# +# + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = ompi/mca/coll/ucc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \ + $(top_srcdir)/config/c_weak_symbols.m4 \ + $(top_srcdir)/config/libtool.m4 \ + $(top_srcdir)/config/ltoptions.m4 \ + $(top_srcdir)/config/ltsugar.m4 \ + $(top_srcdir)/config/ltversion.m4 \ + $(top_srcdir)/config/lt~obsolete.m4 \ + $(top_srcdir)/config/ompi_check_gpfs.m4 \ + $(top_srcdir)/config/ompi_check_ime.m4 \ + $(top_srcdir)/config/ompi_check_libfca.m4 \ + $(top_srcdir)/config/ompi_check_libhcoll.m4 \ + $(top_srcdir)/config/ompi_check_lustre.m4 \ + $(top_srcdir)/config/ompi_check_mxm.m4 \ + $(top_srcdir)/config/ompi_check_psm.m4 \ + $(top_srcdir)/config/ompi_check_psm2.m4 \ + $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ + $(top_srcdir)/config/ompi_check_ucx.m4 \ + $(top_srcdir)/config/ompi_config_files.m4 \ + $(top_srcdir)/config/ompi_configure_options.m4 \ + $(top_srcdir)/config/ompi_contrib.m4 \ + $(top_srcdir)/config/ompi_cxx_find_exception_flags.m4 \ + $(top_srcdir)/config/ompi_cxx_find_template_parameters.m4 \ + $(top_srcdir)/config/ompi_cxx_find_template_repository.m4 \ + $(top_srcdir)/config/ompi_cxx_have_exceptions.m4 \ + $(top_srcdir)/config/ompi_endpoint_tag.m4 \ + $(top_srcdir)/config/ompi_ext.m4 \ + $(top_srcdir)/config/ompi_find_mpi_aint_count_offset.m4 \ + $(top_srcdir)/config/ompi_fortran_check.m4 \ + $(top_srcdir)/config/ompi_fortran_check_abstract.m4 \ + $(top_srcdir)/config/ompi_fortran_check_asynchronous.m4 \ + $(top_srcdir)/config/ompi_fortran_check_bind_c.m4 \ + $(top_srcdir)/config/ompi_fortran_check_c_funloc.m4 \ + $(top_srcdir)/config/ompi_fortran_check_f08_assumed_rank.m4 \ + $(top_srcdir)/config/ompi_fortran_check_ignore_tkr.m4 \ + $(top_srcdir)/config/ompi_fortran_check_interface.m4 \ + $(top_srcdir)/config/ompi_fortran_check_iso_fortran_env.m4 \ + $(top_srcdir)/config/ompi_fortran_check_logical_array.m4 \ + $(top_srcdir)/config/ompi_fortran_check_max_array_rank.m4 \ + $(top_srcdir)/config/ompi_fortran_check_optional_args.m4 \ + $(top_srcdir)/config/ompi_fortran_check_preprocess_f90.m4 \ + $(top_srcdir)/config/ompi_fortran_check_private.m4 \ + $(top_srcdir)/config/ompi_fortran_check_procedure.m4 \ + $(top_srcdir)/config/ompi_fortran_check_protected.m4 \ + $(top_srcdir)/config/ompi_fortran_check_real16_c_equiv.m4 \ + $(top_srcdir)/config/ompi_fortran_check_storage_size.m4 \ + $(top_srcdir)/config/ompi_fortran_check_type.m4 \ + $(top_srcdir)/config/ompi_fortran_check_use_only.m4 \ + $(top_srcdir)/config/ompi_fortran_find_ext_symbol_convention.m4 \ + $(top_srcdir)/config/ompi_fortran_find_module_include_flag.m4 \ + $(top_srcdir)/config/ompi_fortran_get_alignment.m4 \ + $(top_srcdir)/config/ompi_fortran_get_handle_max.m4 \ + $(top_srcdir)/config/ompi_fortran_get_kind_value.m4 \ + $(top_srcdir)/config/ompi_fortran_get_sizeof.m4 \ + $(top_srcdir)/config/ompi_fortran_get_value_true.m4 \ + $(top_srcdir)/config/ompi_interix.m4 \ + $(top_srcdir)/config/ompi_setup_contrib.m4 \ + $(top_srcdir)/config/ompi_setup_cxx.m4 \ + $(top_srcdir)/config/ompi_setup_fc.m4 \ + $(top_srcdir)/config/ompi_setup_java.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_ext.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_fortran.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_java.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_profiling.m4 \ + $(top_srcdir)/config/opal_case_sensitive_fs_setup.m4 \ + $(top_srcdir)/config/opal_check_alps.m4 \ + $(top_srcdir)/config/opal_check_attributes.m4 \ + $(top_srcdir)/config/opal_check_broken_qsort.m4 \ + $(top_srcdir)/config/opal_check_cma.m4 \ + $(top_srcdir)/config/opal_check_compiler_version.m4 \ + $(top_srcdir)/config/opal_check_compiler_works.m4 \ + $(top_srcdir)/config/opal_check_cray_pmi.m4 \ + $(top_srcdir)/config/opal_check_cuda.m4 \ + $(top_srcdir)/config/opal_check_icc.m4 \ + $(top_srcdir)/config/opal_check_ident.m4 \ + $(top_srcdir)/config/opal_check_knem.m4 \ + $(top_srcdir)/config/opal_check_libnl.m4 \ + $(top_srcdir)/config/opal_check_offsetof.m4 \ + $(top_srcdir)/config/opal_check_ofi.m4 \ + $(top_srcdir)/config/opal_check_openfabrics.m4 \ + $(top_srcdir)/config/opal_check_os_flavors.m4 \ + $(top_srcdir)/config/opal_check_package.m4 \ + $(top_srcdir)/config/opal_check_pmi.m4 \ + $(top_srcdir)/config/opal_check_portals4.m4 \ + $(top_srcdir)/config/opal_check_ps.m4 \ + $(top_srcdir)/config/opal_check_pthread_pids.m4 \ + $(top_srcdir)/config/opal_check_singularity.m4 \ + $(top_srcdir)/config/opal_check_ugni.m4 \ + $(top_srcdir)/config/opal_check_vendor.m4 \ + $(top_srcdir)/config/opal_check_verbs.m4 \ + $(top_srcdir)/config/opal_check_visibility.m4 \ + $(top_srcdir)/config/opal_check_withdir.m4 \ + $(top_srcdir)/config/opal_check_xpmem.m4 \ + $(top_srcdir)/config/opal_config_asm.m4 \ + $(top_srcdir)/config/opal_config_files.m4 \ + $(top_srcdir)/config/opal_config_pthreads.m4 \ + $(top_srcdir)/config/opal_config_subdir.m4 \ + $(top_srcdir)/config/opal_config_subdir_args.m4 \ + $(top_srcdir)/config/opal_config_threads.m4 \ + $(top_srcdir)/config/opal_configure_options.m4 \ + $(top_srcdir)/config/opal_ensure_contains_optflags.m4 \ + $(top_srcdir)/config/opal_find_type.m4 \ + $(top_srcdir)/config/opal_functions.m4 \ + $(top_srcdir)/config/opal_lang_link_with_c.m4 \ + $(top_srcdir)/config/opal_load_platform.m4 \ + $(top_srcdir)/config/opal_mca.m4 \ + $(top_srcdir)/config/opal_save_version.m4 \ + $(top_srcdir)/config/opal_search_libs.m4 \ + $(top_srcdir)/config/opal_set_lib_prefix.m4 \ + $(top_srcdir)/config/opal_set_mca_prefix.m4 \ + $(top_srcdir)/config/opal_setup_cc.m4 \ + $(top_srcdir)/config/opal_setup_cli.m4 \ + $(top_srcdir)/config/opal_setup_cxx.m4 \ + $(top_srcdir)/config/opal_setup_ft.m4 \ + $(top_srcdir)/config/opal_setup_wrappers.m4 \ + $(top_srcdir)/config/opal_setup_zlib.m4 \ + $(top_srcdir)/config/opal_strip_optflags.m4 \ + $(top_srcdir)/config/opal_summary.m4 \ + $(top_srcdir)/config/opal_try_assemble.m4 \ + $(top_srcdir)/config/orte_check_lsf.m4 \ + $(top_srcdir)/config/orte_check_moab.m4 \ + $(top_srcdir)/config/orte_check_sge.m4 \ + $(top_srcdir)/config/orte_check_slurm.m4 \ + $(top_srcdir)/config/orte_check_tm.m4 \ + $(top_srcdir)/config/orte_config_files.m4 \ + $(top_srcdir)/config/orte_configure_options.m4 \ + $(top_srcdir)/config/orte_setup_debugger_flags.m4 \ + $(top_srcdir)/config/oshmem_config_files.m4 \ + $(top_srcdir)/config/oshmem_configure_options.m4 \ + $(top_srcdir)/config/oshmem_setup_profiling.m4 \ + $(top_srcdir)/config/pkg.m4 \ + $(top_srcdir)/config/autogen_found_items.m4 \ + $(top_srcdir)/opal/mca/backtrace/configure.m4 \ + $(top_srcdir)/opal/mca/dl/configure.m4 \ + $(top_srcdir)/opal/mca/event/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/configure.m4 \ + $(top_srcdir)/opal/mca/installdirs/configure.m4 \ + $(top_srcdir)/opal/mca/memchecker/configure.m4 \ + $(top_srcdir)/opal/mca/memcpy/configure.m4 \ + $(top_srcdir)/opal/mca/memory/configure.m4 \ + $(top_srcdir)/opal/mca/pstat/configure.m4 \ + $(top_srcdir)/opal/mca/timer/configure.m4 \ + $(top_srcdir)/opal/mca/common/cuda/configure.m4 \ + $(top_srcdir)/opal/mca/common/ofi/configure.m4 \ + $(top_srcdir)/opal/mca/common/sm/configure.m4 \ + $(top_srcdir)/opal/mca/common/ucx/configure.m4 \ + $(top_srcdir)/opal/mca/common/verbs/configure.m4 \ + $(top_srcdir)/opal/mca/common/verbs_usnic/configure.m4 \ + $(top_srcdir)/opal/mca/backtrace/execinfo/configure.m4 \ + $(top_srcdir)/opal/mca/backtrace/none/configure.m4 \ + $(top_srcdir)/opal/mca/backtrace/printstack/configure.m4 \ + $(top_srcdir)/opal/mca/btl/ofi/configure.m4 \ + $(top_srcdir)/opal/mca/btl/openib/configure.m4 \ + $(top_srcdir)/opal/mca/btl/portals4/configure.m4 \ + $(top_srcdir)/opal/mca/btl/sm/configure.m4 \ + $(top_srcdir)/opal/mca/btl/smcuda/configure.m4 \ + $(top_srcdir)/opal/mca/btl/tcp/configure.m4 \ + $(top_srcdir)/opal/mca/btl/uct/configure.m4 \ + $(top_srcdir)/opal/mca/btl/ugni/configure.m4 \ + $(top_srcdir)/opal/mca/btl/usnic/configure.m4 \ + $(top_srcdir)/opal/mca/btl/vader/configure.m4 \ + $(top_srcdir)/opal/mca/crs/self/configure.m4 \ + $(top_srcdir)/opal/mca/dl/dlopen/configure.m4 \ + $(top_srcdir)/opal/mca/dl/libltdl/configure.m4 \ + $(top_srcdir)/opal/mca/event/external/configure.m4 \ + $(top_srcdir)/opal/mca/event/libevent2022/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/external/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_pkg.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_check_attributes.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_check_visibility.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_check_vendor.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_components.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_internal.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/netloc.m4 \ + $(top_srcdir)/opal/mca/if/bsdx_ipv4/configure.m4 \ + $(top_srcdir)/opal/mca/if/bsdx_ipv6/configure.m4 \ + $(top_srcdir)/opal/mca/if/linux_ipv6/configure.m4 \ + $(top_srcdir)/opal/mca/if/posix_ipv4/configure.m4 \ + $(top_srcdir)/opal/mca/if/solaris_ipv6/configure.m4 \ + $(top_srcdir)/opal/mca/installdirs/config/configure.m4 \ + $(top_srcdir)/opal/mca/installdirs/env/configure.m4 \ + $(top_srcdir)/opal/mca/memchecker/valgrind/configure.m4 \ + $(top_srcdir)/opal/mca/memory/malloc_solaris/configure.m4 \ + $(top_srcdir)/opal/mca/memory/patcher/configure.m4 \ + $(top_srcdir)/opal/mca/mpool/memkind/configure.m4 \ + $(top_srcdir)/opal/mca/patcher/linux/configure.m4 \ + $(top_srcdir)/opal/mca/patcher/overwrite/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/cray/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/ext1x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/ext2x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/ext3x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/flux/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/pmix3x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/s1/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/s2/configure.m4 \ + $(top_srcdir)/opal/mca/pstat/linux/configure.m4 \ + $(top_srcdir)/opal/mca/pstat/test/configure.m4 \ + $(top_srcdir)/opal/mca/rcache/gpusm/configure.m4 \ + $(top_srcdir)/opal/mca/rcache/rgpusm/configure.m4 \ + $(top_srcdir)/opal/mca/rcache/udreg/configure.m4 \ + $(top_srcdir)/opal/mca/reachable/netlink/configure.m4 \ + $(top_srcdir)/opal/mca/shmem/mmap/configure.m4 \ + $(top_srcdir)/opal/mca/shmem/posix/configure.m4 \ + $(top_srcdir)/opal/mca/shmem/sysv/configure.m4 \ + $(top_srcdir)/opal/mca/timer/altix/configure.m4 \ + $(top_srcdir)/opal/mca/timer/darwin/configure.m4 \ + $(top_srcdir)/opal/mca/timer/linux/configure.m4 \ + $(top_srcdir)/opal/mca/timer/solaris/configure.m4 \ + $(top_srcdir)/orte/mca/common/alps/configure.m4 \ + $(top_srcdir)/orte/mca/ess/alps/configure.m4 \ + $(top_srcdir)/orte/mca/ess/lsf/configure.m4 \ + $(top_srcdir)/orte/mca/ess/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/ess/tm/configure.m4 \ + $(top_srcdir)/orte/mca/odls/alps/configure.m4 \ + $(top_srcdir)/orte/mca/odls/default/configure.m4 \ + $(top_srcdir)/orte/mca/odls/pspawn/configure.m4 \ + $(top_srcdir)/orte/mca/oob/alps/configure.m4 \ + $(top_srcdir)/orte/mca/oob/tcp/configure.m4 \ + $(top_srcdir)/orte/mca/plm/alps/configure.m4 \ + $(top_srcdir)/orte/mca/plm/isolated/configure.m4 \ + $(top_srcdir)/orte/mca/plm/lsf/configure.m4 \ + $(top_srcdir)/orte/mca/plm/rsh/configure.m4 \ + $(top_srcdir)/orte/mca/plm/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/plm/tm/configure.m4 \ + $(top_srcdir)/orte/mca/ras/alps/configure.m4 \ + $(top_srcdir)/orte/mca/ras/gridengine/configure.m4 \ + $(top_srcdir)/orte/mca/ras/lsf/configure.m4 \ + $(top_srcdir)/orte/mca/ras/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/ras/tm/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/alps/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/jsm/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/moab/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/singularity/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/snapc/full/configure.m4 \ + $(top_srcdir)/orte/mca/sstore/central/configure.m4 \ + $(top_srcdir)/orte/mca/sstore/stage/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/configure.m4 \ + $(top_srcdir)/ompi/mca/fcoll/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/configure.m4 \ + $(top_srcdir)/ompi/mca/hook/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/configure.m4 \ + $(top_srcdir)/ompi/mca/rte/configure.m4 \ + $(top_srcdir)/ompi/mca/sharedfp/configure.m4 \ + $(top_srcdir)/ompi/mca/common/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/common/ompio/configure.m4 \ + $(top_srcdir)/ompi/mca/bml/r2/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/cuda/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/fca/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ + $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/pvfs2/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/gpfs/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/ime/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/lustre/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/pvfs2/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/ufs/configure.m4 \ + $(top_srcdir)/ompi/mca/io/ompio/configure.m4 \ + $(top_srcdir)/ompi/mca/io/romio321/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/ofi/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/psm/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/psm2/configure.m4 \ + $(top_srcdir)/ompi/mca/op/avx/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/pt2pt/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/rdma/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/ucx/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/crcpw/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/ob1/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/ucx/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/v/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/yalla/configure.m4 \ + $(top_srcdir)/ompi/mca/rte/orte/configure.m4 \ + $(top_srcdir)/ompi/mca/rte/pmix/configure.m4 \ + $(top_srcdir)/ompi/mca/sharedfp/sm/configure.m4 \ + $(top_srcdir)/ompi/mca/topo/treematch/configure.m4 \ + $(top_srcdir)/oshmem/mca/memheap/configure.m4 \ + $(top_srcdir)/oshmem/mca/spml/configure.m4 \ + $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ + $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ + $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ + $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/sysv/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/ucx/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/verbs/configure.m4 \ + $(top_srcdir)/ompi/mpiext/affinity/configure.m4 \ + $(top_srcdir)/ompi/mpiext/cr/configure.m4 \ + $(top_srcdir)/ompi/mpiext/cuda/configure.m4 \ + $(top_srcdir)/ompi/mpiext/pcollreq/configure.m4 \ + $(top_srcdir)/ompi/contrib/libompitrace/configure.m4 \ + $(top_srcdir)/config/opal_get_version.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/opal/include/opal_config.h \ + $(top_builddir)/ompi/include/mpi.h \ + $(top_builddir)/oshmem/include/shmem.h \ + $(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/private/autogen/config.h \ + $(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/hwloc/autogen/config.h \ + $(top_builddir)/ompi/mpiext/cuda/c/mpiext_cuda_c.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(mcacomponentdir)" +LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = +libmca_coll_ucc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_1 = coll_ucc_module.lo coll_ucc_component.lo \ + coll_ucc_barrier.lo coll_ucc_bcast.lo coll_ucc_allreduce.lo \ + coll_ucc_reduce.lo coll_ucc_alltoall.lo coll_ucc_alltoallv.lo \ + coll_ucc_allgather.lo coll_ucc_allgatherv.lo +am_libmca_coll_ucc_la_OBJECTS = $(am__objects_1) +libmca_coll_ucc_la_OBJECTS = $(am_libmca_coll_ucc_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libmca_coll_ucc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libmca_coll_ucc_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@MCA_BUILD_ompi_coll_ucc_DSO_FALSE@am_libmca_coll_ucc_la_rpath = +mca_coll_ucc_la_DEPENDENCIES = \ + $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ + $(am__DEPENDENCIES_1) +am_mca_coll_ucc_la_OBJECTS = $(am__objects_1) +mca_coll_ucc_la_OBJECTS = $(am_mca_coll_ucc_la_OBJECTS) +mca_coll_ucc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(mca_coll_ucc_la_LDFLAGS) $(LDFLAGS) \ + -o $@ +@MCA_BUILD_ompi_coll_ucc_DSO_TRUE@am_mca_coll_ucc_la_rpath = -rpath \ +@MCA_BUILD_ompi_coll_ucc_DSO_TRUE@ $(mcacomponentdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/opal/include -I$(top_builddir)/ompi/include -I$(top_builddir)/oshmem/include -I$(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/private/autogen -I$(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/hwloc/autogen -I$(top_builddir)/ompi/mpiext/cuda/c +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libmca_coll_ucc_la_SOURCES) $(mca_coll_ucc_la_SOURCES) +DIST_SOURCES = $(libmca_coll_ucc_la_SOURCES) \ + $(mca_coll_ucc_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMCA_PARAM_SETS_DIR = @AMCA_PARAM_SETS_DIR@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASH = @BASH@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CFLAGS_WITHOUT_OPTFLAGS = @CFLAGS_WITHOUT_OPTFLAGS@ +CLEANFILES = @CLEANFILES@ +CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CRAY_ALPSLLI_CFLAGS = @CRAY_ALPSLLI_CFLAGS@ +CRAY_ALPSLLI_LIBS = @CRAY_ALPSLLI_LIBS@ +CRAY_ALPSLLI_STATIC_LIBS = @CRAY_ALPSLLI_STATIC_LIBS@ +CRAY_ALPSUTIL_CFLAGS = @CRAY_ALPSUTIL_CFLAGS@ +CRAY_ALPSUTIL_LIBS = @CRAY_ALPSUTIL_LIBS@ +CRAY_ALPSUTIL_STATIC_LIBS = @CRAY_ALPSUTIL_STATIC_LIBS@ +CRAY_ALPS_CFLAGS = @CRAY_ALPS_CFLAGS@ +CRAY_ALPS_LIBS = @CRAY_ALPS_LIBS@ +CRAY_ALPS_STATIC_LIBS = @CRAY_ALPS_STATIC_LIBS@ +CRAY_PMI_CFLAGS = @CRAY_PMI_CFLAGS@ +CRAY_PMI_LIBS = @CRAY_PMI_LIBS@ +CRAY_PMI_STATIC_LIBS = @CRAY_PMI_STATIC_LIBS@ +CRAY_UDREG_CFLAGS = @CRAY_UDREG_CFLAGS@ +CRAY_UDREG_LIBS = @CRAY_UDREG_LIBS@ +CRAY_UGNI_CFLAGS = @CRAY_UGNI_CFLAGS@ +CRAY_UGNI_LIBS = @CRAY_UGNI_LIBS@ +CRAY_WLM_DETECT_CFLAGS = @CRAY_WLM_DETECT_CFLAGS@ +CRAY_WLM_DETECT_LIBS = @CRAY_WLM_DETECT_LIBS@ +CRAY_WLM_DETECT_STATIC_LIBS = @CRAY_WLM_DETECT_STATIC_LIBS@ +CRAY_XPMEM_CFLAGS = @CRAY_XPMEM_CFLAGS@ +CRAY_XPMEM_LIBS = @CRAY_XPMEM_LIBS@ +CRAY_XPMEM_STATIC_LIBS = @CRAY_XPMEM_STATIC_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXCPPFLAGS = @CXXCPPFLAGS@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEBUGGER_CFLAGS = @DEBUGGER_CFLAGS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FC = @FC@ +FCFLAGS = @FCFLAGS@ +FCFLAGS_f = @FCFLAGS_f@ +FCFLAGS_f90 = @FCFLAGS_f90@ +FFLAGS = @FFLAGS@ +FGREP = @FGREP@ +FLUX_PMI_CFLAGS = @FLUX_PMI_CFLAGS@ +FLUX_PMI_LIBS = @FLUX_PMI_LIBS@ +GREP = @GREP@ +HWLOC_CFLAGS = @HWLOC_CFLAGS@ +HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@ +HWLOC_CUDA_LIBS = @HWLOC_CUDA_LIBS@ +HWLOC_EMBEDDED_CFLAGS = @HWLOC_EMBEDDED_CFLAGS@ +HWLOC_EMBEDDED_CPPFLAGS = @HWLOC_EMBEDDED_CPPFLAGS@ +HWLOC_EMBEDDED_LDADD = @HWLOC_EMBEDDED_LDADD@ +HWLOC_EMBEDDED_LIBS = @HWLOC_EMBEDDED_LIBS@ +HWLOC_GL_LIBS = @HWLOC_GL_LIBS@ +HWLOC_HAVE_LIBXML2 = @HWLOC_HAVE_LIBXML2@ +HWLOC_HAVE_NVML = @HWLOC_HAVE_NVML@ +HWLOC_HAVE_OPENCL = @HWLOC_HAVE_OPENCL@ +HWLOC_LDFLAGS = @HWLOC_LDFLAGS@ +HWLOC_LIBS = @HWLOC_LIBS@ +HWLOC_LIBS_PRIVATE = @HWLOC_LIBS_PRIVATE@ +HWLOC_LIBXML2_CFLAGS = @HWLOC_LIBXML2_CFLAGS@ +HWLOC_LIBXML2_LIBS = @HWLOC_LIBXML2_LIBS@ +HWLOC_MS_LIB = @HWLOC_MS_LIB@ +HWLOC_MS_LIB_ARCH = @HWLOC_MS_LIB_ARCH@ +HWLOC_NVML_LIBS = @HWLOC_NVML_LIBS@ +HWLOC_OPENCL_CFLAGS = @HWLOC_OPENCL_CFLAGS@ +HWLOC_OPENCL_LDFLAGS = @HWLOC_OPENCL_LDFLAGS@ +HWLOC_OPENCL_LIBS = @HWLOC_OPENCL_LIBS@ +HWLOC_PCIACCESS_CFLAGS = @HWLOC_PCIACCESS_CFLAGS@ +HWLOC_PCIACCESS_LIBS = @HWLOC_PCIACCESS_LIBS@ +HWLOC_PLUGINS_DIR = @HWLOC_PLUGINS_DIR@ +HWLOC_PLUGINS_PATH = @HWLOC_PLUGINS_PATH@ +HWLOC_RELEASE_DATE = @HWLOC_RELEASE_DATE@ +HWLOC_REQUIRES = @HWLOC_REQUIRES@ +HWLOC_VERSION = @HWLOC_VERSION@ +HWLOC_X11_CPPFLAGS = @HWLOC_X11_CPPFLAGS@ +HWLOC_X11_LIBS = @HWLOC_X11_LIBS@ +HWLOC_top_builddir = @HWLOC_top_builddir@ +HWLOC_top_srcdir = @HWLOC_top_srcdir@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JAR = @JAR@ +JAVAC = @JAVAC@ +JAVADOC = @JAVADOC@ +JAVAH = @JAVAH@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MCA_BUILD_OP_AVX2_FLAGS = @MCA_BUILD_OP_AVX2_FLAGS@ +MCA_BUILD_OP_AVX512_FLAGS = @MCA_BUILD_OP_AVX512_FLAGS@ +MCA_BUILD_OP_AVX_FLAGS = @MCA_BUILD_OP_AVX_FLAGS@ +MCA_PROJECT_DIST_SUBDIRS = @MCA_PROJECT_DIST_SUBDIRS@ +MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@ +MCA_ompi_FRAMEWORKS = @MCA_ompi_FRAMEWORKS@ +MCA_ompi_FRAMEWORKS_SUBDIRS = @MCA_ompi_FRAMEWORKS_SUBDIRS@ +MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_ompi_FRAMEWORK_LIBS = @MCA_ompi_FRAMEWORK_LIBS@ +MCA_ompi_bml_ALL_COMPONENTS = @MCA_ompi_bml_ALL_COMPONENTS@ +MCA_ompi_bml_ALL_SUBDIRS = @MCA_ompi_bml_ALL_SUBDIRS@ +MCA_ompi_bml_DSO_COMPONENTS = @MCA_ompi_bml_DSO_COMPONENTS@ +MCA_ompi_bml_DSO_SUBDIRS = @MCA_ompi_bml_DSO_SUBDIRS@ +MCA_ompi_bml_STATIC_COMPONENTS = @MCA_ompi_bml_STATIC_COMPONENTS@ +MCA_ompi_bml_STATIC_LTLIBS = @MCA_ompi_bml_STATIC_LTLIBS@ +MCA_ompi_bml_STATIC_SUBDIRS = @MCA_ompi_bml_STATIC_SUBDIRS@ +MCA_ompi_coll_ALL_COMPONENTS = @MCA_ompi_coll_ALL_COMPONENTS@ +MCA_ompi_coll_ALL_SUBDIRS = @MCA_ompi_coll_ALL_SUBDIRS@ +MCA_ompi_coll_DSO_COMPONENTS = @MCA_ompi_coll_DSO_COMPONENTS@ +MCA_ompi_coll_DSO_SUBDIRS = @MCA_ompi_coll_DSO_SUBDIRS@ +MCA_ompi_coll_STATIC_COMPONENTS = @MCA_ompi_coll_STATIC_COMPONENTS@ +MCA_ompi_coll_STATIC_LTLIBS = @MCA_ompi_coll_STATIC_LTLIBS@ +MCA_ompi_coll_STATIC_SUBDIRS = @MCA_ompi_coll_STATIC_SUBDIRS@ +MCA_ompi_common_ALL_COMPONENTS = @MCA_ompi_common_ALL_COMPONENTS@ +MCA_ompi_common_ALL_SUBDIRS = @MCA_ompi_common_ALL_SUBDIRS@ +MCA_ompi_common_DSO_COMPONENTS = @MCA_ompi_common_DSO_COMPONENTS@ +MCA_ompi_common_DSO_SUBDIRS = @MCA_ompi_common_DSO_SUBDIRS@ +MCA_ompi_common_STATIC_COMPONENTS = @MCA_ompi_common_STATIC_COMPONENTS@ +MCA_ompi_common_STATIC_LTLIBS = @MCA_ompi_common_STATIC_LTLIBS@ +MCA_ompi_common_STATIC_SUBDIRS = @MCA_ompi_common_STATIC_SUBDIRS@ +MCA_ompi_crcp_ALL_COMPONENTS = @MCA_ompi_crcp_ALL_COMPONENTS@ +MCA_ompi_crcp_ALL_SUBDIRS = @MCA_ompi_crcp_ALL_SUBDIRS@ +MCA_ompi_crcp_DSO_COMPONENTS = @MCA_ompi_crcp_DSO_COMPONENTS@ +MCA_ompi_crcp_DSO_SUBDIRS = @MCA_ompi_crcp_DSO_SUBDIRS@ +MCA_ompi_crcp_STATIC_COMPONENTS = @MCA_ompi_crcp_STATIC_COMPONENTS@ +MCA_ompi_crcp_STATIC_LTLIBS = @MCA_ompi_crcp_STATIC_LTLIBS@ +MCA_ompi_crcp_STATIC_SUBDIRS = @MCA_ompi_crcp_STATIC_SUBDIRS@ +MCA_ompi_fbtl_ALL_COMPONENTS = @MCA_ompi_fbtl_ALL_COMPONENTS@ +MCA_ompi_fbtl_ALL_SUBDIRS = @MCA_ompi_fbtl_ALL_SUBDIRS@ +MCA_ompi_fbtl_DSO_COMPONENTS = @MCA_ompi_fbtl_DSO_COMPONENTS@ +MCA_ompi_fbtl_DSO_SUBDIRS = @MCA_ompi_fbtl_DSO_SUBDIRS@ +MCA_ompi_fbtl_STATIC_COMPONENTS = @MCA_ompi_fbtl_STATIC_COMPONENTS@ +MCA_ompi_fbtl_STATIC_LTLIBS = @MCA_ompi_fbtl_STATIC_LTLIBS@ +MCA_ompi_fbtl_STATIC_SUBDIRS = @MCA_ompi_fbtl_STATIC_SUBDIRS@ +MCA_ompi_fcoll_ALL_COMPONENTS = @MCA_ompi_fcoll_ALL_COMPONENTS@ +MCA_ompi_fcoll_ALL_SUBDIRS = @MCA_ompi_fcoll_ALL_SUBDIRS@ +MCA_ompi_fcoll_DSO_COMPONENTS = @MCA_ompi_fcoll_DSO_COMPONENTS@ +MCA_ompi_fcoll_DSO_SUBDIRS = @MCA_ompi_fcoll_DSO_SUBDIRS@ +MCA_ompi_fcoll_STATIC_COMPONENTS = @MCA_ompi_fcoll_STATIC_COMPONENTS@ +MCA_ompi_fcoll_STATIC_LTLIBS = @MCA_ompi_fcoll_STATIC_LTLIBS@ +MCA_ompi_fcoll_STATIC_SUBDIRS = @MCA_ompi_fcoll_STATIC_SUBDIRS@ +MCA_ompi_fs_ALL_COMPONENTS = @MCA_ompi_fs_ALL_COMPONENTS@ +MCA_ompi_fs_ALL_SUBDIRS = @MCA_ompi_fs_ALL_SUBDIRS@ +MCA_ompi_fs_DSO_COMPONENTS = @MCA_ompi_fs_DSO_COMPONENTS@ +MCA_ompi_fs_DSO_SUBDIRS = @MCA_ompi_fs_DSO_SUBDIRS@ +MCA_ompi_fs_STATIC_COMPONENTS = @MCA_ompi_fs_STATIC_COMPONENTS@ +MCA_ompi_fs_STATIC_LTLIBS = @MCA_ompi_fs_STATIC_LTLIBS@ +MCA_ompi_fs_STATIC_SUBDIRS = @MCA_ompi_fs_STATIC_SUBDIRS@ +MCA_ompi_hook_ALL_COMPONENTS = @MCA_ompi_hook_ALL_COMPONENTS@ +MCA_ompi_hook_ALL_SUBDIRS = @MCA_ompi_hook_ALL_SUBDIRS@ +MCA_ompi_hook_DSO_COMPONENTS = @MCA_ompi_hook_DSO_COMPONENTS@ +MCA_ompi_hook_DSO_SUBDIRS = @MCA_ompi_hook_DSO_SUBDIRS@ +MCA_ompi_hook_STATIC_COMPONENTS = @MCA_ompi_hook_STATIC_COMPONENTS@ +MCA_ompi_hook_STATIC_LTLIBS = @MCA_ompi_hook_STATIC_LTLIBS@ +MCA_ompi_hook_STATIC_SUBDIRS = @MCA_ompi_hook_STATIC_SUBDIRS@ +MCA_ompi_io_ALL_COMPONENTS = @MCA_ompi_io_ALL_COMPONENTS@ +MCA_ompi_io_ALL_SUBDIRS = @MCA_ompi_io_ALL_SUBDIRS@ +MCA_ompi_io_DSO_COMPONENTS = @MCA_ompi_io_DSO_COMPONENTS@ +MCA_ompi_io_DSO_SUBDIRS = @MCA_ompi_io_DSO_SUBDIRS@ +MCA_ompi_io_STATIC_COMPONENTS = @MCA_ompi_io_STATIC_COMPONENTS@ +MCA_ompi_io_STATIC_LTLIBS = @MCA_ompi_io_STATIC_LTLIBS@ +MCA_ompi_io_STATIC_SUBDIRS = @MCA_ompi_io_STATIC_SUBDIRS@ +MCA_ompi_mtl_ALL_COMPONENTS = @MCA_ompi_mtl_ALL_COMPONENTS@ +MCA_ompi_mtl_ALL_SUBDIRS = @MCA_ompi_mtl_ALL_SUBDIRS@ +MCA_ompi_mtl_DIRECT_CALL_HEADER = @MCA_ompi_mtl_DIRECT_CALL_HEADER@ +MCA_ompi_mtl_DSO_COMPONENTS = @MCA_ompi_mtl_DSO_COMPONENTS@ +MCA_ompi_mtl_DSO_SUBDIRS = @MCA_ompi_mtl_DSO_SUBDIRS@ +MCA_ompi_mtl_STATIC_COMPONENTS = @MCA_ompi_mtl_STATIC_COMPONENTS@ +MCA_ompi_mtl_STATIC_LTLIBS = @MCA_ompi_mtl_STATIC_LTLIBS@ +MCA_ompi_mtl_STATIC_SUBDIRS = @MCA_ompi_mtl_STATIC_SUBDIRS@ +MCA_ompi_op_ALL_COMPONENTS = @MCA_ompi_op_ALL_COMPONENTS@ +MCA_ompi_op_ALL_SUBDIRS = @MCA_ompi_op_ALL_SUBDIRS@ +MCA_ompi_op_DSO_COMPONENTS = @MCA_ompi_op_DSO_COMPONENTS@ +MCA_ompi_op_DSO_SUBDIRS = @MCA_ompi_op_DSO_SUBDIRS@ +MCA_ompi_op_STATIC_COMPONENTS = @MCA_ompi_op_STATIC_COMPONENTS@ +MCA_ompi_op_STATIC_LTLIBS = @MCA_ompi_op_STATIC_LTLIBS@ +MCA_ompi_op_STATIC_SUBDIRS = @MCA_ompi_op_STATIC_SUBDIRS@ +MCA_ompi_osc_ALL_COMPONENTS = @MCA_ompi_osc_ALL_COMPONENTS@ +MCA_ompi_osc_ALL_SUBDIRS = @MCA_ompi_osc_ALL_SUBDIRS@ +MCA_ompi_osc_DSO_COMPONENTS = @MCA_ompi_osc_DSO_COMPONENTS@ +MCA_ompi_osc_DSO_SUBDIRS = @MCA_ompi_osc_DSO_SUBDIRS@ +MCA_ompi_osc_STATIC_COMPONENTS = @MCA_ompi_osc_STATIC_COMPONENTS@ +MCA_ompi_osc_STATIC_LTLIBS = @MCA_ompi_osc_STATIC_LTLIBS@ +MCA_ompi_osc_STATIC_SUBDIRS = @MCA_ompi_osc_STATIC_SUBDIRS@ +MCA_ompi_pml_ALL_COMPONENTS = @MCA_ompi_pml_ALL_COMPONENTS@ +MCA_ompi_pml_ALL_SUBDIRS = @MCA_ompi_pml_ALL_SUBDIRS@ +MCA_ompi_pml_DIRECT_CALL_HEADER = @MCA_ompi_pml_DIRECT_CALL_HEADER@ +MCA_ompi_pml_DSO_COMPONENTS = @MCA_ompi_pml_DSO_COMPONENTS@ +MCA_ompi_pml_DSO_SUBDIRS = @MCA_ompi_pml_DSO_SUBDIRS@ +MCA_ompi_pml_STATIC_COMPONENTS = @MCA_ompi_pml_STATIC_COMPONENTS@ +MCA_ompi_pml_STATIC_LTLIBS = @MCA_ompi_pml_STATIC_LTLIBS@ +MCA_ompi_pml_STATIC_SUBDIRS = @MCA_ompi_pml_STATIC_SUBDIRS@ +MCA_ompi_rte_ALL_COMPONENTS = @MCA_ompi_rte_ALL_COMPONENTS@ +MCA_ompi_rte_ALL_SUBDIRS = @MCA_ompi_rte_ALL_SUBDIRS@ +MCA_ompi_rte_DSO_COMPONENTS = @MCA_ompi_rte_DSO_COMPONENTS@ +MCA_ompi_rte_DSO_SUBDIRS = @MCA_ompi_rte_DSO_SUBDIRS@ +MCA_ompi_rte_STATIC_COMPONENTS = @MCA_ompi_rte_STATIC_COMPONENTS@ +MCA_ompi_rte_STATIC_LTLIBS = @MCA_ompi_rte_STATIC_LTLIBS@ +MCA_ompi_rte_STATIC_SUBDIRS = @MCA_ompi_rte_STATIC_SUBDIRS@ +MCA_ompi_sharedfp_ALL_COMPONENTS = @MCA_ompi_sharedfp_ALL_COMPONENTS@ +MCA_ompi_sharedfp_ALL_SUBDIRS = @MCA_ompi_sharedfp_ALL_SUBDIRS@ +MCA_ompi_sharedfp_DSO_COMPONENTS = @MCA_ompi_sharedfp_DSO_COMPONENTS@ +MCA_ompi_sharedfp_DSO_SUBDIRS = @MCA_ompi_sharedfp_DSO_SUBDIRS@ +MCA_ompi_sharedfp_STATIC_COMPONENTS = @MCA_ompi_sharedfp_STATIC_COMPONENTS@ +MCA_ompi_sharedfp_STATIC_LTLIBS = @MCA_ompi_sharedfp_STATIC_LTLIBS@ +MCA_ompi_sharedfp_STATIC_SUBDIRS = @MCA_ompi_sharedfp_STATIC_SUBDIRS@ +MCA_ompi_topo_ALL_COMPONENTS = @MCA_ompi_topo_ALL_COMPONENTS@ +MCA_ompi_topo_ALL_SUBDIRS = @MCA_ompi_topo_ALL_SUBDIRS@ +MCA_ompi_topo_DSO_COMPONENTS = @MCA_ompi_topo_DSO_COMPONENTS@ +MCA_ompi_topo_DSO_SUBDIRS = @MCA_ompi_topo_DSO_SUBDIRS@ +MCA_ompi_topo_STATIC_COMPONENTS = @MCA_ompi_topo_STATIC_COMPONENTS@ +MCA_ompi_topo_STATIC_LTLIBS = @MCA_ompi_topo_STATIC_LTLIBS@ +MCA_ompi_topo_STATIC_SUBDIRS = @MCA_ompi_topo_STATIC_SUBDIRS@ +MCA_ompi_vprotocol_ALL_COMPONENTS = @MCA_ompi_vprotocol_ALL_COMPONENTS@ +MCA_ompi_vprotocol_ALL_SUBDIRS = @MCA_ompi_vprotocol_ALL_SUBDIRS@ +MCA_ompi_vprotocol_DSO_COMPONENTS = @MCA_ompi_vprotocol_DSO_COMPONENTS@ +MCA_ompi_vprotocol_DSO_SUBDIRS = @MCA_ompi_vprotocol_DSO_SUBDIRS@ +MCA_ompi_vprotocol_STATIC_COMPONENTS = @MCA_ompi_vprotocol_STATIC_COMPONENTS@ +MCA_ompi_vprotocol_STATIC_LTLIBS = @MCA_ompi_vprotocol_STATIC_LTLIBS@ +MCA_ompi_vprotocol_STATIC_SUBDIRS = @MCA_ompi_vprotocol_STATIC_SUBDIRS@ +MCA_opal_FRAMEWORKS = @MCA_opal_FRAMEWORKS@ +MCA_opal_FRAMEWORKS_SUBDIRS = @MCA_opal_FRAMEWORKS_SUBDIRS@ +MCA_opal_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_opal_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_opal_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_opal_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_opal_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_opal_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_opal_FRAMEWORK_LIBS = @MCA_opal_FRAMEWORK_LIBS@ +MCA_opal_allocator_ALL_COMPONENTS = @MCA_opal_allocator_ALL_COMPONENTS@ +MCA_opal_allocator_ALL_SUBDIRS = @MCA_opal_allocator_ALL_SUBDIRS@ +MCA_opal_allocator_DSO_COMPONENTS = @MCA_opal_allocator_DSO_COMPONENTS@ +MCA_opal_allocator_DSO_SUBDIRS = @MCA_opal_allocator_DSO_SUBDIRS@ +MCA_opal_allocator_STATIC_COMPONENTS = @MCA_opal_allocator_STATIC_COMPONENTS@ +MCA_opal_allocator_STATIC_LTLIBS = @MCA_opal_allocator_STATIC_LTLIBS@ +MCA_opal_allocator_STATIC_SUBDIRS = @MCA_opal_allocator_STATIC_SUBDIRS@ +MCA_opal_backtrace_ALL_COMPONENTS = @MCA_opal_backtrace_ALL_COMPONENTS@ +MCA_opal_backtrace_ALL_SUBDIRS = @MCA_opal_backtrace_ALL_SUBDIRS@ +MCA_opal_backtrace_DSO_COMPONENTS = @MCA_opal_backtrace_DSO_COMPONENTS@ +MCA_opal_backtrace_DSO_SUBDIRS = @MCA_opal_backtrace_DSO_SUBDIRS@ +MCA_opal_backtrace_STATIC_COMPONENTS = @MCA_opal_backtrace_STATIC_COMPONENTS@ +MCA_opal_backtrace_STATIC_LTLIBS = @MCA_opal_backtrace_STATIC_LTLIBS@ +MCA_opal_backtrace_STATIC_SUBDIRS = @MCA_opal_backtrace_STATIC_SUBDIRS@ +MCA_opal_btl_ALL_COMPONENTS = @MCA_opal_btl_ALL_COMPONENTS@ +MCA_opal_btl_ALL_SUBDIRS = @MCA_opal_btl_ALL_SUBDIRS@ +MCA_opal_btl_DSO_COMPONENTS = @MCA_opal_btl_DSO_COMPONENTS@ +MCA_opal_btl_DSO_SUBDIRS = @MCA_opal_btl_DSO_SUBDIRS@ +MCA_opal_btl_STATIC_COMPONENTS = @MCA_opal_btl_STATIC_COMPONENTS@ +MCA_opal_btl_STATIC_LTLIBS = @MCA_opal_btl_STATIC_LTLIBS@ +MCA_opal_btl_STATIC_SUBDIRS = @MCA_opal_btl_STATIC_SUBDIRS@ +MCA_opal_common_ALL_COMPONENTS = @MCA_opal_common_ALL_COMPONENTS@ +MCA_opal_common_ALL_SUBDIRS = @MCA_opal_common_ALL_SUBDIRS@ +MCA_opal_common_DSO_COMPONENTS = @MCA_opal_common_DSO_COMPONENTS@ +MCA_opal_common_DSO_SUBDIRS = @MCA_opal_common_DSO_SUBDIRS@ +MCA_opal_common_STATIC_COMPONENTS = @MCA_opal_common_STATIC_COMPONENTS@ +MCA_opal_common_STATIC_LTLIBS = @MCA_opal_common_STATIC_LTLIBS@ +MCA_opal_common_STATIC_SUBDIRS = @MCA_opal_common_STATIC_SUBDIRS@ +MCA_opal_compress_ALL_COMPONENTS = @MCA_opal_compress_ALL_COMPONENTS@ +MCA_opal_compress_ALL_SUBDIRS = @MCA_opal_compress_ALL_SUBDIRS@ +MCA_opal_compress_DSO_COMPONENTS = @MCA_opal_compress_DSO_COMPONENTS@ +MCA_opal_compress_DSO_SUBDIRS = @MCA_opal_compress_DSO_SUBDIRS@ +MCA_opal_compress_STATIC_COMPONENTS = @MCA_opal_compress_STATIC_COMPONENTS@ +MCA_opal_compress_STATIC_LTLIBS = @MCA_opal_compress_STATIC_LTLIBS@ +MCA_opal_compress_STATIC_SUBDIRS = @MCA_opal_compress_STATIC_SUBDIRS@ +MCA_opal_crs_ALL_COMPONENTS = @MCA_opal_crs_ALL_COMPONENTS@ +MCA_opal_crs_ALL_SUBDIRS = @MCA_opal_crs_ALL_SUBDIRS@ +MCA_opal_crs_DSO_COMPONENTS = @MCA_opal_crs_DSO_COMPONENTS@ +MCA_opal_crs_DSO_SUBDIRS = @MCA_opal_crs_DSO_SUBDIRS@ +MCA_opal_crs_STATIC_COMPONENTS = @MCA_opal_crs_STATIC_COMPONENTS@ +MCA_opal_crs_STATIC_LTLIBS = @MCA_opal_crs_STATIC_LTLIBS@ +MCA_opal_crs_STATIC_SUBDIRS = @MCA_opal_crs_STATIC_SUBDIRS@ +MCA_opal_dl_ALL_COMPONENTS = @MCA_opal_dl_ALL_COMPONENTS@ +MCA_opal_dl_ALL_SUBDIRS = @MCA_opal_dl_ALL_SUBDIRS@ +MCA_opal_dl_DSO_COMPONENTS = @MCA_opal_dl_DSO_COMPONENTS@ +MCA_opal_dl_DSO_SUBDIRS = @MCA_opal_dl_DSO_SUBDIRS@ +MCA_opal_dl_STATIC_COMPONENTS = @MCA_opal_dl_STATIC_COMPONENTS@ +MCA_opal_dl_STATIC_LTLIBS = @MCA_opal_dl_STATIC_LTLIBS@ +MCA_opal_dl_STATIC_SUBDIRS = @MCA_opal_dl_STATIC_SUBDIRS@ +MCA_opal_event_ALL_COMPONENTS = @MCA_opal_event_ALL_COMPONENTS@ +MCA_opal_event_ALL_SUBDIRS = @MCA_opal_event_ALL_SUBDIRS@ +MCA_opal_event_DSO_COMPONENTS = @MCA_opal_event_DSO_COMPONENTS@ +MCA_opal_event_DSO_SUBDIRS = @MCA_opal_event_DSO_SUBDIRS@ +MCA_opal_event_STATIC_COMPONENTS = @MCA_opal_event_STATIC_COMPONENTS@ +MCA_opal_event_STATIC_LTLIBS = @MCA_opal_event_STATIC_LTLIBS@ +MCA_opal_event_STATIC_SUBDIRS = @MCA_opal_event_STATIC_SUBDIRS@ +MCA_opal_hwloc_ALL_COMPONENTS = @MCA_opal_hwloc_ALL_COMPONENTS@ +MCA_opal_hwloc_ALL_SUBDIRS = @MCA_opal_hwloc_ALL_SUBDIRS@ +MCA_opal_hwloc_DSO_COMPONENTS = @MCA_opal_hwloc_DSO_COMPONENTS@ +MCA_opal_hwloc_DSO_SUBDIRS = @MCA_opal_hwloc_DSO_SUBDIRS@ +MCA_opal_hwloc_STATIC_COMPONENTS = @MCA_opal_hwloc_STATIC_COMPONENTS@ +MCA_opal_hwloc_STATIC_LTLIBS = @MCA_opal_hwloc_STATIC_LTLIBS@ +MCA_opal_hwloc_STATIC_SUBDIRS = @MCA_opal_hwloc_STATIC_SUBDIRS@ +MCA_opal_if_ALL_COMPONENTS = @MCA_opal_if_ALL_COMPONENTS@ +MCA_opal_if_ALL_SUBDIRS = @MCA_opal_if_ALL_SUBDIRS@ +MCA_opal_if_DSO_COMPONENTS = @MCA_opal_if_DSO_COMPONENTS@ +MCA_opal_if_DSO_SUBDIRS = @MCA_opal_if_DSO_SUBDIRS@ +MCA_opal_if_STATIC_COMPONENTS = @MCA_opal_if_STATIC_COMPONENTS@ +MCA_opal_if_STATIC_LTLIBS = @MCA_opal_if_STATIC_LTLIBS@ +MCA_opal_if_STATIC_SUBDIRS = @MCA_opal_if_STATIC_SUBDIRS@ +MCA_opal_installdirs_ALL_COMPONENTS = @MCA_opal_installdirs_ALL_COMPONENTS@ +MCA_opal_installdirs_ALL_SUBDIRS = @MCA_opal_installdirs_ALL_SUBDIRS@ +MCA_opal_installdirs_DSO_COMPONENTS = @MCA_opal_installdirs_DSO_COMPONENTS@ +MCA_opal_installdirs_DSO_SUBDIRS = @MCA_opal_installdirs_DSO_SUBDIRS@ +MCA_opal_installdirs_STATIC_COMPONENTS = @MCA_opal_installdirs_STATIC_COMPONENTS@ +MCA_opal_installdirs_STATIC_LTLIBS = @MCA_opal_installdirs_STATIC_LTLIBS@ +MCA_opal_installdirs_STATIC_SUBDIRS = @MCA_opal_installdirs_STATIC_SUBDIRS@ +MCA_opal_memchecker_ALL_COMPONENTS = @MCA_opal_memchecker_ALL_COMPONENTS@ +MCA_opal_memchecker_ALL_SUBDIRS = @MCA_opal_memchecker_ALL_SUBDIRS@ +MCA_opal_memchecker_DSO_COMPONENTS = @MCA_opal_memchecker_DSO_COMPONENTS@ +MCA_opal_memchecker_DSO_SUBDIRS = @MCA_opal_memchecker_DSO_SUBDIRS@ +MCA_opal_memchecker_STATIC_COMPONENTS = @MCA_opal_memchecker_STATIC_COMPONENTS@ +MCA_opal_memchecker_STATIC_LTLIBS = @MCA_opal_memchecker_STATIC_LTLIBS@ +MCA_opal_memchecker_STATIC_SUBDIRS = @MCA_opal_memchecker_STATIC_SUBDIRS@ +MCA_opal_memcpy_ALL_COMPONENTS = @MCA_opal_memcpy_ALL_COMPONENTS@ +MCA_opal_memcpy_ALL_SUBDIRS = @MCA_opal_memcpy_ALL_SUBDIRS@ +MCA_opal_memcpy_DSO_COMPONENTS = @MCA_opal_memcpy_DSO_COMPONENTS@ +MCA_opal_memcpy_DSO_SUBDIRS = @MCA_opal_memcpy_DSO_SUBDIRS@ +MCA_opal_memcpy_STATIC_COMPONENTS = @MCA_opal_memcpy_STATIC_COMPONENTS@ +MCA_opal_memcpy_STATIC_LTLIBS = @MCA_opal_memcpy_STATIC_LTLIBS@ +MCA_opal_memcpy_STATIC_SUBDIRS = @MCA_opal_memcpy_STATIC_SUBDIRS@ +MCA_opal_memory_ALL_COMPONENTS = @MCA_opal_memory_ALL_COMPONENTS@ +MCA_opal_memory_ALL_SUBDIRS = @MCA_opal_memory_ALL_SUBDIRS@ +MCA_opal_memory_DSO_COMPONENTS = @MCA_opal_memory_DSO_COMPONENTS@ +MCA_opal_memory_DSO_SUBDIRS = @MCA_opal_memory_DSO_SUBDIRS@ +MCA_opal_memory_STATIC_COMPONENTS = @MCA_opal_memory_STATIC_COMPONENTS@ +MCA_opal_memory_STATIC_LTLIBS = @MCA_opal_memory_STATIC_LTLIBS@ +MCA_opal_memory_STATIC_SUBDIRS = @MCA_opal_memory_STATIC_SUBDIRS@ +MCA_opal_mpool_ALL_COMPONENTS = @MCA_opal_mpool_ALL_COMPONENTS@ +MCA_opal_mpool_ALL_SUBDIRS = @MCA_opal_mpool_ALL_SUBDIRS@ +MCA_opal_mpool_DSO_COMPONENTS = @MCA_opal_mpool_DSO_COMPONENTS@ +MCA_opal_mpool_DSO_SUBDIRS = @MCA_opal_mpool_DSO_SUBDIRS@ +MCA_opal_mpool_STATIC_COMPONENTS = @MCA_opal_mpool_STATIC_COMPONENTS@ +MCA_opal_mpool_STATIC_LTLIBS = @MCA_opal_mpool_STATIC_LTLIBS@ +MCA_opal_mpool_STATIC_SUBDIRS = @MCA_opal_mpool_STATIC_SUBDIRS@ +MCA_opal_patcher_ALL_COMPONENTS = @MCA_opal_patcher_ALL_COMPONENTS@ +MCA_opal_patcher_ALL_SUBDIRS = @MCA_opal_patcher_ALL_SUBDIRS@ +MCA_opal_patcher_DSO_COMPONENTS = @MCA_opal_patcher_DSO_COMPONENTS@ +MCA_opal_patcher_DSO_SUBDIRS = @MCA_opal_patcher_DSO_SUBDIRS@ +MCA_opal_patcher_STATIC_COMPONENTS = @MCA_opal_patcher_STATIC_COMPONENTS@ +MCA_opal_patcher_STATIC_LTLIBS = @MCA_opal_patcher_STATIC_LTLIBS@ +MCA_opal_patcher_STATIC_SUBDIRS = @MCA_opal_patcher_STATIC_SUBDIRS@ +MCA_opal_pmix_ALL_COMPONENTS = @MCA_opal_pmix_ALL_COMPONENTS@ +MCA_opal_pmix_ALL_SUBDIRS = @MCA_opal_pmix_ALL_SUBDIRS@ +MCA_opal_pmix_DSO_COMPONENTS = @MCA_opal_pmix_DSO_COMPONENTS@ +MCA_opal_pmix_DSO_SUBDIRS = @MCA_opal_pmix_DSO_SUBDIRS@ +MCA_opal_pmix_STATIC_COMPONENTS = @MCA_opal_pmix_STATIC_COMPONENTS@ +MCA_opal_pmix_STATIC_LTLIBS = @MCA_opal_pmix_STATIC_LTLIBS@ +MCA_opal_pmix_STATIC_SUBDIRS = @MCA_opal_pmix_STATIC_SUBDIRS@ +MCA_opal_pstat_ALL_COMPONENTS = @MCA_opal_pstat_ALL_COMPONENTS@ +MCA_opal_pstat_ALL_SUBDIRS = @MCA_opal_pstat_ALL_SUBDIRS@ +MCA_opal_pstat_DSO_COMPONENTS = @MCA_opal_pstat_DSO_COMPONENTS@ +MCA_opal_pstat_DSO_SUBDIRS = @MCA_opal_pstat_DSO_SUBDIRS@ +MCA_opal_pstat_STATIC_COMPONENTS = @MCA_opal_pstat_STATIC_COMPONENTS@ +MCA_opal_pstat_STATIC_LTLIBS = @MCA_opal_pstat_STATIC_LTLIBS@ +MCA_opal_pstat_STATIC_SUBDIRS = @MCA_opal_pstat_STATIC_SUBDIRS@ +MCA_opal_rcache_ALL_COMPONENTS = @MCA_opal_rcache_ALL_COMPONENTS@ +MCA_opal_rcache_ALL_SUBDIRS = @MCA_opal_rcache_ALL_SUBDIRS@ +MCA_opal_rcache_DSO_COMPONENTS = @MCA_opal_rcache_DSO_COMPONENTS@ +MCA_opal_rcache_DSO_SUBDIRS = @MCA_opal_rcache_DSO_SUBDIRS@ +MCA_opal_rcache_STATIC_COMPONENTS = @MCA_opal_rcache_STATIC_COMPONENTS@ +MCA_opal_rcache_STATIC_LTLIBS = @MCA_opal_rcache_STATIC_LTLIBS@ +MCA_opal_rcache_STATIC_SUBDIRS = @MCA_opal_rcache_STATIC_SUBDIRS@ +MCA_opal_reachable_ALL_COMPONENTS = @MCA_opal_reachable_ALL_COMPONENTS@ +MCA_opal_reachable_ALL_SUBDIRS = @MCA_opal_reachable_ALL_SUBDIRS@ +MCA_opal_reachable_DSO_COMPONENTS = @MCA_opal_reachable_DSO_COMPONENTS@ +MCA_opal_reachable_DSO_SUBDIRS = @MCA_opal_reachable_DSO_SUBDIRS@ +MCA_opal_reachable_STATIC_COMPONENTS = @MCA_opal_reachable_STATIC_COMPONENTS@ +MCA_opal_reachable_STATIC_LTLIBS = @MCA_opal_reachable_STATIC_LTLIBS@ +MCA_opal_reachable_STATIC_SUBDIRS = @MCA_opal_reachable_STATIC_SUBDIRS@ +MCA_opal_shmem_ALL_COMPONENTS = @MCA_opal_shmem_ALL_COMPONENTS@ +MCA_opal_shmem_ALL_SUBDIRS = @MCA_opal_shmem_ALL_SUBDIRS@ +MCA_opal_shmem_DSO_COMPONENTS = @MCA_opal_shmem_DSO_COMPONENTS@ +MCA_opal_shmem_DSO_SUBDIRS = @MCA_opal_shmem_DSO_SUBDIRS@ +MCA_opal_shmem_STATIC_COMPONENTS = @MCA_opal_shmem_STATIC_COMPONENTS@ +MCA_opal_shmem_STATIC_LTLIBS = @MCA_opal_shmem_STATIC_LTLIBS@ +MCA_opal_shmem_STATIC_SUBDIRS = @MCA_opal_shmem_STATIC_SUBDIRS@ +MCA_opal_timer_ALL_COMPONENTS = @MCA_opal_timer_ALL_COMPONENTS@ +MCA_opal_timer_ALL_SUBDIRS = @MCA_opal_timer_ALL_SUBDIRS@ +MCA_opal_timer_DSO_COMPONENTS = @MCA_opal_timer_DSO_COMPONENTS@ +MCA_opal_timer_DSO_SUBDIRS = @MCA_opal_timer_DSO_SUBDIRS@ +MCA_opal_timer_STATIC_COMPONENTS = @MCA_opal_timer_STATIC_COMPONENTS@ +MCA_opal_timer_STATIC_LTLIBS = @MCA_opal_timer_STATIC_LTLIBS@ +MCA_opal_timer_STATIC_SUBDIRS = @MCA_opal_timer_STATIC_SUBDIRS@ +MCA_orte_FRAMEWORKS = @MCA_orte_FRAMEWORKS@ +MCA_orte_FRAMEWORKS_SUBDIRS = @MCA_orte_FRAMEWORKS_SUBDIRS@ +MCA_orte_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_orte_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_orte_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_orte_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_orte_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_orte_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_orte_FRAMEWORK_LIBS = @MCA_orte_FRAMEWORK_LIBS@ +MCA_orte_common_ALL_COMPONENTS = @MCA_orte_common_ALL_COMPONENTS@ +MCA_orte_common_ALL_SUBDIRS = @MCA_orte_common_ALL_SUBDIRS@ +MCA_orte_common_DSO_COMPONENTS = @MCA_orte_common_DSO_COMPONENTS@ +MCA_orte_common_DSO_SUBDIRS = @MCA_orte_common_DSO_SUBDIRS@ +MCA_orte_common_STATIC_COMPONENTS = @MCA_orte_common_STATIC_COMPONENTS@ +MCA_orte_common_STATIC_LTLIBS = @MCA_orte_common_STATIC_LTLIBS@ +MCA_orte_common_STATIC_SUBDIRS = @MCA_orte_common_STATIC_SUBDIRS@ +MCA_orte_errmgr_ALL_COMPONENTS = @MCA_orte_errmgr_ALL_COMPONENTS@ +MCA_orte_errmgr_ALL_SUBDIRS = @MCA_orte_errmgr_ALL_SUBDIRS@ +MCA_orte_errmgr_DSO_COMPONENTS = @MCA_orte_errmgr_DSO_COMPONENTS@ +MCA_orte_errmgr_DSO_SUBDIRS = @MCA_orte_errmgr_DSO_SUBDIRS@ +MCA_orte_errmgr_STATIC_COMPONENTS = @MCA_orte_errmgr_STATIC_COMPONENTS@ +MCA_orte_errmgr_STATIC_LTLIBS = @MCA_orte_errmgr_STATIC_LTLIBS@ +MCA_orte_errmgr_STATIC_SUBDIRS = @MCA_orte_errmgr_STATIC_SUBDIRS@ +MCA_orte_ess_ALL_COMPONENTS = @MCA_orte_ess_ALL_COMPONENTS@ +MCA_orte_ess_ALL_SUBDIRS = @MCA_orte_ess_ALL_SUBDIRS@ +MCA_orte_ess_DSO_COMPONENTS = @MCA_orte_ess_DSO_COMPONENTS@ +MCA_orte_ess_DSO_SUBDIRS = @MCA_orte_ess_DSO_SUBDIRS@ +MCA_orte_ess_STATIC_COMPONENTS = @MCA_orte_ess_STATIC_COMPONENTS@ +MCA_orte_ess_STATIC_LTLIBS = @MCA_orte_ess_STATIC_LTLIBS@ +MCA_orte_ess_STATIC_SUBDIRS = @MCA_orte_ess_STATIC_SUBDIRS@ +MCA_orte_filem_ALL_COMPONENTS = @MCA_orte_filem_ALL_COMPONENTS@ +MCA_orte_filem_ALL_SUBDIRS = @MCA_orte_filem_ALL_SUBDIRS@ +MCA_orte_filem_DSO_COMPONENTS = @MCA_orte_filem_DSO_COMPONENTS@ +MCA_orte_filem_DSO_SUBDIRS = @MCA_orte_filem_DSO_SUBDIRS@ +MCA_orte_filem_STATIC_COMPONENTS = @MCA_orte_filem_STATIC_COMPONENTS@ +MCA_orte_filem_STATIC_LTLIBS = @MCA_orte_filem_STATIC_LTLIBS@ +MCA_orte_filem_STATIC_SUBDIRS = @MCA_orte_filem_STATIC_SUBDIRS@ +MCA_orte_grpcomm_ALL_COMPONENTS = @MCA_orte_grpcomm_ALL_COMPONENTS@ +MCA_orte_grpcomm_ALL_SUBDIRS = @MCA_orte_grpcomm_ALL_SUBDIRS@ +MCA_orte_grpcomm_DSO_COMPONENTS = @MCA_orte_grpcomm_DSO_COMPONENTS@ +MCA_orte_grpcomm_DSO_SUBDIRS = @MCA_orte_grpcomm_DSO_SUBDIRS@ +MCA_orte_grpcomm_STATIC_COMPONENTS = @MCA_orte_grpcomm_STATIC_COMPONENTS@ +MCA_orte_grpcomm_STATIC_LTLIBS = @MCA_orte_grpcomm_STATIC_LTLIBS@ +MCA_orte_grpcomm_STATIC_SUBDIRS = @MCA_orte_grpcomm_STATIC_SUBDIRS@ +MCA_orte_iof_ALL_COMPONENTS = @MCA_orte_iof_ALL_COMPONENTS@ +MCA_orte_iof_ALL_SUBDIRS = @MCA_orte_iof_ALL_SUBDIRS@ +MCA_orte_iof_DSO_COMPONENTS = @MCA_orte_iof_DSO_COMPONENTS@ +MCA_orte_iof_DSO_SUBDIRS = @MCA_orte_iof_DSO_SUBDIRS@ +MCA_orte_iof_STATIC_COMPONENTS = @MCA_orte_iof_STATIC_COMPONENTS@ +MCA_orte_iof_STATIC_LTLIBS = @MCA_orte_iof_STATIC_LTLIBS@ +MCA_orte_iof_STATIC_SUBDIRS = @MCA_orte_iof_STATIC_SUBDIRS@ +MCA_orte_odls_ALL_COMPONENTS = @MCA_orte_odls_ALL_COMPONENTS@ +MCA_orte_odls_ALL_SUBDIRS = @MCA_orte_odls_ALL_SUBDIRS@ +MCA_orte_odls_DSO_COMPONENTS = @MCA_orte_odls_DSO_COMPONENTS@ +MCA_orte_odls_DSO_SUBDIRS = @MCA_orte_odls_DSO_SUBDIRS@ +MCA_orte_odls_STATIC_COMPONENTS = @MCA_orte_odls_STATIC_COMPONENTS@ +MCA_orte_odls_STATIC_LTLIBS = @MCA_orte_odls_STATIC_LTLIBS@ +MCA_orte_odls_STATIC_SUBDIRS = @MCA_orte_odls_STATIC_SUBDIRS@ +MCA_orte_oob_ALL_COMPONENTS = @MCA_orte_oob_ALL_COMPONENTS@ +MCA_orte_oob_ALL_SUBDIRS = @MCA_orte_oob_ALL_SUBDIRS@ +MCA_orte_oob_DSO_COMPONENTS = @MCA_orte_oob_DSO_COMPONENTS@ +MCA_orte_oob_DSO_SUBDIRS = @MCA_orte_oob_DSO_SUBDIRS@ +MCA_orte_oob_STATIC_COMPONENTS = @MCA_orte_oob_STATIC_COMPONENTS@ +MCA_orte_oob_STATIC_LTLIBS = @MCA_orte_oob_STATIC_LTLIBS@ +MCA_orte_oob_STATIC_SUBDIRS = @MCA_orte_oob_STATIC_SUBDIRS@ +MCA_orte_plm_ALL_COMPONENTS = @MCA_orte_plm_ALL_COMPONENTS@ +MCA_orte_plm_ALL_SUBDIRS = @MCA_orte_plm_ALL_SUBDIRS@ +MCA_orte_plm_DSO_COMPONENTS = @MCA_orte_plm_DSO_COMPONENTS@ +MCA_orte_plm_DSO_SUBDIRS = @MCA_orte_plm_DSO_SUBDIRS@ +MCA_orte_plm_STATIC_COMPONENTS = @MCA_orte_plm_STATIC_COMPONENTS@ +MCA_orte_plm_STATIC_LTLIBS = @MCA_orte_plm_STATIC_LTLIBS@ +MCA_orte_plm_STATIC_SUBDIRS = @MCA_orte_plm_STATIC_SUBDIRS@ +MCA_orte_ras_ALL_COMPONENTS = @MCA_orte_ras_ALL_COMPONENTS@ +MCA_orte_ras_ALL_SUBDIRS = @MCA_orte_ras_ALL_SUBDIRS@ +MCA_orte_ras_DSO_COMPONENTS = @MCA_orte_ras_DSO_COMPONENTS@ +MCA_orte_ras_DSO_SUBDIRS = @MCA_orte_ras_DSO_SUBDIRS@ +MCA_orte_ras_STATIC_COMPONENTS = @MCA_orte_ras_STATIC_COMPONENTS@ +MCA_orte_ras_STATIC_LTLIBS = @MCA_orte_ras_STATIC_LTLIBS@ +MCA_orte_ras_STATIC_SUBDIRS = @MCA_orte_ras_STATIC_SUBDIRS@ +MCA_orte_regx_ALL_COMPONENTS = @MCA_orte_regx_ALL_COMPONENTS@ +MCA_orte_regx_ALL_SUBDIRS = @MCA_orte_regx_ALL_SUBDIRS@ +MCA_orte_regx_DSO_COMPONENTS = @MCA_orte_regx_DSO_COMPONENTS@ +MCA_orte_regx_DSO_SUBDIRS = @MCA_orte_regx_DSO_SUBDIRS@ +MCA_orte_regx_STATIC_COMPONENTS = @MCA_orte_regx_STATIC_COMPONENTS@ +MCA_orte_regx_STATIC_LTLIBS = @MCA_orte_regx_STATIC_LTLIBS@ +MCA_orte_regx_STATIC_SUBDIRS = @MCA_orte_regx_STATIC_SUBDIRS@ +MCA_orte_rmaps_ALL_COMPONENTS = @MCA_orte_rmaps_ALL_COMPONENTS@ +MCA_orte_rmaps_ALL_SUBDIRS = @MCA_orte_rmaps_ALL_SUBDIRS@ +MCA_orte_rmaps_DSO_COMPONENTS = @MCA_orte_rmaps_DSO_COMPONENTS@ +MCA_orte_rmaps_DSO_SUBDIRS = @MCA_orte_rmaps_DSO_SUBDIRS@ +MCA_orte_rmaps_STATIC_COMPONENTS = @MCA_orte_rmaps_STATIC_COMPONENTS@ +MCA_orte_rmaps_STATIC_LTLIBS = @MCA_orte_rmaps_STATIC_LTLIBS@ +MCA_orte_rmaps_STATIC_SUBDIRS = @MCA_orte_rmaps_STATIC_SUBDIRS@ +MCA_orte_rml_ALL_COMPONENTS = @MCA_orte_rml_ALL_COMPONENTS@ +MCA_orte_rml_ALL_SUBDIRS = @MCA_orte_rml_ALL_SUBDIRS@ +MCA_orte_rml_DSO_COMPONENTS = @MCA_orte_rml_DSO_COMPONENTS@ +MCA_orte_rml_DSO_SUBDIRS = @MCA_orte_rml_DSO_SUBDIRS@ +MCA_orte_rml_STATIC_COMPONENTS = @MCA_orte_rml_STATIC_COMPONENTS@ +MCA_orte_rml_STATIC_LTLIBS = @MCA_orte_rml_STATIC_LTLIBS@ +MCA_orte_rml_STATIC_SUBDIRS = @MCA_orte_rml_STATIC_SUBDIRS@ +MCA_orte_routed_ALL_COMPONENTS = @MCA_orte_routed_ALL_COMPONENTS@ +MCA_orte_routed_ALL_SUBDIRS = @MCA_orte_routed_ALL_SUBDIRS@ +MCA_orte_routed_DSO_COMPONENTS = @MCA_orte_routed_DSO_COMPONENTS@ +MCA_orte_routed_DSO_SUBDIRS = @MCA_orte_routed_DSO_SUBDIRS@ +MCA_orte_routed_STATIC_COMPONENTS = @MCA_orte_routed_STATIC_COMPONENTS@ +MCA_orte_routed_STATIC_LTLIBS = @MCA_orte_routed_STATIC_LTLIBS@ +MCA_orte_routed_STATIC_SUBDIRS = @MCA_orte_routed_STATIC_SUBDIRS@ +MCA_orte_rtc_ALL_COMPONENTS = @MCA_orte_rtc_ALL_COMPONENTS@ +MCA_orte_rtc_ALL_SUBDIRS = @MCA_orte_rtc_ALL_SUBDIRS@ +MCA_orte_rtc_DSO_COMPONENTS = @MCA_orte_rtc_DSO_COMPONENTS@ +MCA_orte_rtc_DSO_SUBDIRS = @MCA_orte_rtc_DSO_SUBDIRS@ +MCA_orte_rtc_STATIC_COMPONENTS = @MCA_orte_rtc_STATIC_COMPONENTS@ +MCA_orte_rtc_STATIC_LTLIBS = @MCA_orte_rtc_STATIC_LTLIBS@ +MCA_orte_rtc_STATIC_SUBDIRS = @MCA_orte_rtc_STATIC_SUBDIRS@ +MCA_orte_schizo_ALL_COMPONENTS = @MCA_orte_schizo_ALL_COMPONENTS@ +MCA_orte_schizo_ALL_SUBDIRS = @MCA_orte_schizo_ALL_SUBDIRS@ +MCA_orte_schizo_DSO_COMPONENTS = @MCA_orte_schizo_DSO_COMPONENTS@ +MCA_orte_schizo_DSO_SUBDIRS = @MCA_orte_schizo_DSO_SUBDIRS@ +MCA_orte_schizo_STATIC_COMPONENTS = @MCA_orte_schizo_STATIC_COMPONENTS@ +MCA_orte_schizo_STATIC_LTLIBS = @MCA_orte_schizo_STATIC_LTLIBS@ +MCA_orte_schizo_STATIC_SUBDIRS = @MCA_orte_schizo_STATIC_SUBDIRS@ +MCA_orte_snapc_ALL_COMPONENTS = @MCA_orte_snapc_ALL_COMPONENTS@ +MCA_orte_snapc_ALL_SUBDIRS = @MCA_orte_snapc_ALL_SUBDIRS@ +MCA_orte_snapc_DSO_COMPONENTS = @MCA_orte_snapc_DSO_COMPONENTS@ +MCA_orte_snapc_DSO_SUBDIRS = @MCA_orte_snapc_DSO_SUBDIRS@ +MCA_orte_snapc_STATIC_COMPONENTS = @MCA_orte_snapc_STATIC_COMPONENTS@ +MCA_orte_snapc_STATIC_LTLIBS = @MCA_orte_snapc_STATIC_LTLIBS@ +MCA_orte_snapc_STATIC_SUBDIRS = @MCA_orte_snapc_STATIC_SUBDIRS@ +MCA_orte_sstore_ALL_COMPONENTS = @MCA_orte_sstore_ALL_COMPONENTS@ +MCA_orte_sstore_ALL_SUBDIRS = @MCA_orte_sstore_ALL_SUBDIRS@ +MCA_orte_sstore_DSO_COMPONENTS = @MCA_orte_sstore_DSO_COMPONENTS@ +MCA_orte_sstore_DSO_SUBDIRS = @MCA_orte_sstore_DSO_SUBDIRS@ +MCA_orte_sstore_STATIC_COMPONENTS = @MCA_orte_sstore_STATIC_COMPONENTS@ +MCA_orte_sstore_STATIC_LTLIBS = @MCA_orte_sstore_STATIC_LTLIBS@ +MCA_orte_sstore_STATIC_SUBDIRS = @MCA_orte_sstore_STATIC_SUBDIRS@ +MCA_orte_state_ALL_COMPONENTS = @MCA_orte_state_ALL_COMPONENTS@ +MCA_orte_state_ALL_SUBDIRS = @MCA_orte_state_ALL_SUBDIRS@ +MCA_orte_state_DSO_COMPONENTS = @MCA_orte_state_DSO_COMPONENTS@ +MCA_orte_state_DSO_SUBDIRS = @MCA_orte_state_DSO_SUBDIRS@ +MCA_orte_state_STATIC_COMPONENTS = @MCA_orte_state_STATIC_COMPONENTS@ +MCA_orte_state_STATIC_LTLIBS = @MCA_orte_state_STATIC_LTLIBS@ +MCA_orte_state_STATIC_SUBDIRS = @MCA_orte_state_STATIC_SUBDIRS@ +MCA_oshmem_FRAMEWORKS = @MCA_oshmem_FRAMEWORKS@ +MCA_oshmem_FRAMEWORKS_SUBDIRS = @MCA_oshmem_FRAMEWORKS_SUBDIRS@ +MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_oshmem_FRAMEWORK_LIBS = @MCA_oshmem_FRAMEWORK_LIBS@ +MCA_oshmem_atomic_ALL_COMPONENTS = @MCA_oshmem_atomic_ALL_COMPONENTS@ +MCA_oshmem_atomic_ALL_SUBDIRS = @MCA_oshmem_atomic_ALL_SUBDIRS@ +MCA_oshmem_atomic_DSO_COMPONENTS = @MCA_oshmem_atomic_DSO_COMPONENTS@ +MCA_oshmem_atomic_DSO_SUBDIRS = @MCA_oshmem_atomic_DSO_SUBDIRS@ +MCA_oshmem_atomic_STATIC_COMPONENTS = @MCA_oshmem_atomic_STATIC_COMPONENTS@ +MCA_oshmem_atomic_STATIC_LTLIBS = @MCA_oshmem_atomic_STATIC_LTLIBS@ +MCA_oshmem_atomic_STATIC_SUBDIRS = @MCA_oshmem_atomic_STATIC_SUBDIRS@ +MCA_oshmem_memheap_ALL_COMPONENTS = @MCA_oshmem_memheap_ALL_COMPONENTS@ +MCA_oshmem_memheap_ALL_SUBDIRS = @MCA_oshmem_memheap_ALL_SUBDIRS@ +MCA_oshmem_memheap_DIRECT_CALL_HEADER = @MCA_oshmem_memheap_DIRECT_CALL_HEADER@ +MCA_oshmem_memheap_DSO_COMPONENTS = @MCA_oshmem_memheap_DSO_COMPONENTS@ +MCA_oshmem_memheap_DSO_SUBDIRS = @MCA_oshmem_memheap_DSO_SUBDIRS@ +MCA_oshmem_memheap_STATIC_COMPONENTS = @MCA_oshmem_memheap_STATIC_COMPONENTS@ +MCA_oshmem_memheap_STATIC_LTLIBS = @MCA_oshmem_memheap_STATIC_LTLIBS@ +MCA_oshmem_memheap_STATIC_SUBDIRS = @MCA_oshmem_memheap_STATIC_SUBDIRS@ +MCA_oshmem_scoll_ALL_COMPONENTS = @MCA_oshmem_scoll_ALL_COMPONENTS@ +MCA_oshmem_scoll_ALL_SUBDIRS = @MCA_oshmem_scoll_ALL_SUBDIRS@ +MCA_oshmem_scoll_DSO_COMPONENTS = @MCA_oshmem_scoll_DSO_COMPONENTS@ +MCA_oshmem_scoll_DSO_SUBDIRS = @MCA_oshmem_scoll_DSO_SUBDIRS@ +MCA_oshmem_scoll_STATIC_COMPONENTS = @MCA_oshmem_scoll_STATIC_COMPONENTS@ +MCA_oshmem_scoll_STATIC_LTLIBS = @MCA_oshmem_scoll_STATIC_LTLIBS@ +MCA_oshmem_scoll_STATIC_SUBDIRS = @MCA_oshmem_scoll_STATIC_SUBDIRS@ +MCA_oshmem_spml_ALL_COMPONENTS = @MCA_oshmem_spml_ALL_COMPONENTS@ +MCA_oshmem_spml_ALL_SUBDIRS = @MCA_oshmem_spml_ALL_SUBDIRS@ +MCA_oshmem_spml_DIRECT_CALL_HEADER = @MCA_oshmem_spml_DIRECT_CALL_HEADER@ +MCA_oshmem_spml_DSO_COMPONENTS = @MCA_oshmem_spml_DSO_COMPONENTS@ +MCA_oshmem_spml_DSO_SUBDIRS = @MCA_oshmem_spml_DSO_SUBDIRS@ +MCA_oshmem_spml_STATIC_COMPONENTS = @MCA_oshmem_spml_STATIC_COMPONENTS@ +MCA_oshmem_spml_STATIC_LTLIBS = @MCA_oshmem_spml_STATIC_LTLIBS@ +MCA_oshmem_spml_STATIC_SUBDIRS = @MCA_oshmem_spml_STATIC_SUBDIRS@ +MCA_oshmem_sshmem_ALL_COMPONENTS = @MCA_oshmem_sshmem_ALL_COMPONENTS@ +MCA_oshmem_sshmem_ALL_SUBDIRS = @MCA_oshmem_sshmem_ALL_SUBDIRS@ +MCA_oshmem_sshmem_DSO_COMPONENTS = @MCA_oshmem_sshmem_DSO_COMPONENTS@ +MCA_oshmem_sshmem_DSO_SUBDIRS = @MCA_oshmem_sshmem_DSO_SUBDIRS@ +MCA_oshmem_sshmem_STATIC_COMPONENTS = @MCA_oshmem_sshmem_STATIC_COMPONENTS@ +MCA_oshmem_sshmem_STATIC_LTLIBS = @MCA_oshmem_sshmem_STATIC_LTLIBS@ +MCA_oshmem_sshmem_STATIC_SUBDIRS = @MCA_oshmem_sshmem_STATIC_SUBDIRS@ +MKDIR_P = @MKDIR_P@ +MPIR_UNWIND_CFLAGS = @MPIR_UNWIND_CFLAGS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMPI_ALIGNMENT_FORTRAN_CHARACTER = @OMPI_ALIGNMENT_FORTRAN_CHARACTER@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX = @OMPI_ALIGNMENT_FORTRAN_COMPLEX@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX16 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX16@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX32 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX32@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX4 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX4@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX8 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX8@ +OMPI_ALIGNMENT_FORTRAN_DOUBLE_COMPLEX = @OMPI_ALIGNMENT_FORTRAN_DOUBLE_COMPLEX@ +OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION = @OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION@ +OMPI_ALIGNMENT_FORTRAN_INTEGER = @OMPI_ALIGNMENT_FORTRAN_INTEGER@ +OMPI_ALIGNMENT_FORTRAN_INTEGER1 = @OMPI_ALIGNMENT_FORTRAN_INTEGER1@ +OMPI_ALIGNMENT_FORTRAN_INTEGER16 = @OMPI_ALIGNMENT_FORTRAN_INTEGER16@ +OMPI_ALIGNMENT_FORTRAN_INTEGER2 = @OMPI_ALIGNMENT_FORTRAN_INTEGER2@ +OMPI_ALIGNMENT_FORTRAN_INTEGER4 = @OMPI_ALIGNMENT_FORTRAN_INTEGER4@ +OMPI_ALIGNMENT_FORTRAN_INTEGER8 = @OMPI_ALIGNMENT_FORTRAN_INTEGER8@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL = @OMPI_ALIGNMENT_FORTRAN_LOGICAL@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL1 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL1@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL2 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL2@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL4 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL4@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL8 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL8@ +OMPI_ALIGNMENT_FORTRAN_REAL = @OMPI_ALIGNMENT_FORTRAN_REAL@ +OMPI_ALIGNMENT_FORTRAN_REAL16 = @OMPI_ALIGNMENT_FORTRAN_REAL16@ +OMPI_ALIGNMENT_FORTRAN_REAL2 = @OMPI_ALIGNMENT_FORTRAN_REAL2@ +OMPI_ALIGNMENT_FORTRAN_REAL4 = @OMPI_ALIGNMENT_FORTRAN_REAL4@ +OMPI_ALIGNMENT_FORTRAN_REAL8 = @OMPI_ALIGNMENT_FORTRAN_REAL8@ +OMPI_CONTRIB_DIST_SUBDIRS = @OMPI_CONTRIB_DIST_SUBDIRS@ +OMPI_CONTRIB_SUBDIRS = @OMPI_CONTRIB_SUBDIRS@ +OMPI_CXX_ABSOLUTE = @OMPI_CXX_ABSOLUTE@ +OMPI_ENABLE_GREQUEST_EXTENSIONS = @OMPI_ENABLE_GREQUEST_EXTENSIONS@ +OMPI_ENABLE_MPI1_COMPAT = @OMPI_ENABLE_MPI1_COMPAT@ +OMPI_F08_SUFFIX = @OMPI_F08_SUFFIX@ +OMPI_FC = @OMPI_FC@ +OMPI_FC_ABSOLUTE = @OMPI_FC_ABSOLUTE@ +OMPI_FC_MODULE_FLAG = @OMPI_FC_MODULE_FLAG@ +OMPI_FORTRAN_BUILD_SIZEOF = @OMPI_FORTRAN_BUILD_SIZEOF@ +OMPI_FORTRAN_CAPS = @OMPI_FORTRAN_CAPS@ +OMPI_FORTRAN_CKINDS = @OMPI_FORTRAN_CKINDS@ +OMPI_FORTRAN_DOUBLE_UNDERSCORE = @OMPI_FORTRAN_DOUBLE_UNDERSCORE@ +OMPI_FORTRAN_EXTRA_SHARED_LIBRARY_FLAGS = @OMPI_FORTRAN_EXTRA_SHARED_LIBRARY_FLAGS@ +OMPI_FORTRAN_F08_PREDECL = @OMPI_FORTRAN_F08_PREDECL@ +OMPI_FORTRAN_F08_TYPE = @OMPI_FORTRAN_F08_TYPE@ +OMPI_FORTRAN_HAVE_ABSTRACT = @OMPI_FORTRAN_HAVE_ABSTRACT@ +OMPI_FORTRAN_HAVE_ASYNCHRONOUS = @OMPI_FORTRAN_HAVE_ASYNCHRONOUS@ +OMPI_FORTRAN_HAVE_BIND_C = @OMPI_FORTRAN_HAVE_BIND_C@ +OMPI_FORTRAN_HAVE_C_FUNLOC = @OMPI_FORTRAN_HAVE_C_FUNLOC@ +OMPI_FORTRAN_HAVE_INTERFACE = @OMPI_FORTRAN_HAVE_INTERFACE@ +OMPI_FORTRAN_HAVE_ISO_C_BINDING = @OMPI_FORTRAN_HAVE_ISO_C_BINDING@ +OMPI_FORTRAN_HAVE_ISO_FORTRAN_ENV = @OMPI_FORTRAN_HAVE_ISO_FORTRAN_ENV@ +OMPI_FORTRAN_HAVE_PRIVATE = @OMPI_FORTRAN_HAVE_PRIVATE@ +OMPI_FORTRAN_HAVE_PROCEDURE = @OMPI_FORTRAN_HAVE_PROCEDURE@ +OMPI_FORTRAN_HAVE_STORAGE_SIZE = @OMPI_FORTRAN_HAVE_STORAGE_SIZE@ +OMPI_FORTRAN_HAVE_USE_ONLY = @OMPI_FORTRAN_HAVE_USE_ONLY@ +OMPI_FORTRAN_IGNORE_TKR_PREDECL = @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ +OMPI_FORTRAN_IGNORE_TKR_TYPE = @OMPI_FORTRAN_IGNORE_TKR_TYPE@ +OMPI_FORTRAN_IKINDS = @OMPI_FORTRAN_IKINDS@ +OMPI_FORTRAN_MAX_ARRAY_RANK = @OMPI_FORTRAN_MAX_ARRAY_RANK@ +OMPI_FORTRAN_NEED_WRAPPER_ROUTINES = @OMPI_FORTRAN_NEED_WRAPPER_ROUTINES@ +OMPI_FORTRAN_PLAIN = @OMPI_FORTRAN_PLAIN@ +OMPI_FORTRAN_RKINDS = @OMPI_FORTRAN_RKINDS@ +OMPI_FORTRAN_SINGLE_UNDERSCORE = @OMPI_FORTRAN_SINGLE_UNDERSCORE@ +OMPI_FORTRAN_STATUS_SIZE = @OMPI_FORTRAN_STATUS_SIZE@ +OMPI_FORTRAN_USEMPIF08_LIB = @OMPI_FORTRAN_USEMPIF08_LIB@ +OMPI_FORTRAN_USEMPI_DIR = @OMPI_FORTRAN_USEMPI_DIR@ +OMPI_FORTRAN_USEMPI_LIB = @OMPI_FORTRAN_USEMPI_LIB@ +OMPI_F_SUFFIX = @OMPI_F_SUFFIX@ +OMPI_GREEK_VERSION = @OMPI_GREEK_VERSION@ +OMPI_HAVE_FORTRAN_CHARACTER = @OMPI_HAVE_FORTRAN_CHARACTER@ +OMPI_HAVE_FORTRAN_COMPLEX = @OMPI_HAVE_FORTRAN_COMPLEX@ +OMPI_HAVE_FORTRAN_COMPLEX16 = @OMPI_HAVE_FORTRAN_COMPLEX16@ +OMPI_HAVE_FORTRAN_COMPLEX32 = @OMPI_HAVE_FORTRAN_COMPLEX32@ +OMPI_HAVE_FORTRAN_COMPLEX4 = @OMPI_HAVE_FORTRAN_COMPLEX4@ +OMPI_HAVE_FORTRAN_COMPLEX8 = @OMPI_HAVE_FORTRAN_COMPLEX8@ +OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX = @OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX@ +OMPI_HAVE_FORTRAN_DOUBLE_PRECISION = @OMPI_HAVE_FORTRAN_DOUBLE_PRECISION@ +OMPI_HAVE_FORTRAN_INTEGER = @OMPI_HAVE_FORTRAN_INTEGER@ +OMPI_HAVE_FORTRAN_INTEGER1 = @OMPI_HAVE_FORTRAN_INTEGER1@ +OMPI_HAVE_FORTRAN_INTEGER16 = @OMPI_HAVE_FORTRAN_INTEGER16@ +OMPI_HAVE_FORTRAN_INTEGER2 = @OMPI_HAVE_FORTRAN_INTEGER2@ +OMPI_HAVE_FORTRAN_INTEGER4 = @OMPI_HAVE_FORTRAN_INTEGER4@ +OMPI_HAVE_FORTRAN_INTEGER8 = @OMPI_HAVE_FORTRAN_INTEGER8@ +OMPI_HAVE_FORTRAN_LOGICAL = @OMPI_HAVE_FORTRAN_LOGICAL@ +OMPI_HAVE_FORTRAN_LOGICAL1 = @OMPI_HAVE_FORTRAN_LOGICAL1@ +OMPI_HAVE_FORTRAN_LOGICAL2 = @OMPI_HAVE_FORTRAN_LOGICAL2@ +OMPI_HAVE_FORTRAN_LOGICAL4 = @OMPI_HAVE_FORTRAN_LOGICAL4@ +OMPI_HAVE_FORTRAN_LOGICAL8 = @OMPI_HAVE_FORTRAN_LOGICAL8@ +OMPI_HAVE_FORTRAN_REAL = @OMPI_HAVE_FORTRAN_REAL@ +OMPI_HAVE_FORTRAN_REAL16 = @OMPI_HAVE_FORTRAN_REAL16@ +OMPI_HAVE_FORTRAN_REAL2 = @OMPI_HAVE_FORTRAN_REAL2@ +OMPI_HAVE_FORTRAN_REAL4 = @OMPI_HAVE_FORTRAN_REAL4@ +OMPI_HAVE_FORTRAN_REAL8 = @OMPI_HAVE_FORTRAN_REAL8@ +OMPI_JDK_CPPFLAGS = @OMPI_JDK_CPPFLAGS@ +OMPI_KIND_FORTRAN_CHARACTER = @OMPI_KIND_FORTRAN_CHARACTER@ +OMPI_KIND_FORTRAN_COMPLEX = @OMPI_KIND_FORTRAN_COMPLEX@ +OMPI_KIND_FORTRAN_COMPLEX16 = @OMPI_KIND_FORTRAN_COMPLEX16@ +OMPI_KIND_FORTRAN_COMPLEX32 = @OMPI_KIND_FORTRAN_COMPLEX32@ +OMPI_KIND_FORTRAN_COMPLEX4 = @OMPI_KIND_FORTRAN_COMPLEX4@ +OMPI_KIND_FORTRAN_COMPLEX8 = @OMPI_KIND_FORTRAN_COMPLEX8@ +OMPI_KIND_FORTRAN_DOUBLE_COMPLEX = @OMPI_KIND_FORTRAN_DOUBLE_COMPLEX@ +OMPI_KIND_FORTRAN_DOUBLE_PRECISION = @OMPI_KIND_FORTRAN_DOUBLE_PRECISION@ +OMPI_KIND_FORTRAN_INTEGER = @OMPI_KIND_FORTRAN_INTEGER@ +OMPI_KIND_FORTRAN_INTEGER1 = @OMPI_KIND_FORTRAN_INTEGER1@ +OMPI_KIND_FORTRAN_INTEGER16 = @OMPI_KIND_FORTRAN_INTEGER16@ +OMPI_KIND_FORTRAN_INTEGER2 = @OMPI_KIND_FORTRAN_INTEGER2@ +OMPI_KIND_FORTRAN_INTEGER4 = @OMPI_KIND_FORTRAN_INTEGER4@ +OMPI_KIND_FORTRAN_INTEGER8 = @OMPI_KIND_FORTRAN_INTEGER8@ +OMPI_KIND_FORTRAN_LOGICAL = @OMPI_KIND_FORTRAN_LOGICAL@ +OMPI_KIND_FORTRAN_LOGICAL1 = @OMPI_KIND_FORTRAN_LOGICAL1@ +OMPI_KIND_FORTRAN_LOGICAL2 = @OMPI_KIND_FORTRAN_LOGICAL2@ +OMPI_KIND_FORTRAN_LOGICAL4 = @OMPI_KIND_FORTRAN_LOGICAL4@ +OMPI_KIND_FORTRAN_LOGICAL8 = @OMPI_KIND_FORTRAN_LOGICAL8@ +OMPI_KIND_FORTRAN_REAL = @OMPI_KIND_FORTRAN_REAL@ +OMPI_KIND_FORTRAN_REAL16 = @OMPI_KIND_FORTRAN_REAL16@ +OMPI_KIND_FORTRAN_REAL2 = @OMPI_KIND_FORTRAN_REAL2@ +OMPI_KIND_FORTRAN_REAL4 = @OMPI_KIND_FORTRAN_REAL4@ +OMPI_KIND_FORTRAN_REAL8 = @OMPI_KIND_FORTRAN_REAL8@ +OMPI_LIBMPI_EXTRA_LDFLAGS = @OMPI_LIBMPI_EXTRA_LDFLAGS@ +OMPI_LIBMPI_EXTRA_LIBS = @OMPI_LIBMPI_EXTRA_LIBS@ +OMPI_LIBMPI_NAME = @OMPI_LIBMPI_NAME@ +OMPI_MAJOR_VERSION = @OMPI_MAJOR_VERSION@ +OMPI_MINOR_VERSION = @OMPI_MINOR_VERSION@ +OMPI_MPIEXT_ALL_SUBDIRS = @OMPI_MPIEXT_ALL_SUBDIRS@ +OMPI_MPIEXT_C_DIRS = @OMPI_MPIEXT_C_DIRS@ +OMPI_MPIEXT_C_LIBS = @OMPI_MPIEXT_C_LIBS@ +OMPI_MPIEXT_MPIFH_DIRS = @OMPI_MPIEXT_MPIFH_DIRS@ +OMPI_MPIEXT_MPIFH_LIBS = @OMPI_MPIEXT_MPIFH_LIBS@ +OMPI_MPIEXT_USEMPIF08_DIRS = @OMPI_MPIEXT_USEMPIF08_DIRS@ +OMPI_MPIEXT_USEMPIF08_LIBS = @OMPI_MPIEXT_USEMPIF08_LIBS@ +OMPI_MPIEXT_USEMPI_DIRS = @OMPI_MPIEXT_USEMPI_DIRS@ +OMPI_MPIEXT_USEMPI_LIBS = @OMPI_MPIEXT_USEMPI_LIBS@ +OMPI_MPI_ADDRESS_KIND = @OMPI_MPI_ADDRESS_KIND@ +OMPI_MPI_BIND_PREFIX = @OMPI_MPI_BIND_PREFIX@ +OMPI_MPI_COUNT_KIND = @OMPI_MPI_COUNT_KIND@ +OMPI_MPI_INTEGER_KIND = @OMPI_MPI_INTEGER_KIND@ +OMPI_MPI_OFFSET_KIND = @OMPI_MPI_OFFSET_KIND@ +OMPI_MPI_PREFIX = @OMPI_MPI_PREFIX@ +OMPI_PKG_CONFIG_LDFLAGS = @OMPI_PKG_CONFIG_LDFLAGS@ +OMPI_RELEASE_DATE = @OMPI_RELEASE_DATE@ +OMPI_RELEASE_VERSION = @OMPI_RELEASE_VERSION@ +OMPI_REPO_REV = @OMPI_REPO_REV@ +OMPI_SIZEOF_FORTRAN_CHARACTER = @OMPI_SIZEOF_FORTRAN_CHARACTER@ +OMPI_SIZEOF_FORTRAN_COMPLEX = @OMPI_SIZEOF_FORTRAN_COMPLEX@ +OMPI_SIZEOF_FORTRAN_COMPLEX16 = @OMPI_SIZEOF_FORTRAN_COMPLEX16@ +OMPI_SIZEOF_FORTRAN_COMPLEX32 = @OMPI_SIZEOF_FORTRAN_COMPLEX32@ +OMPI_SIZEOF_FORTRAN_COMPLEX4 = @OMPI_SIZEOF_FORTRAN_COMPLEX4@ +OMPI_SIZEOF_FORTRAN_COMPLEX8 = @OMPI_SIZEOF_FORTRAN_COMPLEX8@ +OMPI_SIZEOF_FORTRAN_DOUBLE_COMPLEX = @OMPI_SIZEOF_FORTRAN_DOUBLE_COMPLEX@ +OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION = @OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION@ +OMPI_SIZEOF_FORTRAN_INTEGER = @OMPI_SIZEOF_FORTRAN_INTEGER@ +OMPI_SIZEOF_FORTRAN_INTEGER1 = @OMPI_SIZEOF_FORTRAN_INTEGER1@ +OMPI_SIZEOF_FORTRAN_INTEGER16 = @OMPI_SIZEOF_FORTRAN_INTEGER16@ +OMPI_SIZEOF_FORTRAN_INTEGER2 = @OMPI_SIZEOF_FORTRAN_INTEGER2@ +OMPI_SIZEOF_FORTRAN_INTEGER4 = @OMPI_SIZEOF_FORTRAN_INTEGER4@ +OMPI_SIZEOF_FORTRAN_INTEGER8 = @OMPI_SIZEOF_FORTRAN_INTEGER8@ +OMPI_SIZEOF_FORTRAN_LOGICAL = @OMPI_SIZEOF_FORTRAN_LOGICAL@ +OMPI_SIZEOF_FORTRAN_LOGICAL1 = @OMPI_SIZEOF_FORTRAN_LOGICAL1@ +OMPI_SIZEOF_FORTRAN_LOGICAL2 = @OMPI_SIZEOF_FORTRAN_LOGICAL2@ +OMPI_SIZEOF_FORTRAN_LOGICAL4 = @OMPI_SIZEOF_FORTRAN_LOGICAL4@ +OMPI_SIZEOF_FORTRAN_LOGICAL8 = @OMPI_SIZEOF_FORTRAN_LOGICAL8@ +OMPI_SIZEOF_FORTRAN_REAL = @OMPI_SIZEOF_FORTRAN_REAL@ +OMPI_SIZEOF_FORTRAN_REAL16 = @OMPI_SIZEOF_FORTRAN_REAL16@ +OMPI_SIZEOF_FORTRAN_REAL2 = @OMPI_SIZEOF_FORTRAN_REAL2@ +OMPI_SIZEOF_FORTRAN_REAL4 = @OMPI_SIZEOF_FORTRAN_REAL4@ +OMPI_SIZEOF_FORTRAN_REAL8 = @OMPI_SIZEOF_FORTRAN_REAL8@ +OMPI_TARBALL_VERSION = @OMPI_TARBALL_VERSION@ +OMPI_TOP_BUILDDIR = @OMPI_TOP_BUILDDIR@ +OMPI_TOP_SRCDIR = @OMPI_TOP_SRCDIR@ +OMPI_VERSION = @OMPI_VERSION@ +OMPI_WRAPPER_CXX_LIB = @OMPI_WRAPPER_CXX_LIB@ +OMPI_WRAPPER_CXX_REQUIRED_FILE = @OMPI_WRAPPER_CXX_REQUIRED_FILE@ +OMPI_WRAPPER_EXTRA_CFLAGS = @OMPI_WRAPPER_EXTRA_CFLAGS@ +OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX = @OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX@ +OMPI_WRAPPER_EXTRA_CPPFLAGS = @OMPI_WRAPPER_EXTRA_CPPFLAGS@ +OMPI_WRAPPER_EXTRA_CXXFLAGS = @OMPI_WRAPPER_EXTRA_CXXFLAGS@ +OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX = @OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX@ +OMPI_WRAPPER_EXTRA_FCFLAGS = @OMPI_WRAPPER_EXTRA_FCFLAGS@ +OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX = @OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX@ +OMPI_WRAPPER_EXTRA_FC_LDFLAGS = @OMPI_WRAPPER_EXTRA_FC_LDFLAGS@ +OMPI_WRAPPER_EXTRA_LDFLAGS = @OMPI_WRAPPER_EXTRA_LDFLAGS@ +OMPI_WRAPPER_EXTRA_LIBS = @OMPI_WRAPPER_EXTRA_LIBS@ +OMPI_WRAPPER_FORTRAN_REQUIRED_FILE = @OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@ +OMPI_WRAPPER_INCLUDEDIR = @OMPI_WRAPPER_INCLUDEDIR@ +OMPI_WRAPPER_LIBDIR = @OMPI_WRAPPER_LIBDIR@ +OPAL_ASM_GSYM = @OPAL_ASM_GSYM@ +OPAL_ASM_LSYM = @OPAL_ASM_LSYM@ +OPAL_ASM_SUPPORT_64BIT = @OPAL_ASM_SUPPORT_64BIT@ +OPAL_ASM_TEXT = @OPAL_ASM_TEXT@ +OPAL_ASM_TYPE = @OPAL_ASM_TYPE@ +OPAL_ASSEMBLY_ARCH = @OPAL_ASSEMBLY_ARCH@ +OPAL_ASSEMBLY_BUILTIN = @OPAL_ASSEMBLY_BUILTIN@ +OPAL_ASSEMBLY_FORMAT = @OPAL_ASSEMBLY_FORMAT@ +OPAL_AS_GLOBAL = @OPAL_AS_GLOBAL@ +OPAL_AS_LABEL_SUFFIX = @OPAL_AS_LABEL_SUFFIX@ +OPAL_CC_ABSOLUTE = @OPAL_CC_ABSOLUTE@ +OPAL_CONFIGURE_CLI = @OPAL_CONFIGURE_CLI@ +OPAL_CONFIGURE_DATE = @OPAL_CONFIGURE_DATE@ +OPAL_CONFIGURE_HOST = @OPAL_CONFIGURE_HOST@ +OPAL_CONFIGURE_USER = @OPAL_CONFIGURE_USER@ +OPAL_CXX_ABSOLUTE = @OPAL_CXX_ABSOLUTE@ +OPAL_DEFAULT_MCA_PARAM_CONF = @OPAL_DEFAULT_MCA_PARAM_CONF@ +OPAL_DYN_LIB_PREFIX = @OPAL_DYN_LIB_PREFIX@ +OPAL_DYN_LIB_SUFFIX = @OPAL_DYN_LIB_SUFFIX@ +OPAL_GREEK_VERSION = @OPAL_GREEK_VERSION@ +OPAL_LIB_PREFIX = @OPAL_LIB_PREFIX@ +OPAL_MAJOR_VERSION = @OPAL_MAJOR_VERSION@ +OPAL_MAX_DATAREP_STRING = @OPAL_MAX_DATAREP_STRING@ +OPAL_MAX_ERROR_STRING = @OPAL_MAX_ERROR_STRING@ +OPAL_MAX_INFO_KEY = @OPAL_MAX_INFO_KEY@ +OPAL_MAX_INFO_VAL = @OPAL_MAX_INFO_VAL@ +OPAL_MAX_OBJECT_NAME = @OPAL_MAX_OBJECT_NAME@ +OPAL_MAX_PORT_NAME = @OPAL_MAX_PORT_NAME@ +OPAL_MAX_PROCESSOR_NAME = @OPAL_MAX_PROCESSOR_NAME@ +OPAL_MINOR_VERSION = @OPAL_MINOR_VERSION@ +OPAL_PARAM_FROM_PLATFORM = @OPAL_PARAM_FROM_PLATFORM@ +OPAL_PKG_CONFIG_LDFLAGS = @OPAL_PKG_CONFIG_LDFLAGS@ +OPAL_RELEASE_DATE = @OPAL_RELEASE_DATE@ +OPAL_RELEASE_VERSION = @OPAL_RELEASE_VERSION@ +OPAL_REPO_REV = @OPAL_REPO_REV@ +OPAL_TARBALL_VERSION = @OPAL_TARBALL_VERSION@ +OPAL_TOP_BUILDDIR = @OPAL_TOP_BUILDDIR@ +OPAL_TOP_SRCDIR = @OPAL_TOP_SRCDIR@ +OPAL_VERSION = @OPAL_VERSION@ +OPAL_WRAPPER_EXTRA_CFLAGS = @OPAL_WRAPPER_EXTRA_CFLAGS@ +OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX = @OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX@ +OPAL_WRAPPER_EXTRA_CPPFLAGS = @OPAL_WRAPPER_EXTRA_CPPFLAGS@ +OPAL_WRAPPER_EXTRA_CXXFLAGS = @OPAL_WRAPPER_EXTRA_CXXFLAGS@ +OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX = @OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX@ +OPAL_WRAPPER_EXTRA_LDFLAGS = @OPAL_WRAPPER_EXTRA_LDFLAGS@ +OPAL_WRAPPER_EXTRA_LIBS = @OPAL_WRAPPER_EXTRA_LIBS@ +ORTE_GREEK_VERSION = @ORTE_GREEK_VERSION@ +ORTE_LIB_PREFIX = @ORTE_LIB_PREFIX@ +ORTE_MAJOR_VERSION = @ORTE_MAJOR_VERSION@ +ORTE_MINOR_VERSION = @ORTE_MINOR_VERSION@ +ORTE_PKG_CONFIG_LDFLAGS = @ORTE_PKG_CONFIG_LDFLAGS@ +ORTE_RELEASE_DATE = @ORTE_RELEASE_DATE@ +ORTE_RELEASE_VERSION = @ORTE_RELEASE_VERSION@ +ORTE_REPO_REV = @ORTE_REPO_REV@ +ORTE_TARBALL_VERSION = @ORTE_TARBALL_VERSION@ +ORTE_TOP_BUILDDIR = @ORTE_TOP_BUILDDIR@ +ORTE_TOP_SRCDIR = @ORTE_TOP_SRCDIR@ +ORTE_VERSION = @ORTE_VERSION@ +ORTE_WRAPPER_EXTRA_CFLAGS = @ORTE_WRAPPER_EXTRA_CFLAGS@ +ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX = @ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX@ +ORTE_WRAPPER_EXTRA_CPPFLAGS = @ORTE_WRAPPER_EXTRA_CPPFLAGS@ +ORTE_WRAPPER_EXTRA_LDFLAGS = @ORTE_WRAPPER_EXTRA_LDFLAGS@ +ORTE_WRAPPER_EXTRA_LIBS = @ORTE_WRAPPER_EXTRA_LIBS@ +OSHMEM_GREEK_VERSION = @OSHMEM_GREEK_VERSION@ +OSHMEM_LIBSHMEM_EXTRA_LDFLAGS = @OSHMEM_LIBSHMEM_EXTRA_LDFLAGS@ +OSHMEM_LIBSHMEM_EXTRA_LIBS = @OSHMEM_LIBSHMEM_EXTRA_LIBS@ +OSHMEM_MAJOR_VERSION = @OSHMEM_MAJOR_VERSION@ +OSHMEM_MINOR_VERSION = @OSHMEM_MINOR_VERSION@ +OSHMEM_RELEASE_DATE = @OSHMEM_RELEASE_DATE@ +OSHMEM_RELEASE_VERSION = @OSHMEM_RELEASE_VERSION@ +OSHMEM_REPO_REV = @OSHMEM_REPO_REV@ +OSHMEM_TARBALL_VERSION = @OSHMEM_TARBALL_VERSION@ +OSHMEM_TOP_BUILDDIR = @OSHMEM_TOP_BUILDDIR@ +OSHMEM_TOP_SRCDIR = @OSHMEM_TOP_SRCDIR@ +OSHMEM_VERSION = @OSHMEM_VERSION@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +QRSH = @QRSH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SINGULARITY = @SINGULARITY@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WRAPPER_CC = @WRAPPER_CC@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_FC = @ac_ct_FC@ +ac_prefix_program = @ac_prefix_program@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +atomic_mxm_CFLAGS = @atomic_mxm_CFLAGS@ +atomic_mxm_CPPFLAGS = @atomic_mxm_CPPFLAGS@ +atomic_mxm_LDFLAGS = @atomic_mxm_LDFLAGS@ +atomic_mxm_LIBS = @atomic_mxm_LIBS@ +atomic_ucx_CFLAGS = @atomic_ucx_CFLAGS@ +atomic_ucx_CPPFLAGS = @atomic_ucx_CPPFLAGS@ +atomic_ucx_LDFLAGS = @atomic_ucx_LDFLAGS@ +atomic_ucx_LIBS = @atomic_ucx_LIBS@ +bindir = @bindir@ +btl_openib_CFLAGS = @btl_openib_CFLAGS@ +btl_openib_CPPFLAGS = @btl_openib_CPPFLAGS@ +btl_openib_LDFLAGS = @btl_openib_LDFLAGS@ +btl_openib_LIBS = @btl_openib_LIBS@ +btl_portals4_CPPFLAGS = @btl_portals4_CPPFLAGS@ +btl_portals4_LDFLAGS = @btl_portals4_LDFLAGS@ +btl_portals4_LIBS = @btl_portals4_LIBS@ +btl_uct_CPPFLAGS = @btl_uct_CPPFLAGS@ +btl_uct_LDFLAGS = @btl_uct_LDFLAGS@ +btl_uct_LIBS = @btl_uct_LIBS@ +btl_ugni_CPPFLAGS = @btl_ugni_CPPFLAGS@ +btl_ugni_LDFLAGS = @btl_ugni_LDFLAGS@ +btl_ugni_LIBS = @btl_ugni_LIBS@ +btl_vader_CFLAGS = @btl_vader_CFLAGS@ +btl_vader_CPPFLAGS = @btl_vader_CPPFLAGS@ +btl_vader_LDFLAGS = @btl_vader_LDFLAGS@ +btl_vader_LIBS = @btl_vader_LIBS@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +coll_fca_CFLAGS = @coll_fca_CFLAGS@ +coll_fca_CPPFLAGS = @coll_fca_CPPFLAGS@ +coll_fca_HOME = @coll_fca_HOME@ +coll_fca_LDFLAGS = @coll_fca_LDFLAGS@ +coll_fca_LIBS = @coll_fca_LIBS@ +coll_hcoll_CFLAGS = @coll_hcoll_CFLAGS@ +coll_hcoll_CPPFLAGS = @coll_hcoll_CPPFLAGS@ +coll_hcoll_LDFLAGS = @coll_hcoll_LDFLAGS@ +coll_hcoll_LIBS = @coll_hcoll_LIBS@ +coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ +coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ +coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ +common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ +common_alps_LDFLAGS = @common_alps_LDFLAGS@ +common_alps_LIBS = @common_alps_LIBS@ +common_cuda_CPPFLAGS = @common_cuda_CPPFLAGS@ +common_ucx_CFLAGS = @common_ucx_CFLAGS@ +common_ucx_CPPFLAGS = @common_ucx_CPPFLAGS@ +common_ucx_LDFLAGS = @common_ucx_LDFLAGS@ +common_ucx_LIBS = @common_ucx_LIBS@ +common_verbs_CFLAGS = @common_verbs_CFLAGS@ +common_verbs_CPPFLAGS = @common_verbs_CPPFLAGS@ +common_verbs_LDFLAGS = @common_verbs_LDFLAGS@ +common_verbs_LIBS = @common_verbs_LIBS@ +common_verbs_usnic_CPPFLAGS = @common_verbs_usnic_CPPFLAGS@ +common_verbs_usnic_LDFLAGS = @common_verbs_usnic_LDFLAGS@ +common_verbs_usnic_LIBS = @common_verbs_usnic_LIBS@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +ess_alps_CPPFLAGS = @ess_alps_CPPFLAGS@ +ess_alps_LDFLAGS = @ess_alps_LDFLAGS@ +ess_alps_LIBS = @ess_alps_LIBS@ +ess_lsf_CPPFLAGS = @ess_lsf_CPPFLAGS@ +ess_lsf_LDFLAGS = @ess_lsf_LDFLAGS@ +ess_lsf_LIBS = @ess_lsf_LIBS@ +ess_slurm_CPPFLAGS = @ess_slurm_CPPFLAGS@ +ess_slurm_LDFLAGS = @ess_slurm_LDFLAGS@ +ess_slurm_LIBS = @ess_slurm_LIBS@ +ess_tm_CPPFLAGS = @ess_tm_CPPFLAGS@ +ess_tm_LDFLAGS = @ess_tm_LDFLAGS@ +ess_tm_LIBS = @ess_tm_LIBS@ +exec_prefix = @exec_prefix@ +fbtl_ime_CPPFLAGS = @fbtl_ime_CPPFLAGS@ +fbtl_ime_LDFLAGS = @fbtl_ime_LDFLAGS@ +fbtl_ime_LIBS = @fbtl_ime_LIBS@ +fbtl_pvfs2_CPPFLAGS = @fbtl_pvfs2_CPPFLAGS@ +fbtl_pvfs2_LDFLAGS = @fbtl_pvfs2_LDFLAGS@ +fbtl_pvfs2_LIBS = @fbtl_pvfs2_LIBS@ +fs_gpfs_CPPFLAGS = @fs_gpfs_CPPFLAGS@ +fs_gpfs_LDFLAGS = @fs_gpfs_LDFLAGS@ +fs_gpfs_LIBS = @fs_gpfs_LIBS@ +fs_ime_CPPFLAGS = @fs_ime_CPPFLAGS@ +fs_ime_LDFLAGS = @fs_ime_LDFLAGS@ +fs_ime_LIBS = @fs_ime_LIBS@ +fs_lustre_CPPFLAGS = @fs_lustre_CPPFLAGS@ +fs_lustre_LDFLAGS = @fs_lustre_LDFLAGS@ +fs_lustre_LIBS = @fs_lustre_LIBS@ +fs_pvfs2_CPPFLAGS = @fs_pvfs2_CPPFLAGS@ +fs_pvfs2_LDFLAGS = @fs_pvfs2_LDFLAGS@ +fs_pvfs2_LIBS = @fs_pvfs2_LIBS@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +libmca_ompi_common_monitoring_so_version = @libmca_ompi_common_monitoring_so_version@ +libmca_ompi_common_ompio_so_version = @libmca_ompi_common_ompio_so_version@ +libmca_opal_common_cuda_so_version = @libmca_opal_common_cuda_so_version@ +libmca_opal_common_ofi_so_version = @libmca_opal_common_ofi_so_version@ +libmca_opal_common_sm_so_version = @libmca_opal_common_sm_so_version@ +libmca_opal_common_ucx_so_version = @libmca_opal_common_ucx_so_version@ +libmca_opal_common_ugni_so_version = @libmca_opal_common_ugni_so_version@ +libmca_opal_common_verbs_so_version = @libmca_opal_common_verbs_so_version@ +libmca_orte_common_alps_so_version = @libmca_orte_common_alps_so_version@ +libmpi_cxx_so_version = @libmpi_cxx_so_version@ +libmpi_java_so_version = @libmpi_java_so_version@ +libmpi_mpifh_so_version = @libmpi_mpifh_so_version@ +libmpi_so_version = @libmpi_so_version@ +libmpi_usempi_ignore_tkr_so_version = @libmpi_usempi_ignore_tkr_so_version@ +libmpi_usempi_tkr_so_version = @libmpi_usempi_tkr_so_version@ +libmpi_usempif08_so_version = @libmpi_usempif08_so_version@ +libompitrace_so_version = @libompitrace_so_version@ +libopen_pal_so_version = @libopen_pal_so_version@ +libopen_rte_so_version = @libopen_rte_so_version@ +liboshmem_so_version = @liboshmem_so_version@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +memory_malloc_solaris_LIBS = @memory_malloc_solaris_LIBS@ +mkdir_p = @mkdir_p@ +mpool_memkind_CPPFLAGS = @mpool_memkind_CPPFLAGS@ +mpool_memkind_LDFLAGS = @mpool_memkind_LDFLAGS@ +mpool_memkind_LIBS = @mpool_memkind_LIBS@ +mtl_portals4_CPPFLAGS = @mtl_portals4_CPPFLAGS@ +mtl_portals4_LDFLAGS = @mtl_portals4_LDFLAGS@ +mtl_portals4_LIBS = @mtl_portals4_LIBS@ +mtl_psm2_CFLAGS = @mtl_psm2_CFLAGS@ +mtl_psm2_CPPFLAGS = @mtl_psm2_CPPFLAGS@ +mtl_psm2_LDFLAGS = @mtl_psm2_LDFLAGS@ +mtl_psm2_LIBS = @mtl_psm2_LIBS@ +mtl_psm_CFLAGS = @mtl_psm_CFLAGS@ +mtl_psm_CPPFLAGS = @mtl_psm_CPPFLAGS@ +mtl_psm_LDFLAGS = @mtl_psm_LDFLAGS@ +mtl_psm_LIBS = @mtl_psm_LIBS@ +odls_alps_CPPFLAGS = @odls_alps_CPPFLAGS@ +odls_alps_LDFLAGS = @odls_alps_LDFLAGS@ +odls_alps_LIBS = @odls_alps_LIBS@ +oldincludedir = @oldincludedir@ +ompidatadir = @ompidatadir@ +ompiincludedir = @ompiincludedir@ +ompilibdir = @ompilibdir@ +oob_alps_CPPFLAGS = @oob_alps_CPPFLAGS@ +oob_alps_LDFLAGS = @oob_alps_LDFLAGS@ +oob_alps_LIBS = @oob_alps_LIBS@ +opal_datatype_cuda_CPPFLAGS = @opal_datatype_cuda_CPPFLAGS@ +opal_dl_dlopen_LIBS = @opal_dl_dlopen_LIBS@ +opal_dl_libltdl_CPPFLAGS = @opal_dl_libltdl_CPPFLAGS@ +opal_dl_libltdl_LDFLAGS = @opal_dl_libltdl_LDFLAGS@ +opal_dl_libltdl_LIBS = @opal_dl_libltdl_LIBS@ +opal_event_external_CPPFLAGS = @opal_event_external_CPPFLAGS@ +opal_event_external_LDFLAGS = @opal_event_external_LDFLAGS@ +opal_event_external_LIBS = @opal_event_external_LIBS@ +opal_hwloc_external_LDFLAGS = @opal_hwloc_external_LDFLAGS@ +opal_hwloc_external_LIBS = @opal_hwloc_external_LIBS@ +opal_hwloc_hwloc201_CFLAGS = @opal_hwloc_hwloc201_CFLAGS@ +opal_hwloc_hwloc201_CPPFLAGS = @opal_hwloc_hwloc201_CPPFLAGS@ +opal_hwloc_hwloc201_LDFLAGS = @opal_hwloc_hwloc201_LDFLAGS@ +opal_hwloc_hwloc201_LIBS = @opal_hwloc_hwloc201_LIBS@ +opal_memchecker_valgrind_CPPFLAGS = @opal_memchecker_valgrind_CPPFLAGS@ +opal_ofi_CPPFLAGS = @opal_ofi_CPPFLAGS@ +opal_ofi_LDFLAGS = @opal_ofi_LDFLAGS@ +opal_ofi_LIBS = @opal_ofi_LIBS@ +opal_pmi1_CPPFLAGS = @opal_pmi1_CPPFLAGS@ +opal_pmi1_LDFLAGS = @opal_pmi1_LDFLAGS@ +opal_pmi1_LIBS = @opal_pmi1_LIBS@ +opal_pmi1_rpath = @opal_pmi1_rpath@ +opal_pmi2_CPPFLAGS = @opal_pmi2_CPPFLAGS@ +opal_pmi2_LDFLAGS = @opal_pmi2_LDFLAGS@ +opal_pmi2_LIBS = @opal_pmi2_LIBS@ +opal_pmi2_rpath = @opal_pmi2_rpath@ +opal_pmix_ext1x_CPPFLAGS = @opal_pmix_ext1x_CPPFLAGS@ +opal_pmix_ext1x_LDFLAGS = @opal_pmix_ext1x_LDFLAGS@ +opal_pmix_ext1x_LIBS = @opal_pmix_ext1x_LIBS@ +opal_pmix_ext2x_CPPFLAGS = @opal_pmix_ext2x_CPPFLAGS@ +opal_pmix_ext2x_LDFLAGS = @opal_pmix_ext2x_LDFLAGS@ +opal_pmix_ext2x_LIBS = @opal_pmix_ext2x_LIBS@ +opal_pmix_ext3x_CPPFLAGS = @opal_pmix_ext3x_CPPFLAGS@ +opal_pmix_ext3x_LDFLAGS = @opal_pmix_ext3x_LDFLAGS@ +opal_pmix_ext3x_LIBS = @opal_pmix_ext3x_LIBS@ +opal_pmix_pmix3x_CPPFLAGS = @opal_pmix_pmix3x_CPPFLAGS@ +opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ +opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ +opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ +opaldatadir = @opaldatadir@ +opalincludedir = @opalincludedir@ +opallibdir = @opallibdir@ +ortedatadir = @ortedatadir@ +orteincludedir = @orteincludedir@ +ortelibdir = @ortelibdir@ +osc_portals4_CPPFLAGS = @osc_portals4_CPPFLAGS@ +osc_portals4_LDFLAGS = @osc_portals4_LDFLAGS@ +osc_portals4_LIBS = @osc_portals4_LIBS@ +osc_ucx_CPPFLAGS = @osc_ucx_CPPFLAGS@ +osc_ucx_LDFLAGS = @osc_ucx_LDFLAGS@ +osc_ucx_LIBS = @osc_ucx_LIBS@ +oshmem_verbs_CFLAGS = @oshmem_verbs_CFLAGS@ +oshmem_verbs_CPPFLAGS = @oshmem_verbs_CPPFLAGS@ +oshmem_verbs_LDFLAGS = @oshmem_verbs_LDFLAGS@ +oshmem_verbs_LIBS = @oshmem_verbs_LIBS@ +oshmemdatadir = @oshmemdatadir@ +oshmemincludedir = @oshmemincludedir@ +oshmemlibdir = @oshmemlibdir@ +pdfdir = @pdfdir@ +plm_alps_CPPFLAGS = @plm_alps_CPPFLAGS@ +plm_alps_LDFLAGS = @plm_alps_LDFLAGS@ +plm_alps_LIBS = @plm_alps_LIBS@ +plm_lsf_CPPFLAGS = @plm_lsf_CPPFLAGS@ +plm_lsf_LDFLAGS = @plm_lsf_LDFLAGS@ +plm_lsf_LIBS = @plm_lsf_LIBS@ +plm_slurm_CPPFLAGS = @plm_slurm_CPPFLAGS@ +plm_slurm_LDFLAGS = @plm_slurm_LDFLAGS@ +plm_slurm_LIBS = @plm_slurm_LIBS@ +plm_tm_CPPFLAGS = @plm_tm_CPPFLAGS@ +plm_tm_LDFLAGS = @plm_tm_LDFLAGS@ +plm_tm_LIBS = @plm_tm_LIBS@ +pmix_alps_CPPFLAGS = @pmix_alps_CPPFLAGS@ +pmix_alps_LDFLAGS = @pmix_alps_LDFLAGS@ +pmix_alps_LIBS = @pmix_alps_LIBS@ +pmix_cray_CPPFLAGS = @pmix_cray_CPPFLAGS@ +pmix_cray_LDFLAGS = @pmix_cray_LDFLAGS@ +pmix_cray_LIBS = @pmix_cray_LIBS@ +pml_ucx_CPPFLAGS = @pml_ucx_CPPFLAGS@ +pml_ucx_LDFLAGS = @pml_ucx_LDFLAGS@ +pml_ucx_LIBS = @pml_ucx_LIBS@ +pml_yalla_CPPFLAGS = @pml_yalla_CPPFLAGS@ +pml_yalla_LDFLAGS = @pml_yalla_LDFLAGS@ +pml_yalla_LIBS = @pml_yalla_LIBS@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +ras_alps_CPPFLAGS = @ras_alps_CPPFLAGS@ +ras_lsf_CPPFLAGS = @ras_lsf_CPPFLAGS@ +ras_lsf_LDFLAGS = @ras_lsf_LDFLAGS@ +ras_lsf_LIBS = @ras_lsf_LIBS@ +ras_slurm_CPPFLAGS = @ras_slurm_CPPFLAGS@ +ras_slurm_LDFLAGS = @ras_slurm_LDFLAGS@ +ras_slurm_LIBS = @ras_slurm_LIBS@ +ras_tm_CPPFLAGS = @ras_tm_CPPFLAGS@ +ras_tm_LDFLAGS = @ras_tm_LDFLAGS@ +ras_tm_LIBS = @ras_tm_LIBS@ +rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ +rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ +rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ +sbindir = @sbindir@ +schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ +schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ +schizo_moab_LDFLAGS = @schizo_moab_LDFLAGS@ +schizo_moab_LIBS = @schizo_moab_LIBS@ +schizo_slurm_CPPFLAGS = @schizo_slurm_CPPFLAGS@ +schizo_slurm_LDFLAGS = @schizo_slurm_LDFLAGS@ +schizo_slurm_LIBS = @schizo_slurm_LIBS@ +scoll_fca_CFLAGS = @scoll_fca_CFLAGS@ +scoll_fca_CPPFLAGS = @scoll_fca_CPPFLAGS@ +scoll_fca_HOME = @scoll_fca_HOME@ +scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ +scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ +sharedstatedir = @sharedstatedir@ +spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ +spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ +spml_ikrit_LDFLAGS = @spml_ikrit_LDFLAGS@ +spml_ikrit_LIBS = @spml_ikrit_LIBS@ +spml_ucx_CFLAGS = @spml_ucx_CFLAGS@ +spml_ucx_CPPFLAGS = @spml_ucx_CPPFLAGS@ +spml_ucx_LDFLAGS = @spml_ucx_LDFLAGS@ +spml_ucx_LIBS = @spml_ucx_LIBS@ +srcdir = @srcdir@ +sshmem_ucx_CFLAGS = @sshmem_ucx_CFLAGS@ +sshmem_ucx_CPPFLAGS = @sshmem_ucx_CPPFLAGS@ +sshmem_ucx_LDFLAGS = @sshmem_ucx_LDFLAGS@ +sshmem_ucx_LIBS = @sshmem_ucx_LIBS@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ucx_CFLAGS = @ucx_CFLAGS@ +ucx_LIBS = @ucx_LIBS@ +ucx_STATIC_LIBS = @ucx_STATIC_LIBS@ +AM_CPPFLAGS = $(coll_ucc_CPPFLAGS) +coll_ucc_sources = \ + coll_ucc.h \ + coll_ucc_debug.h \ + coll_ucc_dtypes.h \ + coll_ucc_common.h \ + coll_ucc_module.c \ + coll_ucc_component.c \ + coll_ucc_barrier.c \ + coll_ucc_bcast.c \ + coll_ucc_allreduce.c \ + coll_ucc_reduce.c \ + coll_ucc_alltoall.c \ + coll_ucc_alltoallv.c \ + coll_ucc_allgather.c \ + coll_ucc_allgatherv.c + +@MCA_BUILD_ompi_coll_ucc_DSO_FALSE@component_noinst = libmca_coll_ucc.la + +# Make the output library in this directory, and name it either +# mca__.la (for DSO builds) or libmca__.la +# (for static builds). +@MCA_BUILD_ompi_coll_ucc_DSO_TRUE@component_noinst = +@MCA_BUILD_ompi_coll_ucc_DSO_FALSE@component_install = +@MCA_BUILD_ompi_coll_ucc_DSO_TRUE@component_install = mca_coll_ucc.la +mcacomponentdir = $(ompilibdir) +mcacomponent_LTLIBRARIES = $(component_install) +mca_coll_ucc_la_SOURCES = $(coll_ucc_sources) +mca_coll_ucc_la_LIBADD = $(top_builddir)/ompi/lib@OMPI_LIBMPI_NAME@.la \ + $(coll_ucc_LIBS) + +mca_coll_ucc_la_LDFLAGS = -module -avoid-version $(coll_ucc_LDFLAGS) +noinst_LTLIBRARIES = $(component_noinst) +libmca_coll_ucc_la_SOURCES = $(coll_ucc_sources) +libmca_coll_ucc_la_LIBADD = $(coll_ucc_LIBS) +libmca_coll_ucc_la_LDFLAGS = -module -avoid-version $(coll_ucc_LDFLAGS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ompi/mca/coll/ucc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign ompi/mca/coll/ucc/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(mcacomponentdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \ + } + +uninstall-mcacomponentLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \ + done + +clean-mcacomponentLTLIBRARIES: + -test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES) + @list='$(mcacomponent_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libmca_coll_ucc.la: $(libmca_coll_ucc_la_OBJECTS) $(libmca_coll_ucc_la_DEPENDENCIES) $(EXTRA_libmca_coll_ucc_la_DEPENDENCIES) + $(AM_V_CCLD)$(libmca_coll_ucc_la_LINK) $(am_libmca_coll_ucc_la_rpath) $(libmca_coll_ucc_la_OBJECTS) $(libmca_coll_ucc_la_LIBADD) $(LIBS) + +mca_coll_ucc.la: $(mca_coll_ucc_la_OBJECTS) $(mca_coll_ucc_la_DEPENDENCIES) $(EXTRA_mca_coll_ucc_la_DEPENDENCIES) + $(AM_V_CCLD)$(mca_coll_ucc_la_LINK) $(am_mca_coll_ucc_la_rpath) $(mca_coll_ucc_la_OBJECTS) $(mca_coll_ucc_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_allgather.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_allgatherv.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_allreduce.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_alltoall.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_alltoallv.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_barrier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_bcast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_component.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coll_ucc_reduce.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(mcacomponentdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \ + clean-noinstLTLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-mcacomponentLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-mcacomponentLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-mcacomponentLTLIBRARIES \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-mcacomponentLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ + uninstall-mcacomponentLTLIBRARIES + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru openmpi-4.1.2/ompi/mca/common/Makefile.in openmpi-4.1.4/ompi/mca/common/Makefile.in --- openmpi-4.1.2/ompi/mca/common/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/common/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1395,6 +1398,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1544,9 +1551,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1607,6 +1611,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1620,6 +1627,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/common/monitoring/Makefile.in openmpi-4.1.4/ompi/mca/common/monitoring/Makefile.in --- openmpi-4.1.2/ompi/mca/common/monitoring/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/common/monitoring/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1513,6 +1516,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1662,9 +1669,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1725,6 +1729,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1738,6 +1745,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/common/ompio/common_ompio_aggregators.c openmpi-4.1.4/ompi/mca/common/ompio/common_ompio_aggregators.c --- openmpi-4.1.2/ompi/mca/common/ompio/common_ompio_aggregators.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/common/ompio/common_ompio_aggregators.c 2022-05-29 09:51:40.000000000 +0000 @@ -1459,8 +1459,8 @@ */ static double cost_calc (int P, int P_a, size_t d_p, size_t b_c, int dim ) { - float n_as=1.0, m_s=1.0, n_s=1.0; - float n_ar=1.0; + double n_as=1.0, m_s=1.0, n_s=1.0; + double n_ar=1.0; double t_send, t_recv, t_tot; /* LogGP parameters based on DDR InfiniBand values */ @@ -1470,7 +1470,7 @@ double G=.00000000067; long file_domain = (P * d_p) / P_a; - float n_r = (float)file_domain/(float) b_c; + double n_r = (double)file_domain/(double) b_c; switch (dim) { case DIM1: @@ -1480,10 +1480,10 @@ n_ar = 1; n_as = 1; m_s = b_c; - n_s = (float)d_p/(float)b_c; + n_s = (double)d_p/(double)b_c; } else { - n_ar = (float)b_c/(float)d_p; + n_ar = (double)b_c/(double)d_p; n_as = 1; m_s = d_p; n_s = 1; @@ -1495,14 +1495,14 @@ int P_x, P_y; P_x = P_y = (int) sqrt(P); - n_as = (float) P_a / (float)P_x; + n_as = (double) P_a / (double)P_x; - n_ar = (float) P_y; + n_ar = (double) P_y; if ( d_p > (P_a*b_c/P )) { - m_s = fmin(b_c / P_y, d_p); + m_s = fmin((double) b_c / (double)P_y, (double)d_p); } else { - m_s = fmin(d_p * P_x / P_a, d_p); + m_s = fmin((double) (d_p * P_x) / (double)P_a, (double)d_p); } break; } @@ -1511,7 +1511,7 @@ break; } - n_s = (float) d_p / (float)(n_as * m_s); + n_s = (double) d_p / (double)(n_as * m_s); if( m_s < 33554432) { g = .00000108; diff -Nru openmpi-4.1.2/ompi/mca/common/ompio/common_ompio_file_open.c openmpi-4.1.4/ompi/mca/common/ompio/common_ompio_file_open.c --- openmpi-4.1.2/ompi/mca/common/ompio/common_ompio_file_open.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/common/ompio/common_ompio_file_open.c 2022-05-29 09:51:40.000000000 +0000 @@ -41,6 +41,9 @@ #include #include "common_ompio.h" #include "ompi/mca/topo/topo.h" +#include "opal/util/opal_getcwd.h" +#include "opal/util/path.h" +#include "opal/util/os_path.h" static mca_common_ompio_generate_current_file_view_fn_t generate_current_file_view_fn; static mca_common_ompio_get_mca_parameter_value_fn_t get_mca_parameter_value_fn; @@ -100,6 +103,22 @@ ompio_fh->f_get_mca_parameter_value=get_mca_parameter_value_fn; ompio_fh->f_filename = filename; + if (opal_path_is_absolute(filename) ) { + ompio_fh->f_fullfilename = strdup(filename); + } + else { + char path[OPAL_PATH_MAX]; + ret = opal_getcwd(path, OPAL_PATH_MAX); + if (OPAL_SUCCESS != ret) { + goto fn_fail; + } + ompio_fh->f_fullfilename = opal_os_path(0, path, filename, NULL); + if (NULL == ompio_fh->f_fullfilename){ + ret = OMPI_ERROR; + goto fn_fail; + } + } + mca_common_ompio_set_file_defaults (ompio_fh); ompio_fh->f_split_coll_req = NULL; @@ -285,7 +304,7 @@ ret = ompio_fh->f_fs->fs_file_close (ompio_fh); } if ( delete_flag ) { - ret = mca_common_ompio_file_delete ( ompio_fh->f_filename, &(MPI_INFO_NULL->super) ); + ret = mca_common_ompio_file_delete ( ompio_fh->f_fullfilename, &(MPI_INFO_NULL->super) ); } if ( NULL != ompio_fh->f_fs ) { @@ -350,7 +369,8 @@ free ( ompio_fh->f_coll_write_time ); ompio_fh->f_coll_write_time = NULL; } - + free (ompio_fh->f_fullfilename); + if ( NULL != ompio_fh->f_coll_read_time ) { free ( ompio_fh->f_coll_read_time ); ompio_fh->f_coll_read_time = NULL; @@ -371,8 +391,7 @@ if ( MPI_DATATYPE_NULL != ompio_fh->f_orig_filetype ){ ompi_datatype_destroy (&ompio_fh->f_orig_filetype); } - - + if (MPI_COMM_NULL != ompio_fh->f_comm && !(ompio_fh->f_flags & OMPIO_SHAREDFP_IS_SET) ) { ompi_comm_free (&ompio_fh->f_comm); } diff -Nru openmpi-4.1.2/ompi/mca/common/ompio/common_ompio.h openmpi-4.1.4/ompi/mca/common/ompio/common_ompio.h --- openmpi-4.1.2/ompi/mca/common/ompio/common_ompio.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/common/ompio/common_ompio.h 2022-05-29 09:51:40.000000000 +0000 @@ -87,7 +87,7 @@ #define OMPIO_LOCK_SELECTIVE 11 #define OMPIO_FCOLL_WANT_TIME_BREAKDOWN 0 -#define MCA_IO_DEFAULT_FILE_VIEW_SIZE 4*1024*1024 +#define MCA_IO_DEFAULT_FILE_VIEW_SIZE 6*1024*1024 #define OMPIO_UNIFORM_DIST_THRESHOLD 0.5 #define OMPIO_CONTG_THRESHOLD 1048576 @@ -157,6 +157,7 @@ int f_perm; ompi_communicator_t *f_comm; const char *f_filename; + char *f_fullfilename; char *f_datarep; opal_convertor_t *f_mem_convertor; opal_convertor_t *f_file_convertor; diff -Nru openmpi-4.1.2/ompi/mca/common/ompio/Makefile.in openmpi-4.1.4/ompi/mca/common/ompio/Makefile.in --- openmpi-4.1.2/ompi/mca/common/ompio/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/common/ompio/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1512,6 +1515,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1661,9 +1668,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1724,6 +1728,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1737,6 +1744,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/crcp/bkmrk/Makefile.in openmpi-4.1.4/ompi/mca/crcp/bkmrk/Makefile.in --- openmpi-4.1.2/ompi/mca/crcp/bkmrk/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/crcp/bkmrk/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1489,6 +1492,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1638,9 +1645,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1701,6 +1705,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1714,6 +1721,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/crcp/Makefile.in openmpi-4.1.4/ompi/mca/crcp/Makefile.in --- openmpi-4.1.2/ompi/mca/crcp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/crcp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -160,6 +160,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -398,6 +399,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -434,6 +436,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1516,6 +1519,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1665,9 +1672,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1728,6 +1732,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1741,6 +1748,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fbtl/ime/Makefile.in openmpi-4.1.4/ompi/mca/fbtl/ime/Makefile.in --- openmpi-4.1.2/ompi/mca/fbtl/ime/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fbtl/ime/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -116,6 +116,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -354,6 +355,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -390,6 +392,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fbtl/Makefile.in openmpi-4.1.4/ompi/mca/fbtl/Makefile.in --- openmpi-4.1.2/ompi/mca/fbtl/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fbtl/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fbtl/posix/Makefile.in openmpi-4.1.4/ompi/mca/fbtl/posix/Makefile.in --- openmpi-4.1.2/ompi/mca/fbtl/posix/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fbtl/posix/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fbtl/pvfs2/Makefile.in openmpi-4.1.4/ompi/mca/fbtl/pvfs2/Makefile.in --- openmpi-4.1.2/ompi/mca/fbtl/pvfs2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fbtl/pvfs2/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fcoll/dynamic/Makefile.in openmpi-4.1.4/ompi/mca/fcoll/dynamic/Makefile.in --- openmpi-4.1.2/ompi/mca/fcoll/dynamic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fcoll/dynamic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fcoll/dynamic_gen2/Makefile.in openmpi-4.1.4/ompi/mca/fcoll/dynamic_gen2/Makefile.in --- openmpi-4.1.2/ompi/mca/fcoll/dynamic_gen2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fcoll/dynamic_gen2/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fcoll/individual/Makefile.in openmpi-4.1.4/ompi/mca/fcoll/individual/Makefile.in --- openmpi-4.1.2/ompi/mca/fcoll/individual/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fcoll/individual/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fcoll/Makefile.in openmpi-4.1.4/ompi/mca/fcoll/Makefile.in --- openmpi-4.1.2/ompi/mca/fcoll/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fcoll/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fcoll/two_phase/Makefile.in openmpi-4.1.4/ompi/mca/fcoll/two_phase/Makefile.in --- openmpi-4.1.2/ompi/mca/fcoll/two_phase/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fcoll/two_phase/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fcoll/vulcan/Makefile.in openmpi-4.1.4/ompi/mca/fcoll/vulcan/Makefile.in --- openmpi-4.1.2/ompi/mca/fcoll/vulcan/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fcoll/vulcan/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fs/gpfs/Makefile.in openmpi-4.1.4/ompi/mca/fs/gpfs/Makefile.in --- openmpi-4.1.2/ompi/mca/fs/gpfs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fs/gpfs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1493,6 +1496,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1642,9 +1649,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1705,6 +1709,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1718,6 +1725,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fs/ime/Makefile.in openmpi-4.1.4/ompi/mca/fs/ime/Makefile.in --- openmpi-4.1.2/ompi/mca/fs/ime/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fs/ime/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fs/lustre/Makefile.in openmpi-4.1.4/ompi/mca/fs/lustre/Makefile.in --- openmpi-4.1.2/ompi/mca/fs/lustre/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fs/lustre/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fs/Makefile.in openmpi-4.1.4/ompi/mca/fs/Makefile.in --- openmpi-4.1.2/ompi/mca/fs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fs/pvfs2/Makefile.in openmpi-4.1.4/ompi/mca/fs/pvfs2/Makefile.in --- openmpi-4.1.2/ompi/mca/fs/pvfs2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fs/pvfs2/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/fs/ufs/Makefile.in openmpi-4.1.4/ompi/mca/fs/ufs/Makefile.in --- openmpi-4.1.2/ompi/mca/fs/ufs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/fs/ufs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1492,6 +1495,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1641,9 +1648,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1704,6 +1708,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1717,6 +1724,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/hook/Makefile.in openmpi-4.1.4/ompi/mca/hook/Makefile.in --- openmpi-4.1.2/ompi/mca/hook/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/hook/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1480,6 +1483,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1629,9 +1636,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1692,6 +1696,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1705,6 +1712,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/io/Makefile.in openmpi-4.1.4/ompi/mca/io/Makefile.in --- openmpi-4.1.2/ompi/mca/io/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/io/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/io/ompio/Makefile.in openmpi-4.1.4/ompi/mca/io/ompio/Makefile.in --- openmpi-4.1.2/ompi/mca/io/ompio/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/io/ompio/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/io/romio321/Makefile.in openmpi-4.1.4/ompi/mca/io/romio321/Makefile.in --- openmpi-4.1.2/ompi/mca/io/romio321/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/io/romio321/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -151,6 +151,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -389,6 +390,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -425,6 +427,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1568,6 +1571,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1717,9 +1724,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1780,6 +1784,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1793,6 +1800,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/io/romio321/romio/adio/ad_gpfs/ad_gpfs_open.c openmpi-4.1.4/ompi/mca/io/romio321/romio/adio/ad_gpfs/ad_gpfs_open.c --- openmpi-4.1.2/ompi/mca/io/romio321/romio/adio/ad_gpfs/ad_gpfs_open.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/io/romio321/romio/adio/ad_gpfs/ad_gpfs_open.c 2022-05-29 09:51:40.000000000 +0000 @@ -115,9 +115,9 @@ MPI_Comm_rank(fd->comm, &rank); if ((rank == fd->hints->ranklist[0]) || (fd->comm == MPI_COMM_SELF)) { - struct stat64 gpfs_statbuf; + struct stat gpfs_statbuf; /* Get the (real) underlying file system block size */ - rc = stat64(fd->filename, &gpfs_statbuf); + rc = stat(fd->filename, &gpfs_statbuf); if (rc >= 0) { fd->blksize = gpfs_statbuf.st_blksize; diff -Nru openmpi-4.1.2/ompi/mca/mtl/Makefile.in openmpi-4.1.4/ompi/mca/mtl/Makefile.in --- openmpi-4.1.2/ompi/mca/mtl/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/mtl/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/mtl/ofi/Makefile.in openmpi-4.1.4/ompi/mca/mtl/ofi/Makefile.in --- openmpi-4.1.2/ompi/mca/mtl/ofi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/mtl/ofi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/mtl/portals4/Makefile.in openmpi-4.1.4/ompi/mca/mtl/portals4/Makefile.in --- openmpi-4.1.2/ompi/mca/mtl/portals4/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/mtl/portals4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -137,6 +137,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -375,6 +376,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -411,6 +413,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1526,6 +1529,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1675,9 +1682,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1738,6 +1742,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1751,6 +1758,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/mtl/psm/Makefile.in openmpi-4.1.4/ompi/mca/mtl/psm/Makefile.in --- openmpi-4.1.2/ompi/mca/mtl/psm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/mtl/psm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/mtl/psm2/Makefile.in openmpi-4.1.4/ompi/mca/mtl/psm2/Makefile.in --- openmpi-4.1.2/ompi/mca/mtl/psm2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/mtl/psm2/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1502,6 +1505,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1651,9 +1658,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1714,6 +1718,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1727,6 +1734,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/op/avx/Makefile.in openmpi-4.1.4/ompi/mca/op/avx/Makefile.in --- openmpi-4.1.2/ompi/mca/op/avx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/op/avx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -135,6 +135,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -373,6 +374,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -409,6 +411,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1534,6 +1537,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1683,9 +1690,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1746,6 +1750,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1759,6 +1766,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/op/Makefile.in openmpi-4.1.4/ompi/mca/op/Makefile.in --- openmpi-4.1.2/ompi/mca/op/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/op/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/Makefile.in openmpi-4.1.4/ompi/mca/osc/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -143,6 +143,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -381,6 +382,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -417,6 +419,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/monitoring/Makefile.in openmpi-4.1.4/ompi/mca/osc/monitoring/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/monitoring/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/monitoring/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/portals4/Makefile.in openmpi-4.1.4/ompi/mca/osc/portals4/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/portals4/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/portals4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/pt2pt/Makefile.in openmpi-4.1.4/ompi/mca/osc/pt2pt/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/pt2pt/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/pt2pt/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/rdma/Makefile.in openmpi-4.1.4/ompi/mca/osc/rdma/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/rdma/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/rdma/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/rdma/osc_rdma_accumulate.c openmpi-4.1.4/ompi/mca/osc/rdma/osc_rdma_accumulate.c --- openmpi-4.1.2/ompi/mca/osc/rdma/osc_rdma_accumulate.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/rdma/osc_rdma_accumulate.c 2022-05-29 09:51:40.000000000 +0000 @@ -8,6 +8,8 @@ * Copyright (c) 2019 Triad National Security, LLC. All rights * reserved. * Copyright (c) 2019-2021 Google, LLC. All rights reserved. + * Copyright (c) 2021 IBM Corporation. All rights reserved. + * Copyright (c) 2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -192,9 +194,9 @@ new_value = old_value; if (&ompi_mpi_op_replace.op == op) { - memcpy ((void *)((intptr_t) &new_value + offset), origin_addr + dt->super.true_lb, extent); + memcpy ((void *)((ptrdiff_t) &new_value + offset), (void *)((ptrdiff_t) origin_addr + dt->super.true_lb), extent); } else if (&ompi_mpi_op_no_op.op != op) { - ompi_op_reduce (op, (void *) origin_addr + dt->super.true_lb, (void*)((intptr_t) &new_value + offset), 1, dt); + ompi_op_reduce (op, (void *) ((ptrdiff_t) origin_addr + dt->super.true_lb), (void*)((ptrdiff_t) &new_value + offset), 1, dt); } ret = ompi_osc_rdma_btl_cswap (module, peer->data_endpoint, address, target_handle, @@ -219,7 +221,7 @@ { ompi_osc_rdma_module_t *module = sync->module; int32_t atomic_flags = module->selected_btl->btl_atomic_flags; - int ret, btl_op, flags; + int btl_op, flags; int64_t origin; if (!(module->selected_btl->btl_flags & MCA_BTL_FLAGS_ATOMIC_OPS)) { @@ -261,7 +263,6 @@ const bool use_amo = module->acc_use_amo; const size_t dt_size = datatype->super.size; void *to_free = NULL; - uint64_t offset = 0; int ret; OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "using network atomics for accumulate operation with count %d", count); @@ -339,7 +340,7 @@ /* if the datatype is small enough (and the count is 1) then try to directly use the hardware to execute * the atomic operation. this should be safe in all cases as either 1) the user has assured us they will * never use atomics with count > 1, 2) we have the accumulate lock, or 3) we have an exclusive lock */ - if (target_datatype->super.size <= 8 && target_count <= module->network_amo_max_count) { + if ((target_datatype->super.size <= 8) && (((unsigned long) target_count) <= module->network_amo_max_count)) { ret = ompi_osc_rdma_gacc_amo (module, sync, source, result, result_count, result_datatype, result_convertor, peer, target_address, target_handle, target_count, target_datatype, op, request); if (OPAL_LIKELY(OMPI_SUCCESS == ret)) { @@ -858,7 +859,7 @@ ompi_osc_rdma_module_t *module = GET_MODULE(win); mca_btl_base_registration_handle_t *target_handle; uint64_t target_address; - ptrdiff_t lb, target_lb, target_span; + ptrdiff_t target_lb, target_span; ompi_osc_rdma_request_t *rdma_request = NULL; bool lock_acquired = false; ompi_osc_rdma_sync_t *sync; diff -Nru openmpi-4.1.2/ompi/mca/osc/rdma/osc_rdma_dynamic.c openmpi-4.1.4/ompi/mca/osc/rdma/osc_rdma_dynamic.c --- openmpi-4.1.2/ompi/mca/osc/rdma/osc_rdma_dynamic.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/rdma/osc_rdma_dynamic.c 2022-05-29 09:51:40.000000000 +0000 @@ -167,7 +167,7 @@ ompi_osc_rdma_handle_t *rdma_region_handle; osc_rdma_counter_t region_count; osc_rdma_counter_t region_id; - intptr_t bound, aligned_base, aligned_bound; + intptr_t aligned_base, aligned_bound; intptr_t page_size = opal_getpagesize (); int region_index, ret; size_t aligned_len; @@ -197,7 +197,6 @@ /* it is wasteful to register less than a page. this may allow the remote side to access more * memory but the MPI standard covers this with calling the calling behavior erroneous */ - bound = (intptr_t) base + len; aligned_bound = OPAL_ALIGN((intptr_t) base + len, page_size, intptr_t); aligned_base = (intptr_t) base & ~(page_size - 1); aligned_len = (size_t)(aligned_bound - aligned_base); @@ -234,7 +233,7 @@ region->len = aligned_len; OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_DEBUG, "attaching dynamic memory region {%p, %p} aligned {%p, %p}, at index %d", - base, (void *) bound, (void *) aligned_base, (void *) aligned_bound, region_index); + base, (void *) ((intptr_t) base + len), (void *) aligned_base, (void *) aligned_bound, region_index); /* add RDMA region handle to track this region */ rdma_region_handle = OBJ_NEW(ompi_osc_rdma_handle_t); diff -Nru openmpi-4.1.2/ompi/mca/osc/sm/Makefile.in openmpi-4.1.4/ompi/mca/osc/sm/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/sm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/sm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1479,6 +1482,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1628,9 +1635,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1691,6 +1695,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1704,6 +1711,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/osc/ucx/Makefile.in openmpi-4.1.4/ompi/mca/osc/ucx/Makefile.in --- openmpi-4.1.2/ompi/mca/osc/ucx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/osc/ucx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/cm/Makefile.in openmpi-4.1.4/ompi/mca/pml/cm/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/cm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/cm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/crcpw/Makefile.in openmpi-4.1.4/ompi/mca/pml/crcpw/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/crcpw/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/crcpw/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1491,6 +1494,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1640,9 +1647,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1703,6 +1707,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1716,6 +1723,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/Makefile.in openmpi-4.1.4/ompi/mca/pml/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/monitoring/Makefile.in openmpi-4.1.4/ompi/mca/pml/monitoring/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/monitoring/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/monitoring/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1489,6 +1492,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1638,9 +1645,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1701,6 +1705,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1714,6 +1721,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/ob1/Makefile.in openmpi-4.1.4/ompi/mca/pml/ob1/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/ob1/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ob1/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -135,6 +135,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -373,6 +374,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -409,6 +411,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1522,6 +1525,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1671,9 +1678,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1734,6 +1738,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1747,6 +1754,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/ob1/pml_ob1_cuda.c openmpi-4.1.4/ompi/mca/pml/ob1/pml_ob1_cuda.c --- openmpi-4.1.2/ompi/mca/pml/ob1/pml_ob1_cuda.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ob1/pml_ob1_cuda.c 2022-05-29 09:51:40.000000000 +0000 @@ -127,7 +127,10 @@ if( NULL != bml_btl->btl->btl_register_mem ) { /* register the memory */ handle = bml_btl->btl->btl_register_mem (bml_btl->btl, bml_btl->btl_endpoint, - base, size, MCA_BTL_REG_FLAG_CUDA_GPU_MEM | + base, size, +#if OPAL_CUDA_GDR_SUPPORT + MCA_BTL_REG_FLAG_CUDA_GPU_MEM | +#endif MCA_BTL_REG_FLAG_REMOTE_READ); } diff -Nru openmpi-4.1.2/ompi/mca/pml/ucx/Makefile.in openmpi-4.1.4/ompi/mca/pml/ucx/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/ucx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ucx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx.c openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx.c --- openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx.c 2022-05-29 09:51:40.000000000 +0000 @@ -705,7 +705,7 @@ OMPI_DATATYPE_RETAIN(datatype); if (MCA_PML_BASE_SEND_BUFFERED == mode) { - req->datatype = NULL; + req->datatype = (ucp_datatype_t)NULL; } else { req->datatype = mca_pml_ucx_get_datatype(datatype); } diff -Nru openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_component.c openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_component.c --- openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -49,7 +49,9 @@ static int mca_pml_ucx_component_register(void) { +#if HAVE_DECL_UCP_OP_ATTR_FLAG_MULTI_SEND int multi_send_op_attr_enable; +#endif ompi_pml_ucx.priority = 51; (void) mca_base_component_var_register(&mca_pml_ucx_component.pmlm_version, "priority", diff -Nru openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_datatype.c openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_datatype.c --- openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_datatype.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_datatype.c 2022-05-29 09:51:40.000000000 +0000 @@ -15,6 +15,7 @@ #include #include +#include #ifdef HAVE_UCP_REQUEST_PARAM_T #define PML_UCX_DATATYPE_SET_VALUE(_datatype, _val) \ @@ -205,11 +206,19 @@ ucp_datatype_t mca_pml_ucx_init_datatype(ompi_datatype_t *datatype) { + static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; size_t size = 0; /* init to suppress compiler warning */ ucp_datatype_t ucp_datatype; ucs_status_t status; int ret; + pthread_mutex_lock(&lock); + + if (datatype->pml_data != PML_UCX_DATATYPE_INVALID) { + /* datatype is already initialized in concurrent thread */ + goto out; + } + if (mca_pml_ucx_datatype_is_contig(datatype)) { ompi_datatype_type_size(datatype, &size); PML_UCX_ASSERT(size > 0); @@ -259,7 +268,10 @@ datatype->pml_data = ucp_datatype; #endif - return ucp_datatype; +out: + pthread_mutex_unlock(&lock); + + return mca_pml_ucx_from_ompi_datatype(datatype); } static void mca_pml_ucx_convertor_construct(mca_pml_ucx_convertor_t *convertor) diff -Nru openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_datatype.h openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_datatype.h --- openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_datatype.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_datatype.h 2022-05-29 09:51:40.000000000 +0000 @@ -44,23 +44,25 @@ __opal_attribute_always_inline__ -static inline ucp_datatype_t mca_pml_ucx_get_datatype(ompi_datatype_t *datatype) +static inline ucp_datatype_t +mca_pml_ucx_from_ompi_datatype(ompi_datatype_t *datatype) { #ifdef HAVE_UCP_REQUEST_PARAM_T - pml_ucx_datatype_t *ucp_type = (pml_ucx_datatype_t*)datatype->pml_data; - - if (OPAL_LIKELY(ucp_type != PML_UCX_DATATYPE_INVALID)) { - return ucp_type->datatype; - } + return ((pml_ucx_datatype_t*)datatype->pml_data)->datatype; #else - ucp_datatype_t ucp_type = datatype->pml_data; + return (ucp_datatype_t)datatype->pml_data; +#endif +} - if (OPAL_LIKELY(ucp_type != PML_UCX_DATATYPE_INVALID)) { - return ucp_type; + +__opal_attribute_always_inline__ +static inline ucp_datatype_t mca_pml_ucx_get_datatype(ompi_datatype_t *datatype) +{ + if (OPAL_UNLIKELY(datatype->pml_data == PML_UCX_DATATYPE_INVALID)) { + return mca_pml_ucx_init_datatype(datatype); } -#endif - return mca_pml_ucx_init_datatype(datatype); + return mca_pml_ucx_from_ompi_datatype(datatype); } #ifdef HAVE_UCP_REQUEST_PARAM_T diff -Nru openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_request.h openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_request.h --- openmpi-4.1.2/ompi/mca/pml/ucx/pml_ucx_request.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/ucx/pml_ucx_request.h 2022-05-29 09:51:40.000000000 +0000 @@ -180,10 +180,9 @@ ucs_status_t ucp_status, const ucp_tag_recv_info_t *info) { - int64_t tag; + int64_t tag = info->sender_tag; if (OPAL_LIKELY(ucp_status == UCS_OK)) { - tag = info->sender_tag; mpi_status->MPI_ERROR = MPI_SUCCESS; mpi_status->MPI_SOURCE = PML_UCX_TAG_GET_SOURCE(tag); mpi_status->MPI_TAG = PML_UCX_TAG_GET_MPI_TAG(tag); diff -Nru openmpi-4.1.2/ompi/mca/pml/v/Makefile.in openmpi-4.1.4/ompi/mca/pml/v/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/v/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/v/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -123,6 +123,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -361,6 +362,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -397,6 +399,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/pml/yalla/Makefile.in openmpi-4.1.4/ompi/mca/pml/yalla/Makefile.in --- openmpi-4.1.2/ompi/mca/pml/yalla/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/pml/yalla/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -123,6 +123,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -361,6 +362,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -397,6 +399,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1489,6 +1492,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1638,9 +1645,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1701,6 +1705,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1714,6 +1721,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/rte/Makefile.in openmpi-4.1.4/ompi/mca/rte/Makefile.in --- openmpi-4.1.2/ompi/mca/rte/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/rte/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1478,6 +1481,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1627,9 +1634,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1690,6 +1694,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1703,6 +1710,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/rte/orte/Makefile.in openmpi-4.1.4/ompi/mca/rte/orte/Makefile.in --- openmpi-4.1.2/ompi/mca/rte/orte/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/rte/orte/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1479,6 +1482,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1628,9 +1635,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1691,6 +1695,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1704,6 +1711,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/rte/pmix/Makefile.in openmpi-4.1.4/ompi/mca/rte/pmix/Makefile.in --- openmpi-4.1.2/ompi/mca/rte/pmix/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/rte/pmix/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1476,6 +1479,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1625,9 +1632,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1688,6 +1692,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1701,6 +1708,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/individual/Makefile.in openmpi-4.1.4/ompi/mca/sharedfp/individual/Makefile.in --- openmpi-4.1.2/ompi/mca/sharedfp/individual/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/individual/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1507,6 +1510,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1656,9 +1663,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1719,6 +1723,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1732,6 +1739,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/lockedfile/Makefile.in openmpi-4.1.4/ompi/mca/sharedfp/lockedfile/Makefile.in --- openmpi-4.1.2/ompi/mca/sharedfp/lockedfile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/lockedfile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1505,6 +1508,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1654,9 +1661,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1717,6 +1721,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1730,6 +1737,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c openmpi-4.1.4/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c --- openmpi-4.1.2/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c 2022-05-29 09:51:40.000000000 +0000 @@ -37,6 +37,11 @@ #include #include +#include "opal/util/fd.h" +#include "opal/util/opal_getcwd.h" +#include "opal/util/path.h" +#include "opal/util/os_path.h" + int mca_sharedfp_lockedfile_file_open (struct ompi_communicator_t *comm, const char* filename, int amode, @@ -110,8 +115,26 @@ return OMPI_ERR_OUT_OF_RESOURCE; } snprintf(lockedfilename, filenamelen, "%s-%u-%d%s",filename,masterjobid,int_pid,".lock"); - module_data->filename = lockedfilename; - + if (opal_path_is_absolute(lockedfilename) ) { + module_data->filename = lockedfilename; + } else { + char path[OPAL_PATH_MAX]; + err = opal_getcwd(path, OPAL_PATH_MAX); + if (OPAL_SUCCESS != err) { + free (sh); + free (module_data); + free (lockedfilename); + return err; + } + module_data->filename = opal_os_path(0, path, lockedfilename, NULL); + if (NULL == module_data->filename){ + free (sh); + free (module_data); + free (lockedfilename); + return OMPI_ERROR; + } + } + /*-------------------------------------------------*/ /*Open the lockedfile without shared file pointer */ /*-------------------------------------------------*/ @@ -125,12 +148,19 @@ opal_output(0, "[%d]mca_sharedfp_lockedfile_file_open: Error during file open\n", fh->f_rank); free (sh); - free(module_data); + free (module_data); free (lockedfilename); return OMPI_ERROR; } - write ( handle, &position, sizeof(OMPI_MPI_OFFSET_TYPE) ); - close ( handle ); + err = opal_fd_write (handle, sizeof(OMPI_MPI_OFFSET_TYPE), &position); + if (OPAL_SUCCESS != err) { + free (sh); + free (module_data); + free (lockedfilename); + close (handle); + return err; + } + close (handle); } err = comm->c_coll->coll_barrier ( comm, comm->c_coll->coll_barrier_module ); if ( OMPI_SUCCESS != err ) { diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_request_position.c openmpi-4.1.4/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_request_position.c --- openmpi-4.1.2/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_request_position.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_request_position.c 2022-05-29 09:51:40.000000000 +0000 @@ -25,6 +25,9 @@ #include "ompi/constants.h" #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/sharedfp/base/base.h" +#include "opal/util/output.h" +#include "opal/util/fd.h" + /*Use fcntl to lock the hidden file which stores the current position*/ #include @@ -76,7 +79,10 @@ /* read from the file */ lseek ( fd, 0, SEEK_SET ); - read ( fd, &buf, sizeof(OMPI_MPI_OFFSET_TYPE)); + ret = opal_fd_read ( fd, sizeof(OMPI_MPI_OFFSET_TYPE), &buf); + if (OPAL_SUCCESS != ret ) { + goto exit; + } if ( mca_sharedfp_lockedfile_verbose ) { opal_output(ompi_sharedfp_base_framework.framework_output, "sharedfp_lockedfile_request_position: Read last_offset=%lld! ret=%d\n",buf, ret); @@ -92,8 +98,11 @@ /* write to the file */ lseek ( fd, 0, SEEK_SET ); - write ( fd, &position, sizeof(OMPI_MPI_OFFSET_TYPE)); - + ret = opal_fd_write (fd, sizeof(OMPI_MPI_OFFSET_TYPE), &position); + /* No need to handle error case here, the subsequent steps are identical + in case of ret != OPAL_SUCCESS, namely release lock and return ret */ + +exit: /* unlock the file */ if ( mca_sharedfp_lockedfile_verbose ) { opal_output(ompi_sharedfp_base_framework.framework_output, @@ -115,7 +124,10 @@ if (fcntl(fd, F_SETLK, &fl) == -1) { opal_output(0,"sharedfp_lockedfile_request_position:failed to release lock for fd: %d\n",fd); opal_output(0,"error(%i): %s", errno, strerror(errno)); - return OMPI_ERROR; + /* Only overwrite error code if it was OPAL_SUCCESS previously */ + if (OPAL_SUCCESS == ret ) { + ret = OMPI_ERROR; + } } else { if ( mca_sharedfp_lockedfile_verbose ) { diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/Makefile.in openmpi-4.1.4/ompi/mca/sharedfp/Makefile.in --- openmpi-4.1.2/ompi/mca/sharedfp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/sm/Makefile.in openmpi-4.1.4/ompi/mca/sharedfp/sm/Makefile.in --- openmpi-4.1.2/ompi/mca/sharedfp/sm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/sm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/sm/sharedfp_sm.c openmpi-4.1.4/ompi/mca/sharedfp/sm/sharedfp_sm.c --- openmpi-4.1.2/ompi/mca/sharedfp/sm/sharedfp_sm.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/sm/sharedfp_sm.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,9 +9,10 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2008-2013 University of Houston. All rights reserved. + * Copyright (c) 2008-2021 University of Houston. All rights reserved. * Copyright (c) 2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. + * Copyright (c) 2021 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,6 +32,8 @@ #include "ompi/mca/sharedfp/base/base.h" #include "ompi/mca/sharedfp/sm/sharedfp_sm.h" +#include "opal/util/basename.h" + /* * ******************************************************************* * ************************ actions structure ************************ @@ -94,6 +97,30 @@ return NULL; } } + + + /* Check that we can actually open the required file */ + char *filename_basename = opal_basename((char*)fh->f_filename); + char *sm_filename; + int comm_cid = -1; + int pid = ompi_comm_rank (comm); + + asprintf(&sm_filename, "%s/%s_cid-%d-%d.sm", ompi_process_info.job_session_dir, + filename_basename, comm_cid, pid); + free(filename_basename); + + int sm_fd = open(sm_filename, O_RDWR | O_CREAT, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + if ( sm_fd == -1){ + /*error opening file*/ + opal_output(0,"mca_sharedfp_sm_component_file_query: Error, unable to open file for mmap: %s\n",sm_filename); + free(sm_filename); + return NULL; + } + close (sm_fd); + unlink(sm_filename); + free (sm_filename); + /* This module can run */ *priority = mca_sharedfp_sm_priority; return &sm; diff -Nru openmpi-4.1.2/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c openmpi-4.1.4/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c --- openmpi-4.1.2/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c 2022-05-29 09:51:40.000000000 +0000 @@ -9,11 +9,11 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2013-2018 University of Houston. All rights reserved. + * Copyright (c) 2013-2021 University of Houston. All rights reserved. * Copyright (c) 2013 Intel, Inc. All rights reserved. * Copyright (c) 2015-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2015-2021 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2016-2017 IBM Corporation. All rights reserved. * $COPYRIGHT$ * @@ -41,6 +41,8 @@ #include "ompi/mca/sharedfp/sharedfp.h" #include "ompi/mca/sharedfp/base/base.h" +#include "opal/util/basename.h" + #include #include #include @@ -57,7 +59,6 @@ struct mca_sharedfp_sm_data * sm_data = NULL; char * filename_basename; char * sm_filename; - int sm_filename_length; struct mca_sharedfp_sm_offset * sm_offset_ptr; struct mca_sharedfp_sm_offset sm_offset; int sm_fd; @@ -101,16 +102,8 @@ ** and then mapping it to memory ** For sharedfp we also want to put the file backed shared memory into the tmp directory */ - filename_basename = basename((char*)filename); + filename_basename = opal_basename((char*)filename); /* format is "%s/%s_cid-%d-%d.sm", see below */ - sm_filename_length = strlen(ompi_process_info.job_session_dir) + 1 + strlen(filename_basename) + 5 + (3*sizeof(uint32_t)+1) + 4; - sm_filename = (char*) malloc( sizeof(char) * sm_filename_length); - if (NULL == sm_filename) { - opal_output(0, "mca_sharedfp_sm_file_open: Error, unable to malloc sm_filename\n"); - free(sm_data); - free(sh); - return OMPI_ERR_OUT_OF_RESOURCE; - } comm_cid = ompi_comm_get_cid(comm); if ( 0 == fh->f_rank ) { @@ -120,13 +113,13 @@ err = comm->c_coll->coll_bcast (&int_pid, 1, MPI_INT, 0, comm, comm->c_coll->coll_bcast_module ); if ( OMPI_SUCCESS != err ) { opal_output(0,"mca_sharedfp_sm_file_open: Error in bcast operation \n"); - free(sm_filename); + free(filename_basename); free(sm_data); free(sh); return err; } - snprintf(sm_filename, sm_filename_length, "%s/%s_cid-%d-%d.sm", ompi_process_info.job_session_dir, + asprintf(&sm_filename, "%s/%s_cid-%d-%d.sm", ompi_process_info.job_session_dir, filename_basename, comm_cid, int_pid); /* open shared memory file, initialize to 0, map into memory */ sm_fd = open(sm_filename, O_RDWR | O_CREAT, @@ -134,6 +127,7 @@ if ( sm_fd == -1){ /*error opening file*/ opal_output(0,"mca_sharedfp_sm_file_open: Error, unable to open file for mmap: %s\n",sm_filename); + free(filename_basename); free(sm_filename); free(sm_data); free(sh); @@ -150,6 +144,7 @@ err = comm->c_coll->coll_barrier (comm, comm->c_coll->coll_barrier_module ); if ( OMPI_SUCCESS != err ) { opal_output(0,"mca_sharedfp_sm_file_open: Error in barrier operation \n"); + free(filename_basename); free(sm_filename); free(sm_data); free(sh); @@ -167,6 +162,7 @@ err = OMPI_ERROR; opal_output(0, "mca_sharedfp_sm_file_open: Error, unable to mmap file: %s\n",sm_filename); opal_output(0, "%s\n", strerror(errno)); + free(filename_basename); free(sm_filename); free(sm_data); free(sh); @@ -185,6 +181,10 @@ sm_data->sem_name = (char*) malloc( sizeof(char) * 253); snprintf(sm_data->sem_name,252,"OMPIO_%s",filename_basename); #endif + // We're now done with filename_basename. Free it here so that we + // don't have to keep freeing it in the error/return cases. + free(filename_basename); + filename_basename = NULL; if( (sm_data->mutex = sem_open(sm_data->sem_name, O_CREAT, 0644, 1)) != SEM_FAILED ) { #elif defined(HAVE_SEM_INIT) diff -Nru openmpi-4.1.2/ompi/mca/topo/basic/Makefile.in openmpi-4.1.4/ompi/mca/topo/basic/Makefile.in --- openmpi-4.1.2/ompi/mca/topo/basic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/basic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1491,6 +1494,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1640,9 +1647,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1703,6 +1707,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1716,6 +1723,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/topo/Makefile.in openmpi-4.1.4/ompi/mca/topo/Makefile.in --- openmpi-4.1.2/ompi/mca/topo/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1512,6 +1515,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1661,9 +1668,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1724,6 +1728,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1737,6 +1744,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/Makefile.in openmpi-4.1.4/ompi/mca/topo/treematch/Makefile.in --- openmpi-4.1.2/ompi/mca/topo/treematch/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -123,6 +123,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -361,6 +362,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -397,6 +399,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1546,6 +1549,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1695,9 +1702,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1758,6 +1762,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1771,6 +1778,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c openmpi-4.1.4/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c --- openmpi-4.1.2/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c 2022-05-29 09:51:40.000000000 +0000 @@ -3,9 +3,9 @@ * Copyright (c) 2011-2017 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. - * Copyright (c) 2011-2016 INRIA. All rights reserved. - * Copyright (c) 2012-2017 Bordeaux Polytechnic Institute - * Copyright (c) 2015-2017 Intel, Inc. All rights reserved. + * 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 * and Technology (RIST). All rights reserved. * Copyright (c) 2016 Los Alamos National Security, LLC. All rights @@ -36,7 +36,7 @@ #include "opal/mca/pmix/pmix.h" -/* #define __DEBUG__ 1 */ +/* #define __DEBUG__ 1 */ /** * This function is a allreduce between all processes to detect for oversubscription. @@ -204,6 +204,7 @@ * and create a duplicate of the original communicator */ free(vpids); free(colors); + free(lindex_to_grank); goto fallback; /* return with success */ } /* compute local roots ranks in comm_old */ @@ -250,6 +251,7 @@ } if( (0 == num_objs_in_node) || (0 == num_pus_in_node) ) { /* deal with bozo cases: COVERITY 1418505 */ free(colors); + free(lindex_to_grank); goto fallback; /* return with success */ } /* Check for oversubscribing */ @@ -288,6 +290,7 @@ object = hwloc_get_obj_by_depth(opal_hwloc_topology, effective_depth, obj_rank); if( NULL == object) { free(colors); + free(lindex_to_grank); hwloc_bitmap_free(set); goto fallback; /* return with success */ } @@ -315,12 +318,13 @@ OPAL_OUTPUT_VERBOSE((10, ompi_topo_base_framework.framework_output, "Oversubscribing PUs resources => Rank Reordering Impossible \n")); free(colors); + free(lindex_to_grank); hwloc_bitmap_free(set); goto fallback; /* return with success */ } reqs = (MPI_Request *)calloc(num_procs_in_node-1, sizeof(MPI_Request)); - if( rank == lindex_to_grank[0] ) { /* local leader clean the hierarchy */ + if( rank == lindex_to_grank[0] ) { /* local leader cleans the hierarchy */ int array_size = effective_depth + 1; int *myhierarchy = (int *)calloc(array_size, sizeof(int)); @@ -378,7 +382,6 @@ /* Centralized Reordering */ if (0 == mca_topo_treematch_component.reorder_mode) { - int *k = NULL; int *obj_mapping = NULL; int num_objs_total = 0; @@ -449,7 +452,9 @@ for(i = 0; i < num_nodes; i++) num_objs_total += objs_per_node[i]; - obj_mapping = (int *)calloc(num_objs_total,sizeof(int)); + obj_mapping = (int *)malloc(num_objs_total*sizeof(int)); + for(i = 0; i < num_objs_total; i++) + obj_mapping[i] = -1; memcpy(obj_mapping, obj_to_rank_in_comm, objs_per_node[0]*sizeof(int)); displ = objs_per_node[0]; @@ -508,8 +513,8 @@ for(i = 0 ; i < hierarchies[0]; i++) hierarchies[i+1] = tracker[i]->arity; - for(; i < (TM_MAX_LEVELS+1); i++) /* fill up everything else with -1 */ - hierarchies[i] = -1; + for(; i < (TM_MAX_LEVELS+1); i++) /* fill up everything else with 0 */ + hierarchies[i] = 0; /* gather hierarchies iff more than 1 node! */ if ( num_nodes > 1 ) { @@ -592,32 +597,24 @@ for(i = 1 ; i < tm_topology->nb_levels; i++) tm_topology->nb_nodes[i] = tm_topology->nb_nodes[i-1] * tm_topology->arity[i-1]; +#ifdef __DEBUG__ + assert(num_objs_total == (int)tm_topology->nb_nodes[tm_topology->nb_levels-1]); +#endif /* Build process id tab */ - tm_topology->node_id = (int **)calloc(tm_topology->nb_levels, sizeof(int*)); - tm_topology->node_rank = (int **)malloc(sizeof(int *) * tm_topology->nb_levels); - for(i = 0; i < tm_topology->nb_levels; i++) { - tm_topology->node_id[i] = (int *)calloc(tm_topology->nb_nodes[i], sizeof(int)); - tm_topology->node_rank[i] = (int * )calloc(tm_topology->nb_nodes[i], sizeof(int)); - /*note : we make the hypothesis that logical indexes in hwloc range from - 0 to N, are contiguous and crescent. */ - - for( j = 0 ; j < (int)tm_topology->nb_nodes[i] ; j++ ) { - tm_topology->node_id[i][j] = j; - tm_topology->node_rank[i][j] = j; - - /* Should use object->logical_index */ - /* obj = hwloc_get_obj_by_depth(topo,i,j%num_objs_in_node); - id = obj->logical_index + (num_objs_in_node)*(j/num_obj_in_node)*/ - /* - int id = core_numbering[j%nb_core_per_nodes] + (nb_core_per_nodes)*(j/nb_core_per_nodes); - topology->node_id[i][j] = id; - topology->node_rank[i][id] = j; - */ - } + tm_topology->node_id = (int *)malloc(num_objs_total*sizeof(int)); + tm_topology->node_rank = (int *)malloc(num_objs_total*sizeof(int)); + for( i = 0 ; i < num_objs_total ; i++ ) + tm_topology->node_id[i] = tm_topology->node_rank[i] = -1; + /*note : we make the hypothesis that logical indexes in hwloc range from + 0 to N, are contiguous and crescent. */ + for( i = 0 ; i < num_objs_total ; i++ ) { + tm_topology->node_id[i] = obj_mapping[i]; /* use process ranks instead of core numbers */ + if (obj_mapping[i] != -1) /* so that k[i] is the new rank of process i */ + tm_topology->node_rank[obj_mapping[i]] = i; /* after computation by TreeMatch */ } + /* unused for now*/ tm_topology->cost = (double*)calloc(tm_topology->nb_levels,sizeof(double)); - tm_topology->nb_proc_units = num_objs_total; tm_topology->nb_constraints = 0; @@ -627,22 +624,23 @@ tm_topology->constraints = (int *)calloc(tm_topology->nb_constraints,sizeof(int)); for(idx = 0, i = 0; i < tm_topology->nb_proc_units ; i++) if (obj_mapping[i] != -1) - tm_topology->constraints[idx++] = obj_mapping[i]; - + tm_topology->constraints[idx++] = obj_mapping[i]; /* use process ranks instead of core numbers */ +#ifdef __DEBUG__ + assert(idx == tm_topology->nb_constraints); +#endif tm_topology->oversub_fact = 1; #ifdef __DEBUG__ - assert(num_objs_total == (int)tm_topology->nb_nodes[tm_topology->nb_levels-1]); - + /* for(i = 0; i < tm_topology->nb_levels ; i++) { opal_output_verbose(10, ompi_topo_base_framework.framework_output, "tm topo node_id for level [%i] : ",i); dump_int_array(10, ompi_topo_base_framework.framework_output, "", "", obj_mapping, tm_topology->nb_nodes[i]); } + */ tm_display_topology(tm_topology); #endif - comm_pattern = (double **)malloc(size*sizeof(double *)); for(i = 0 ; i < size ; i++) comm_pattern[i] = local_pattern + i * size; @@ -660,7 +658,7 @@ "", "", comm_pattern[i], size); } #endif - tm_optimize_topology(&tm_topology); + //tm_optimize_topology(&tm_topology); aff_mat = tm_build_affinity_mat(comm_pattern,size); comm_tree = tm_build_tree_from_topology(tm_topology,aff_mat, NULL, NULL); sol = tm_compute_mapping(tm_topology, comm_tree); @@ -668,7 +666,6 @@ k = (int *)calloc(sol->k_length, sizeof(int)); for(idx = 0 ; idx < (int)sol->k_length ; idx++) k[idx] = sol->k[idx][0]; - #ifdef __DEBUG__ opal_output_verbose(10, ompi_topo_base_framework.framework_output, "====> nb levels : %i\n",tm_topology->nb_levels); @@ -690,16 +687,19 @@ /* Todo : Bcast + group creation */ /* scatter the ranks */ + /* don't need to convert k from local rank to global rank */ if (OMPI_SUCCESS != (err = comm_old->c_coll->coll_scatter(k, 1, MPI_INT, &newrank, 1, MPI_INT, 0, comm_old, comm_old->c_coll->coll_scatter_module))) { - if (NULL != k) free(k); + if (NULL != k) { free(k); k = NULL; } goto release_and_return; } - if ( 0 == rank ) + if ( 0 == rank ) { free(k); + k = NULL; + } /* this needs to be optimized but will do for now */ if (OMPI_SUCCESS != (err = ompi_comm_split(comm_old, 0, newrank, newcomm, false))) { @@ -770,6 +770,7 @@ tm_solution_t *sol = NULL; tm_affinity_mat_t *aff_mat = NULL; double **comm_pattern = NULL; + int *obj_to_rank_in_lcomm = NULL; comm_pattern = (double **)malloc(num_procs_in_node*sizeof(double *)); for( i = 0; i < num_procs_in_node; i++ ) { @@ -800,35 +801,57 @@ tm_topology->nb_levels = numlevels; tm_topology->arity = (int *)calloc(tm_topology->nb_levels, sizeof(int)); tm_topology->nb_nodes = (size_t *)calloc(tm_topology->nb_levels, sizeof(size_t)); - tm_topology->node_id = (int **)malloc(tm_topology->nb_levels*sizeof(int *)); - tm_topology->node_rank = (int **)malloc(tm_topology->nb_levels*sizeof(int *)); - + for(i = 0 ; i < tm_topology->nb_levels ; i++){ int nb_objs = hwloc_get_nbobjs_by_depth(opal_hwloc_topology, tracker[i]->depth); tm_topology->nb_nodes[i] = nb_objs; tm_topology->arity[i] = tracker[i]->arity; - tm_topology->node_id[i] = (int *)calloc(tm_topology->nb_nodes[i], sizeof(int)); - tm_topology->node_rank[i] = (int * )calloc(tm_topology->nb_nodes[i], sizeof(int)); - for(j = 0; j < (int)tm_topology->nb_nodes[i] ; j++){ - tm_topology->node_id[i][j] = j; - tm_topology->node_rank[i][j] = j; - } } + +#ifdef __DEBUG__ + assert(num_objs_in_node == (int)tm_topology->nb_nodes[tm_topology->nb_levels-1]); +#endif + /* create a table that derives the rank in local (node) comm from the object number */ + obj_to_rank_in_lcomm = (int *)malloc(num_objs_in_node*sizeof(int)); + for(i = 0 ; i < num_objs_in_node ; i++) { + obj_to_rank_in_lcomm[i] = -1; + object = hwloc_get_obj_by_depth(opal_hwloc_topology, effective_depth, i); + for( j = 0; j < num_procs_in_node ; j++ ) + if(localrank_to_objnum[j] == (int)(object->logical_index)) { + obj_to_rank_in_lcomm[i] = j; + break; + } + } + + /* Build process id tab */ + tm_topology->node_id = (int *)malloc(num_objs_in_node*sizeof(int)); + tm_topology->node_rank = (int *)malloc(num_objs_in_node*sizeof(int)); + for(i = 1 ; i < num_objs_in_node; i++) + tm_topology->node_id[i] = tm_topology->node_rank[i] = -1; + + for( i = 0 ; i < num_objs_in_node ; i++ ) { + /*note : we make the hypothesis that logical indexes in hwloc range from + 0 to N, are contiguous and crescent. */ + tm_topology->node_id[i] = obj_to_rank_in_lcomm[i]; + if( obj_to_rank_in_lcomm[i] != -1) + tm_topology->node_rank[obj_to_rank_in_lcomm[i]] = i; + } + /* unused for now*/ tm_topology->cost = (double*)calloc(tm_topology->nb_levels,sizeof(double)); tm_topology->nb_proc_units = num_objs_in_node; - //tm_topology->nb_proc_units = num_procs_in_node; tm_topology->nb_constraints = 0; - for(i = 0; i < num_procs_in_node ; i++) - if (localrank_to_objnum[i] != -1) + + for(i = 0; i < num_objs_in_node ; i++) + if (obj_to_rank_in_lcomm[i] != -1) tm_topology->nb_constraints++; - + tm_topology->constraints = (int *)calloc(tm_topology->nb_constraints,sizeof(int)); - for(idx = 0,i = 0; i < num_procs_in_node ; i++) - if (localrank_to_objnum[i] != -1) - tm_topology->constraints[idx++] = localrank_to_objnum[i]; + for(idx = 0,i = 0; i < num_objs_in_node ; i++) + if (obj_to_rank_in_lcomm[i] != -1) + tm_topology->constraints[idx++] = obj_to_rank_in_lcomm[i]; tm_topology->oversub_fact = 1; @@ -841,12 +864,12 @@ OPAL_OUTPUT_VERBOSE((10, ompi_topo_base_framework.framework_output, "Nb objs for level %i : %lu | arity %i\n ", i, tm_topology->nb_nodes[i],tm_topology->arity[i])); - dump_int_array(10, ompi_topo_base_framework.framework_output, - "", "Obj id ", tm_topology->node_id[i], tm_topology->nb_nodes[i]); } + dump_int_array(10, ompi_topo_base_framework.framework_output, + "", "Obj id ", tm_topology->node_id, tm_topology->nb_nodes[tm_topology->nb_levels-1]); tm_display_topology(tm_topology); #endif - tm_optimize_topology(&tm_topology); + //tm_optimize_topology(&tm_topology); aff_mat = tm_build_affinity_mat(comm_pattern,num_procs_in_node); comm_tree = tm_build_tree_from_topology(tm_topology,aff_mat, NULL, NULL); sol = tm_compute_mapping(tm_topology, comm_tree); @@ -866,7 +889,7 @@ dump_int_array(10, ompi_topo_base_framework.framework_output, "Matching : ", "", sol->sigma, sol->sigma_length); #endif - + free(obj_to_rank_in_lcomm); free(aff_mat->sum_row); free(aff_mat); free(comm_pattern); @@ -874,14 +897,14 @@ tm_free_tree(comm_tree); tm_free_topology(tm_topology); } - + /* Todo : Bcast + group creation */ /* scatter the ranks */ if (OMPI_SUCCESS != (err = localcomm->c_coll->coll_scatter(k, 1, MPI_INT, &newrank, 1, MPI_INT, 0, localcomm, localcomm->c_coll->coll_scatter_module))) { - if (NULL != k) free(k); + if (NULL != k) { free(k); k = NULL; }; ompi_comm_free(&localcomm); free(lrank_to_grank); free(grank_to_lrank); @@ -910,8 +933,10 @@ newrank += offset; free(marked); - if (rank == lindex_to_grank[0]) + if (rank == lindex_to_grank[0]) { free(k); + k = NULL; + } /* this needs to be optimized but will do for now */ if (OMPI_SUCCESS != (err = ompi_comm_split(comm_old, 0, newrank, newcomm, false))) { diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/fibo.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/fibo.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/fibo.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/fibo.h 2022-05-29 09:51:40.000000000 +0000 @@ -101,13 +101,13 @@ the algorithms have been de-recursived and written as macros. */ -#define fiboTreeLinkAfter(o,n) do { \ - FiboNode * nextptr; \ - nextptr = (o)->linkdat.nextptr; \ - (n)->linkdat.nextptr = nextptr; \ - (n)->linkdat.prevptr = (o); \ - nextptr->linkdat.prevptr = (n); \ - (o)->linkdat.nextptr = (n); \ +#define fiboTreeLinkAfter(o,n) do { \ + FiboNode * nextptr_loc; \ + nextptr_loc = (o)->linkdat.nextptr; \ + (n)->linkdat.nextptr = nextptr_loc; \ + (n)->linkdat.prevptr = (o); \ + nextptr_loc->linkdat.prevptr = (n); \ + (o)->linkdat.nextptr = (n); \ } while (0) #define fiboTreeUnlink(n) do { \ diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/PriorityQueue.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/PriorityQueue.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/PriorityQueue.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/PriorityQueue.c 2022-05-29 09:51:40.000000000 +0000 @@ -4,6 +4,10 @@ /* This comparison function is used to sort elements in key descending order. */ +int compfunc(const FiboNode * const, const FiboNode * const); + + + static int compFunc(const FiboNode * const node1, const FiboNode * const node2) { return diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_bucket.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_bucket.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_bucket.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_bucket.c 2022-05-29 09:51:40.000000000 +0000 @@ -31,7 +31,7 @@ static int verbose_level = ERROR; -static bucket_list_t global_bl; +static bucket_list_t global_bl = {0}; int tab_cmp(const void*,const void*); int old_bucket_id(int,int,bucket_list_t); @@ -199,7 +199,7 @@ /* display_bucket(bucket);*/ if(verbose_level >= DEBUG){ printf("Extending bucket %d (%p) from size %d to size %d!\n", - id, (void*)bucket->bucket, bucket->nb_elem, bucket->nb_elem+size); + id,(void*)bucket->bucket, bucket->nb_elem, bucket->nb_elem+size); } bucket->bucket = (coord*)REALLOC(bucket->bucket,sizeof(coord)*(size + bucket->bucket_len)); @@ -648,6 +648,7 @@ wait_work_completion(works[id]); val+=tab_val[id]; FREE(works[id]->args); + destroy_work(works[id]); } diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_kpartitioning.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_kpartitioning.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_kpartitioning.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_kpartitioning.c 2022-05-29 09:51:40.000000000 +0000 @@ -6,6 +6,11 @@ #include #include "config.h" +#if defined(HAVE_LIBSCOTCH) +#include +#endif /* defined(HAVE_LIBSCOTCH) */ + + #define USE_KL_KPART 0 #define KL_KPART_GREEDY_TRIALS 0 @@ -33,6 +38,253 @@ void kpartition_build_level_topology(tm_tree_t *,com_mat_t *,int,int,tm_topology_t *, int *,int *,int,double *,double *); +static int greedy_flag = 0; + +void tm_set_greedy_flag(int new_val){ + greedy_flag = new_val; +} + +int tm_get_greedy_flag(){ + return greedy_flag; +} + + +#if defined(HAVE_LIBSCOTCH) + +SCOTCH_Graph* com_mat_to_scotch_graph(com_mat_t *com_mat, int n){ + double **mat = com_mat->comm; + SCOTCH_Num vertnbr = n; // number of vertices + SCOTCH_Num edgenbr = vertnbr*vertnbr; // number of edges + /* adjacency list */ + SCOTCH_Num *verttab = (SCOTCH_Num *)malloc(sizeof(SCOTCH_Num) * (vertnbr+1)); + /* loads of vertices */ + /* SCOTCH_Num *velotab = (SCOTCH_Num *)malloc(sizeof(SCOTCH_Num) * vertnbr); */ + /* id of the neighbors */ + SCOTCH_Num *edgetab = (SCOTCH_Num *)malloc(sizeof(SCOTCH_Num) * edgenbr); + /* number of bytes exchanged */ + SCOTCH_Num *edlotab = (SCOTCH_Num *)malloc(sizeof(SCOTCH_Num) * edgenbr); + SCOTCH_Graph *graphptr = SCOTCH_graphAlloc(); + + int edgeNum = 0; + int i,j; + + /* Building with the communication matrix */ + for(i = 0; i < com_mat->n ; i++) { + verttab[i] = edgeNum; + for(j = 0; j < i; j++) { + if(mat[i][j]){ + edgetab[edgeNum] = j; + edlotab[edgeNum] = (SCOTCH_Num)mat[i][j]; + edgeNum++; + } + } + /* ensure i!=j. Hence, avoid to test it...*/ + for(j = i+1 ; j < com_mat->n ; j++) { + if(mat[i][j]){ + edgetab[edgeNum] = j; + edlotab[edgeNum] = (SCOTCH_Num)mat[i][j]; + edgeNum++; + } + } + } + + + /* for(i = baseval; i < com_mat->n ; i++) { */ + /* verttab[i] = edgeNum; */ + /* /\* velotab[i] = (SCOTCH_Num) ceil(ogr->vertices[i].getVertexLoad() * ratio); *\/ */ + /* for(j = baseval; j < com_mat->n ; j++) { */ + /* if((mat[i][j] || mat[j][i]) && (i!=j)){ */ + /* edgetab[edgeNum] = j; */ + /* edlotab[edgeNum] = (SCOTCH_Num) ((mat[i][j] + mat[j][i])/2); */ + /* edgeNum++; */ + /* } */ + /* } */ + /* } */ + + /* adding the dumb vertices: they have no neighbor*/ + for(i = com_mat->n ; i=DEBUG){ + printf("Graph converted to Scotch format: edgeNum=%d, edgenbr = %lld, vertnbr = %lld\n",edgeNum, (long long int)edgenbr, (long long int)vertnbr); + } + + assert(edgeNum <= edgenbr); + edgenbr = edgeNum; + + SCOTCH_graphInit(graphptr); + SCOTCH_graphBuild(graphptr, 0, vertnbr, verttab, verttab+1, NULL, NULL, edgenbr, edgetab, edlotab); + + return graphptr; +} + + + +int check_partition(SCOTCH_Num *parttab, int k, int n){ + int *count = CALLOC(sizeof(int), k); + int i; + for(i=0; i=INFO) + fprintf(stdout, "Error in partition: %d vertices in partition %d while expecting %d vertices\n",count[i], i, target); + FREE(count); + return 0; + } + } + + FREE(count); + return 1; +} + + +/* n is the number of element in teh graoh with dumlb_vertices + comm_mat->n is the nulber of processes (i.e. the size of teh graph without dumb veritcies*/ +int *kpartition_scotch(int k, com_mat_t *com_mat, int n, int *constraints, int nb_constraints){ + SCOTCH_Num partnbr = (SCOTCH_Num) k; + SCOTCH_Graph* graphptr; + SCOTCH_Strat strat; + SCOTCH_Num straval; + SCOTCH_Num *parttab = (SCOTCH_Num *)MALLOC(sizeof(SCOTCH_Num) * n); + int *partition = (int *)MALLOC(sizeof(int) * n); + int i, j; + int *nb_dumb = (int *)MALLOC(sizeof(int) * k); /*number of dumb vertices per partition */ + int dumb_id, min_nb_dumb = n, sum_dumb = 0, p; + /* if(SCOTCH_graphCheck(graphptr) == 1){ */ + /* fprintf(stderr,"Bad scotch graph! Exiting program...\n"); */ + /* exit(-1); */ + /* } */ + + /* printf("Correct scotch graph (%d, %d)!\n", SCOTCH_numSizeof(), sizeof(SCOTCH_Num)); */ + + for(i=0;i= max_val) + break; + end++; + } + /* now end - start is the number of constraints for the ith subtree + hence the number of dumb vertices in partition i is the differences between the + number of leaves of the subtree (n/k) and the number of constraints + */ + nb_dumb[i] = n/k - (end-start); + sum_dumb += nb_dumb[i]; + if(nb_dumb[i] < min_nb_dumb){ + min_nb_dumb = nb_dumb[i]; + } + start=end; + } + + /* Imagine we have n=12, k=3, nb_dumb[0] = 3, nb_dumb[1] = 2, nb_dumb[2] = 3, hence min_nb_dumb = 2 and sum_dumb = 8 + So, we have 8 fix vertices and 12-8 = 4 free vertices + We want scotch to allocate the 6 free vertices such that the whole partition is balanced (4 vertex in each) : + 1 in parttion 0, 2 in partition 1 and 1 in partition 2. + To do so we can fill partab as follows: + {-1, -1, -1, -1, 0, 0, 0, 1, 1, 2, 2, 2} and call scotch with a n=12 vertices graph with SCOTCH_STRATBALANCE + dumb_id = n - sum_dumb; + for(i = 0;i4) + straval = SCOTCH_STRATSPEED; + SCOTCH_stratGraphMapBuild (&strat, straval, partnbr, 0); + + + if(tm_get_verbose_level()>=DEBUG){ + printf("Before Scotch (p=%d, n=%d): \n", p, n); + for(i = 0 ; i < n; i++){ + printf("%d ",(int)parttab[i]); + } + printf("\n"); + } + + if(SCOTCH_graphPartFixed(graphptr, partnbr, &strat, parttab) == 0){ + if(tm_get_verbose_level()>=DEBUG){ + printf("After Scotch: \n"); + for(i = 0 ; i < n; i++){ + printf("%d ",(int)parttab[i]); + } + printf("\n"); + } + }else{ + if(tm_get_verbose_level()>=CRITICAL){ + fprintf(stderr,"Scotch Partitionning failed\n"); + } + exit(-1); + } + + if(!check_partition(parttab, partnbr, n)){ + if(tm_get_verbose_level()>=INFO){ + printf("falling from Scotch to greedy partionning\n"); + } + FREE(partition); + partition = kpartition_greedy(k, com_mat, n, constraints, nb_constraints); + }else{ + for(i=0;i= DEBUG) + printf("Using Scotch\n"); + res = kpartition_scotch(k, com_mat, n, constraints, nb_constraints); + }else{ + if(verbose_level >= DEBUG) + printf("Using greedy partitionning\n"); + res = kpartition_greedy(k, com_mat, n, constraints, nb_constraints); + } +#else /* defined(HAVE_LIBSCOTCH) */ + if(verbose_level >= DEBUG) + printf("Using greedy partitionning\n"); res = kpartition_greedy(k, com_mat, n, constraints, nb_constraints); -#endif +#endif /* defined(HAVE_LIBSCOTCH) */ return res; } @@ -242,7 +503,7 @@ const_tab = (constraint_t *)CALLOC(k,sizeof(constraint_t)); /* nb_leaves is the number of leaves of the current subtree - this will help to detremine where to split constraints and how to shift values + this will help to determine where to split constraints and how to shift values */ nb_leaves = compute_nb_leaves_from_level( depth + 1, topology ); @@ -251,8 +512,6 @@ */ start = 0; - - for( i = 0; i < k; i++ ){ /*returns the indice in constraints that contains the smallest value not copied end is used to compute the number of copied elements (end-size) and is used as the next staring indices*/ @@ -294,7 +553,7 @@ printf("Partition: "); print_1D_tab(partition,n); display_tab(com_mat->comm,com_mat->n); printf("m=%d,n=%d,k=%d\n",m,n,k); - printf("perm=%p\n", (void*)perm); + printf("perm=%p\n", (void *)perm); } perm = (int*)MALLOC(sizeof(int)*m); @@ -438,6 +697,26 @@ } #endif +static void print_tab(int n){ + for(;n;n--) + fprintf(stdout,"\t"); +} + +static void display_partition(int *partition, int *local_vertices, int n, int depth, int k){ + int cur_part, j; + print_tab(depth);fprintf(stdout,"Partitions at depth=%d\n",depth); + for( cur_part = 0; cur_part < k ; cur_part ++){ + print_tab(depth); fprintf(stdout,"%d :",cur_part); + for( j = 0; j < n; j ++){ + if ( partition[j] == cur_part ){ + if(local_vertices[j]!=-1) + fprintf(stdout,"%d ",local_vertices[j]); + } + } + fprintf(stdout,"\n"); + } +} + void kpartition_build_level_topology(tm_tree_t *cur_node, com_mat_t *com_mat, int N, int depth, tm_topology_t *topology, int *local_vertices, int *constraints, int nb_constraints, @@ -471,6 +750,10 @@ /* partition the com_matrix in k partitions*/ partition = kpartition(k, com_mat, N, constraints, nb_constraints); + if(verbose_level>=INFO) + display_partition(partition, local_vertices, N, depth, k); + + /* exit(-1); */ /* split the communication matrix in k parts according to the partition just found above */ tab_com_mat = split_com_mat( com_mat, N, k, partition); @@ -558,7 +841,7 @@ the value of this array will be used to number the leaves of the tm_tree_t tree that start at "root" - min(N,nb_contraints) is used to takle the case where thre is less processes than constraints + min(N,nb_contraints) is used to tackle the case where there is less processes than constraints */ diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_kpartitioning.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_kpartitioning.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_kpartitioning.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_kpartitioning.h 2022-05-29 09:51:40.000000000 +0000 @@ -1,11 +1,9 @@ typedef struct _com_mat_t{ - double **comm; + double **comm; int n; /*comm is of size n by n the other element are zeroes*/ - + } com_mat_t; int *kpartition(int, com_mat_t*, int, int *, int); tm_tree_t * kpartition_build_tree_from_topology(tm_topology_t *topology,double **com_mat,int N, int *constraints, int nb_constraints, double *obj_weight, double *com_speed); - -#define HAVE_LIBSCOTCH 0 // missing configure setup? diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_malloc.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_malloc.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_malloc.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_malloc.c 2022-05-29 09:51:40.000000000 +0000 @@ -55,7 +55,7 @@ elem -> line = line; elem -> file = my_strdup(file); if(tm_get_verbose_level() >= DEBUG) - printf("Storing (%p,%ld)\n",ptr,size); + printf("Storing (%p,%ld)\n", (void *)ptr,size); HASH_ADD_PTR( size_hash, key, elem ); } @@ -66,14 +66,14 @@ HASH_FIND_PTR(size_hash, &someaddr, elem); if(!elem){ if(tm_get_verbose_level() >= CRITICAL) - fprintf(stderr,"Cannot find ptr %p to free!\n",someaddr); + fprintf(stderr,"Cannot find ptr %p to free!\n", (void *)someaddr); abort(); return 0; } res = elem->size; if(tm_get_verbose_level()>=DEBUG) - printf("Retreiving (%p,%ld)\n",someaddr, res); + printf("Retreiving (%p,%ld)\n",(void *)someaddr, res); free(elem->file); HASH_DEL( size_hash, elem); @@ -86,7 +86,7 @@ int nb_errors = 0; for(s=size_hash; s != NULL; s=s->hh.next) { if(tm_get_verbose_level()>=ERROR) - printf("pointer %p of size %ld (%s: %d) has not been freed!\n", s->key, s->size, s->file, s->line); + printf("pointer %p of size %ld (%s: %d) has not been freed!\n", (void *)s->key + EXTRA_BYTE, s->size, s->file, s->line); nb_errors ++; } @@ -119,7 +119,7 @@ ptr = malloc(size); if(tm_get_verbose_level()>=DEBUG) - printf("tm_malloc of size %ld: %p (%s: %d)\n",size-2*EXTRA_BYTE,(void*)ptr,file,line); + printf("tm_malloc of size %ld: %p (%s: %d)\n",size-2*EXTRA_BYTE, (void *)ptr,file,line); save_ptr(ptr, size, file, line); @@ -128,7 +128,7 @@ if(tm_get_verbose_level()>=DEBUG) - printf("tm_malloc returning: %p\n",(void*)(ptr+EXTRA_BYTE)); + printf("tm_malloc returning: %p\n",(void *)(ptr+EXTRA_BYTE)); return (void *)(ptr + EXTRA_BYTE); } @@ -147,14 +147,14 @@ save_ptr(ptr, full_size, file, line); if(tm_get_verbose_level()>=DEBUG) - printf("tm_calloc of size %ld: %p (%s: %d)\n",full_size-2*EXTRA_BYTE,(void*)ptr, file, line); + printf("tm_calloc of size %ld: %p (%s: %d)\n",full_size-2*EXTRA_BYTE,(void *)ptr, file, line); memcpy(ptr, extra_data, EXTRA_BYTE); memcpy(ptr + full_size - EXTRA_BYTE, extra_data, EXTRA_BYTE); if(tm_get_verbose_level()>=DEBUG) - printf("tm_calloc returning: %p\n", (void*)(ptr+EXTRA_BYTE)); + printf("tm_calloc returning: %p\n",(void *)(ptr+EXTRA_BYTE)); return (void *)(ptr+EXTRA_BYTE); } @@ -172,7 +172,7 @@ save_ptr(ptr, full_size, file, line); if(tm_get_verbose_level()>=DEBUG) - printf("tm_realloc of size %ld: %p (%s: %d)\n",full_size-2*EXTRA_BYTE, (void*)ptr, file, line); + printf("tm_realloc of size %ld: %p (%s: %d)\n",full_size-2*EXTRA_BYTE, (void *)ptr, file, line); memcpy(ptr, extra_data, EXTRA_BYTE); @@ -185,17 +185,17 @@ memcpy(ptr + EXTRA_BYTE, old_ptr, MIN(old_ptr_size - 2 * EXTRA_BYTE, size)); if((bcmp(original_ptr ,extra_data, EXTRA_BYTE)) && ((tm_get_verbose_level()>=ERROR))){ - fprintf(stderr,"Realloc: cannot find special string ***before*** %p!\n", (void*)original_ptr); + fprintf(stderr,"Realloc: cannot find special string ***before*** %p!\n", (void *)original_ptr); fprintf(stderr,"memory is probably corrupted here!\n"); } if((bcmp(original_ptr + old_ptr_size -EXTRA_BYTE ,extra_data, EXTRA_BYTE)) && ((tm_get_verbose_level()>=ERROR))){ - fprintf(stderr,"Realloc: cannot find special string ***after*** %p!\n", (void*)original_ptr); + fprintf(stderr,"Realloc: cannot find special string ***after*** %p!\n", (void *)original_ptr); fprintf(stderr,"memory is probably corrupted here!\n"); } if(tm_get_verbose_level()>=DEBUG) - printf("tm_free freeing: %p\n", (void*)original_ptr); + printf("tm_free freeing: %p\n",(void *)original_ptr); free(original_ptr); @@ -203,33 +203,34 @@ if(tm_get_verbose_level()>=DEBUG) - printf("tm_realloc returning: %p (----- %p)\n",(void*)(ptr+EXTRA_BYTE),(void*)(((byte *)ptr) - EXTRA_BYTE)); + printf("tm_realloc returning: %p (----- %p)\n", (void *)(ptr+EXTRA_BYTE), (void *)(ptr - EXTRA_BYTE)); return (void *)(ptr+EXTRA_BYTE); } void tm_free(void *ptr){ - byte *original_ptr = ((byte *)ptr) - EXTRA_BYTE; + byte *original_ptr; size_t size; if(!ptr) return; + original_ptr = ((byte *)ptr) - EXTRA_BYTE; size = retreive_size(original_ptr); if((bcmp(original_ptr ,extra_data, EXTRA_BYTE)) && ((tm_get_verbose_level()>=ERROR))){ - fprintf(stderr,"Free: cannot find special string ***before*** %p!\n", (void*)original_ptr); + fprintf(stderr,"Free: cannot find special string ***before*** %p!\n", (void *)original_ptr); fprintf(stderr,"memory is probably corrupted here!\n"); } if((bcmp(original_ptr + size -EXTRA_BYTE ,extra_data, EXTRA_BYTE)) && ((tm_get_verbose_level()>=ERROR))){ - fprintf(stderr,"Free: cannot find special string ***after*** %p!\n", (void*)original_ptr); + fprintf(stderr,"Free: cannot find special string ***after*** %p!\n", (void *)original_ptr); fprintf(stderr,"memory is probably corrupted here!\n"); } if(tm_get_verbose_level()>=DEBUG) - printf("tm_free freeing: %p\n", (void*)original_ptr); + printf("tm_free freeing: %p\n", (void *)original_ptr); free(original_ptr); diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_mapping.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_mapping.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_mapping.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_mapping.c 2022-05-29 09:51:40.000000000 +0000 @@ -1,3 +1,7 @@ +#include +#include +#include +#include #include #include #include @@ -18,6 +22,15 @@ #include #endif +#if defined(HAVE_LIBSCOTCH) +#include +#endif /* defined(HAVE_LIBSCOTCH) */ + +#include + + +#define MIN(a,b) (a)<(b)?(a):(b) + #define TEST_ERROR(n) do{ \ if( (n) != 0 ){ \ fprintf(stderr,"Error %d Line %d\n",n,__LINE__); \ @@ -34,6 +47,23 @@ } hash2_t; +tm_affinity_mat_t * new_affinity_mat(double **mat, double *sum_row, int order, long int nnz); +int compute_nb_leaves_from_level(int depth,tm_topology_t *topology); +void depth_first(tm_tree_t *comm_tree, int *proc_list,int *i); +int fill_tab(int **new_tab,int *tab, int n, int start, int max_val, int shift); +long int init_mat(char *filename,int N, double **mat, double *sum_row); +void map_topology(tm_topology_t *topology,tm_tree_t *comm_tree, int level, + int *sigma, int nb_processes, int **k, int nb_compute_units); +int nb_leaves(tm_tree_t *comm_tree); +int nb_lines(char *filename); +void print_1D_tab(int *tab,int N); +tm_solution_t * tm_compute_mapping(tm_topology_t *topology,tm_tree_t *comm_tree); +void tm_free_affinity_mat(tm_affinity_mat_t *aff_mat); +tm_affinity_mat_t *tm_load_aff_mat(char *filename); +void update_comm_speed(double **comm_speed,int old_size,int new_size); +tm_affinity_mat_t * tm_build_affinity_mat(double **mat, int order); + + /* compute the number of leaves of any subtree starting froma node of depth depth*/ int compute_nb_leaves_from_level(int depth,tm_topology_t *topology) { @@ -50,10 +80,6 @@ tm_mem_check(); } -int nb_processing_units(tm_topology_t *topology) -{ - return topology->nb_proc_units; -} void print_1D_tab(int *tab,int N) @@ -89,14 +115,15 @@ return N; } -void init_mat(char *filename,int N, double **mat, double *sum_row) -{ + + +long int init_mat(char *filename,int N, double **mat, double *sum_row){ FILE *pf = NULL; char *ptr= NULL; char line[LINE_SIZE]; int i,j; unsigned int vl = tm_get_verbose_level(); - + long int nnz = 0; if(!(pf=fopen(filename,"r"))){ if(vl >= CRITICAL) @@ -107,7 +134,6 @@ j = -1; i = 0; - while(fgets(line,LINE_SIZE,pf)){ char *l = line; j = 0; @@ -116,6 +142,7 @@ l = NULL; if((ptr[0]!='\n')&&(!isspace(ptr[0]))&&(*ptr)){ mat[i][j] = atof(ptr); + if(mat[i][j]) nnz++; sum_row[i] += mat [i][j]; if(mat[i][j]<0){ if(vl >= WARNING) @@ -140,15 +167,122 @@ } fclose (pf); + return nnz; +} + + +static size_t get_filesize(char* filename) { + struct stat st; + stat(filename, &st); + return st.st_size; +} + + +static char *parse_line(int i, double **mat, double *sum_row, int N, char *data, char *filename, long int *nnz){ + /* now parse the buffer byte per byte for the current line i until we reach '\n'*/ + unsigned int vl = tm_get_verbose_level(); + long val; + sum_row[i] = 0; + int j = 0; + while(*data != '\n'){ + while(*data ==' ' || *data == '\t') + data++; + if(*data != '\n'){ + val = 0; + while(*data !=' ' && *data != '\t' && *data != '\n'){ + val = val*10 + *data-'0'; + data++; + } + mat[i][j] = val; + /* printf("mat[%d][%d] = %ld\n",i,j, val); */ + if (val){ + (*nnz)++; + sum_row[i] += val; + } + j++; + } + } + if( j != N){ + if(vl >= CRITICAL) + fprintf(stderr,"Error at %d %d (%d!=%d). Wrong number of columns line %d for file %s\n",i ,j ,j ,N ,i+1, filename); + exit(-1); + } + data++; + return data; +} + + + +/* buffered read with mmap of teh file */ +static long int init_mat_mmap(char *filename,int N, double **mat, double *sum_row){ + int i; + unsigned int vl = tm_get_verbose_level(); + size_t filesize = get_filesize(filename); + int fd = open(filename, O_RDONLY, 0); + long int nnz = 0; + + if(fd == -1){ + if(vl >= CRITICAL) + fprintf(stderr,"Cannot open %s\n",filename); + exit(-1); + } + + char* data = (char*) mmap(NULL, filesize, PROT_READ, MAP_SHARED, fd, 0); + + if(data == MAP_FAILED){ + if(vl >= CRITICAL) + fprintf(stderr,"Cannot mmap %s\n",filename); + exit(-1); + } + + i = 0; + while(i= CRITICAL) + fprintf(stderr,"Cannot open %s\n",filename); + exit(-1); + } + + i = 0; + while(i mat = mat; aff_mat -> sum_row = sum_row; aff_mat -> order = order; + aff_mat -> nnz = nnz; return aff_mat; } @@ -157,15 +291,20 @@ tm_affinity_mat_t * tm_build_affinity_mat(double **mat, int order){ double *sum_row = NULL; int i,j; + long int nnz = 0; sum_row = (double*)MALLOC(order*sizeof(double)); for( i = 0 ; i < order ; i++){ sum_row[i] = 0; - for(j = 0 ; j < order ; j++) - sum_row[i] += mat [i][j]; + for(j = 0 ; j < order ; j++){ + if(mat[i][j]){ + nnz++; + sum_row[i] += mat [i][j]; + } + } } - return new_affinity_mat(mat, sum_row, order); + return new_affinity_mat(mat, sum_row, order, nnz); } @@ -190,7 +329,8 @@ double **mat = NULL; double *sum_row = NULL; int i, order; - + long int nnz; + if(tm_get_verbose_level() >= INFO) printf("Reading matrix file: %s\n",filename); @@ -201,13 +341,34 @@ for( i = 0 ; i < order ; i++) /* the last column stores the sum of the line*/ mat[i] = (double*)MALLOC((order)*sizeof(double)); - init_mat(filename,order, mat, sum_row); + /* on my mac parsing large file is better done with fopen than mmap */ + #ifdef __MACH__ + if (get_filesize(filename) > 1024*1024*1014) { + nnz = init_mat_long(filename,order, mat, sum_row); + if(tm_get_verbose_level() >= DEBUG) + printf("New parser\n"); + }else{ + nnz = init_mat_mmap(filename,order, mat, sum_row); + if(tm_get_verbose_level() >= DEBUG) + printf("MMap parser\n"); + } + #else + nnz = init_mat_mmap(filename,order, mat, sum_row); + if(tm_get_verbose_level() >= DEBUG) + printf("MMap parser\n"); + #endif + + /* TIC; */ + /* init_mat(filename,order, mat, sum_row); */ + /* double duration_fl = TOC; */ + /* printf("Old parser = %.3f\n",duration_fl); */ - if(tm_get_verbose_level() >= INFO) + + if(tm_get_verbose_level() >= INFO) printf("Affinity matrix built from %s!\n",filename); - return new_affinity_mat(mat, sum_row, order); + return new_affinity_mat(mat, sum_row, order, nnz); } @@ -300,7 +461,7 @@ unsigned int vl = tm_get_verbose_level(); M = nb_leaves(comm_tree); - nodes_id = topology->node_id[level]; + nodes_id = topology->node_id; N = topology->nb_nodes[level]; if(vl >= INFO){ diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_mapping.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_mapping.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_mapping.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_mapping.h 2022-05-29 09:51:40.000000000 +0000 @@ -5,13 +5,13 @@ #include "tm_timings.h" #include "tm_verbose.h" -tm_affinity_mat_t * new_affinity_mat(double **mat, double *sum_row, int order); +tm_affinity_mat_t * new_affinity_mat(double **mat, double *sum_row, int order, long int nnz); void build_synthetic_proc_id(tm_topology_t *topology); tm_topology_t *build_synthetic_topology(int *arity, int nb_levels, int *core_numbering, int nb_core_per_nodes); int compute_nb_leaves_from_level(int depth,tm_topology_t *topology); void depth_first(tm_tree_t *comm_tree, int *proc_list,int *i); int fill_tab(int **new_tab,int *tab, int n, int start, int max_val, int shift); -void init_mat(char *filename,int N, double **mat, double *sum_row); +long int init_mat(char *filename,int N, double **mat, double *sum_row); void map_topology(tm_topology_t *topology,tm_tree_t *comm_tree, int level, int *sigma, int nb_processes, int **k, int nb_compute_units); int nb_leaves(tm_tree_t *comm_tree); diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_solution.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_solution.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_solution.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_solution.c 2022-05-29 09:51:40.000000000 +0000 @@ -2,7 +2,7 @@ #include #include "tm_solution.h" #include "tm_mt.h" -#include "tm_mapping.h" +#include "tm_topology.h" typedef struct { int val; @@ -10,6 +10,27 @@ } hash_t; + +void tm_free_solution(tm_solution_t *sol); +int distance(tm_topology_t *topology,int i, int j); +double display_sol_sum_com(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, int *sigma); + double display_sol(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, int *sigma, tm_metric_t metric); +double tm_display_solution(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, tm_solution_t *sol, + tm_metric_t metric); +void tm_display_other_heuristics(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, tm_metric_t metric); +int in_tab(int *tab, int n, int val); +void map_Packed(tm_topology_t *topology, int N, int *sigma); +void map_RR(tm_topology_t * topology, int N, int *sigma); +int hash_asc(const void* x1,const void* x2); +int *generate_random_sol(tm_topology_t *topology,int N, int seed); +double eval_sol(int *sol,int N,double **comm, double **arch); +void exchange(int *sol,int i,int j); +double gain_exchange(int *sol,int l,int m,double eval1,int N,double **comm, double **arch); +void select_max(int *l,int *m,double **gain,int N,int *state); +void compute_gain(int *sol,int N,double **gain,double **comm, double **arch); +void map_MPIPP(tm_topology_t *topology,int nb_seed,int N,int *sigma,double **comm, double **arch); + + void tm_free_solution(tm_solution_t *sol){ int i,n; @@ -41,8 +62,8 @@ int vl = tm_get_verbose_level(); int depth = topology->nb_levels-1; - f_i = topology->node_rank[depth][i]; - f_j = topology->node_rank[depth][j]; + f_i = topology->node_rank[i]; + f_j = topology->node_rank[j]; if(vl >= DEBUG) printf("i=%d, j=%d Level = %d f=(%d,%d)\n",i ,j, level, f_i, f_j); @@ -58,7 +79,7 @@ } while((f_i!=f_j) && (level < depth)); if(vl >= DEBUG) - printf("distance(%d,%d):%d\n",topology->node_rank[depth][i], topology->node_rank[depth][j], level); + printf("distance(%d,%d):%d\n",topology->node_rank[i], topology->node_rank[j], level); /* exit(-1); */ return level; } @@ -270,10 +291,10 @@ for( i = 0 ; i < topology->nb_nodes[depth] ; i++){ /* printf ("%d -> %d\n",objs[i]->os_index,i); */ - if((!topology->constraints) || (in_tab(topology->constraints, topology->nb_constraints, topology->node_id[depth][i]))){ + if((!topology->constraints) || (in_tab(topology->constraints, topology->nb_constraints, topology->node_id[i]))){ if(vl >= DEBUG) - printf ("%lu: %d -> %d\n", i, j, topology->node_id[depth][i]); - sigma[j++]=topology->node_id[depth][i]; + printf ("%lu: %d -> %d\n", i, j, topology->node_id[i]); + sigma[j++]=topology->node_id[i]; if(j == N) break; } @@ -306,14 +327,14 @@ } -int *generate_random_sol(tm_topology_t *topology,int N,int level,int seed) +int *generate_random_sol(tm_topology_t *topology,int N, int seed) { hash_t *hash_tab = NULL; int *sol = NULL; int *nodes_id= NULL; int i; - nodes_id = topology->node_id[level]; + nodes_id = topology->node_id; hash_tab = (hash_t*)MALLOC(sizeof(hash_t)*N); sol = (int*)MALLOC(sizeof(int)*N); @@ -428,7 +449,7 @@ state = (int*)MALLOC(sizeof(int)*N); temp = (double*)MALLOC(sizeof(double)*N); - sol = generate_random_sol(topology,N,topology->nb_levels-1,seed++); + sol = generate_random_sol(topology, N, seed++); for( i = 0 ; i < N ; i++) sigma[i] = sol[i]; @@ -488,7 +509,7 @@ } }while( max > 0 ); FREE(sol); - sol=generate_random_sol(topology,N,topology->nb_levels-1,seed++); + sol=generate_random_sol(topology, N, seed++); } diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_solution.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_solution.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_solution.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_solution.h 2022-05-29 09:51:40.000000000 +0000 @@ -14,7 +14,7 @@ void map_Packed(tm_topology_t *topology, int N, int *sigma); void map_RR(tm_topology_t *topology, int N, int *sigma); int hash_asc(const void* x1,const void* x2); -int *generate_random_sol(tm_topology_t *topology,int N,int level,int seed); +int *generate_random_sol(tm_topology_t *topology,int N, int seed); double eval_sol(int *sol,int N,double **comm, double **arch); void exchange(int *sol,int i,int j); double gain_exchange(int *sol,int l,int m,double eval1,int N,double **comm, double **arch); diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_thread_pool.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_thread_pool.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_thread_pool.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_thread_pool.c 2022-05-29 09:51:40.000000000 +0000 @@ -23,7 +23,6 @@ static void f1 (int nb_args, void **args, int thread_id); static void f2 (int nb_args, void **args, int thread_id); -static void destroy_work(work_t *work); #define MIN(a, b) ((a)<(b)?(a):(b)) #define MAX(a, b) ((a)>(b)?(a):(b)) @@ -88,7 +87,7 @@ hwloc_bitmap_asprintf(&str, obj->cpuset); if(verbose_level>=WARNING) printf("Thread %d couldn't bind to cpuset %s: %s.\n This thread is not bound to any core...\n", my_core, str, strerror(error)); - free(str); /* str is allocated by hlwoc, free it normally*/ + free(str); /* str is allocated by hwloc, free it normally*/ return 0; } /* FREE our cpuset copy */ diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_thread_pool.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_thread_pool.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_thread_pool.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_thread_pool.h 2022-05-29 09:51:40.000000000 +0000 @@ -41,6 +41,7 @@ void terminate_thread_pool(void); work_t *create_work(int nb_args, void **args, void (int, void **, int)); int test_main(void); +void destroy_work(work_t *work); diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_topology.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_topology.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_topology.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_topology.c 2022-05-29 09:51:40.000000000 +0000 @@ -7,7 +7,7 @@ #include "tm_solution.h" -tm_topology_t* get_local_topo_with_hwloc(void); +tm_topology_t* tm_get_local_topo_with_hwloc(void); tm_topology_t* hwloc_to_tm(char *filename); int int_cmp_inc(const void* x1,const void* x2); void optimize_arity(int **arity, double **cost, int *nb_levels,int n); @@ -27,11 +27,24 @@ double ** topology_to_arch(hwloc_topology_t topology); void build_synthetic_proc_id(tm_topology_t *topology); tm_topology_t *tm_build_synthetic_topology(int *arity, double *cost, int nb_levels, int *core_numbering, int nb_core_per_nodes); +void tm_set_numbering(tm_numbering_t new_val); /* TM_NUMBERING_LOGICAL or TM_NUMBERING_PHYSICAL */ #define LINE_SIZE (1000000) +static tm_numbering_t numbering = TM_NUMBERING_LOGICAL; + +void tm_set_numbering(tm_numbering_t new_val){ + numbering = new_val; +} + +tm_numbering_t tm_get_numbering(){ + return numbering; +} + + + /* transform a tgt scotch file into a topology file*/ tm_topology_t * tgt_to_tm(char *filename) { @@ -55,7 +68,13 @@ printf("Reading TGT file: %s\n",filename); - fgets(line,1024,pf); + if (NULL == fgets(line,1024,pf)) { + /* either an error has occurred (and is in an unknown state) or + we hit EOF and line is empty. Either way, make line the + empty string to avoid errors later */ + line[0] = '\0'; + } + fclose(pf); s = strstr(line,"tleaf"); @@ -101,6 +120,13 @@ return topology; } + + +int nb_processing_units(tm_topology_t *topology) +{ + return topology->nb_proc_units; +} + int topo_nb_proc(hwloc_topology_t topology,int N) { hwloc_obj_t *objs = NULL; @@ -114,7 +140,6 @@ } - static double link_cost(int depth) { /* @@ -133,7 +158,6 @@ */ } - double ** topology_to_arch(hwloc_topology_t topology) { int nb_proc,i,j; @@ -141,14 +165,13 @@ double **arch = NULL; nb_proc = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PU); - if( nb_proc <= 0 ) { /* if multiple levels with PUs */ - return NULL; + if (nb_proc < 0) { + return NULL; } - arch = (double**)MALLOC(sizeof(double*)*nb_proc); - if( NULL == arch ) { - return NULL; + arch = (double**)malloc(sizeof(double*)*nb_proc); + if (NULL == arch) { + return NULL; } - for( i = 0 ; i < nb_proc ; i++ ){ obj_proc1 = hwloc_get_obj_by_type(topology,HWLOC_OBJ_PU,i); arch[obj_proc1->os_index] = (double*)MALLOC(sizeof(double)*nb_proc); @@ -184,6 +207,46 @@ return 1; } +static void build_process_tab_id(tm_topology_t *topology, hwloc_obj_t *objs, char* filename){ + unsigned int i,j; + unsigned int nb_nodes = topology->nb_proc_units; + int vl = tm_get_verbose_level(); + + /* Build process id tab */ + if(numbering == TM_NUMBERING_LOGICAL){ + for (i = 0; i < nb_nodes; i++){ + topology->node_id[i] = i; + topology->node_rank[i] = i; + } + }else if(numbering == TM_NUMBERING_PHYSICAL){ + for (i = 0; i < nb_nodes; i++){ + if(objs[i]->os_index > nb_nodes){ + if(vl >= CRITICAL){ + fprintf(stderr, "Cannot use forced physical numbering!\n\tIndex of PU %d is %d and larger than number of nodes : %d\n", + i, objs[i]->os_index, nb_nodes); + } + exit(-1); + } + for(j = 0; j < i; j++){ + if((unsigned int)topology->node_id[j] == objs[i]->os_index){ + if(vl >= CRITICAL){ + fprintf(stderr, "Cannot use forced physical numbering!\n\tDuplicated physical number of some PUs in %s.\n\tPU %d and PU %d have the same physical number: (os_index[%d] = %d) == (os_index[%d] = %d)\n", filename, j, i, j, objs[j]->os_index, i, objs[i]->os_index); + } + exit(-1); + } + } + topology->node_id[i] = objs[i]->os_index; + topology->node_rank[objs[i]->os_index] = i; + } + }else{ + if(vl >= CRITICAL){ + fprintf(stderr, "Unknown numbering %d\n", (int)numbering); + } + exit(-1); + } +} + + tm_topology_t* hwloc_to_tm(char *filename) { hwloc_topology_t topology; @@ -193,43 +256,46 @@ unsigned int nb_nodes; double *cost; int err, l; - unsigned int i; int vl = tm_get_verbose_level(); /* Build the topology */ hwloc_topology_init(&topology); - err = hwloc_topology_set_xml(topology,filename); + err = hwloc_topology_set_xml(topology, filename); if(err == -1){ if(vl >= CRITICAL) fprintf(stderr,"Error: %s is a bad xml topology file!\n",filename); exit(-1); } -#if HWLOC_API_VERSION >= 0x00020000 - hwloc_topology_set_all_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE); -#else /* HWLOC_API_VERSION >= 0x00020000 */ +#if HWLOC_API_VERSION < 0x20000 hwloc_topology_ignore_all_keep_structure(topology); -#endif /* HWLOC_API_VERSION >= 0x00020000 */ - hwloc_topology_load(topology); +#else + hwloc_topology_set_all_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE); +#endif + + err = hwloc_topology_load(topology); + if(err == -1){ + if(vl >= CRITICAL) + fprintf(stderr,"Error: the content of the xml topology file %s is not compatible with the version installed on this machine.\nPlease use compatible versions to generate the file and to use it!\n",filename); + exit(-1); + } /* Test if symetric */ if(!symetric(topology)){ - if(tm_get_verbose_level() >= CRITICAL) + if(vl >= CRITICAL) fprintf(stderr,"%s not symetric!\n",filename); exit(-1); } /* work on depth */ topodepth = hwloc_topology_get_depth(topology); - + res = (tm_topology_t*)MALLOC(sizeof(tm_topology_t)); res->oversub_fact = 1; res->nb_constraints = 0; res->constraints = NULL; res->nb_levels = topodepth; - res->node_id = (int**)MALLOC(sizeof(int*)*res->nb_levels); - res->node_rank = (int**)MALLOC(sizeof(int*)*res->nb_levels); res->nb_nodes = (size_t*)MALLOC(sizeof(size_t)*res->nb_levels); res->arity = (int*)MALLOC(sizeof(int)*res->nb_levels); @@ -240,35 +306,24 @@ for( depth = 0 ; depth < topodepth ; depth++ ){ nb_nodes = hwloc_get_nbobjs_by_depth(topology, depth); res->nb_nodes[depth] = nb_nodes; - res->node_id[depth] = (int*)MALLOC(sizeof(int)*nb_nodes); - res->node_rank[depth] = (int*)MALLOC(sizeof(int)*nb_nodes); - objs = (hwloc_obj_t*)MALLOC(sizeof(hwloc_obj_t)*nb_nodes); - objs[0] = hwloc_get_next_obj_by_depth(topology,depth,NULL); - hwloc_get_closest_objs(topology,objs[0],objs+1,nb_nodes-1); + objs = (hwloc_obj_t*)MALLOC(sizeof(hwloc_obj_t)*nb_nodes); + objs[0] = hwloc_get_next_obj_by_depth(topology, depth, NULL); + hwloc_get_closest_objs(topology, objs[0], objs+1, nb_nodes-1); res->arity[depth] = objs[0]->arity; + + if(vl >= DEBUG) + printf("\n--%d(%d) **%d**:--\n",res->arity[depth],nb_nodes,res->arity[0]); + if (depth == topodepth -1){ res->nb_constraints = nb_nodes; res->nb_proc_units = nb_nodes; - } - - if(vl >= DEBUG) - printf("\n--%d(%d) **%d**:--\n",res->arity[depth],nb_nodes,res->arity[0]); - - /* Build process id tab */ - for (i = 0; i < nb_nodes; i++){ - if(objs[i]->os_index > nb_nodes){ - if(vl >= CRITICAL){ - fprintf(stderr, "Index of object %d of level %d is %d and larger than number of nodes : %d\n", - i, depth, objs[i]->os_index, nb_nodes); - } - exit(-1); - } - - res->node_id[depth][i] = objs[i]->os_index; - res->node_rank[depth][objs[i]->os_index] = i; - /* if(depth==topodepth-1) */ + res->node_id = (int*)MALLOC(sizeof(int)*nb_nodes); + res->node_rank = (int*)MALLOC(sizeof(int)*nb_nodes); + + build_process_tab_id(res, objs, filename); + } FREE(objs); @@ -292,21 +347,23 @@ return res; } -tm_topology_t* get_local_topo_with_hwloc(void) +tm_topology_t* tm_get_local_topology_with_hwloc(void) { hwloc_topology_t topology; tm_topology_t *res = NULL; hwloc_obj_t *objs = NULL; unsigned topodepth,depth; - int nb_nodes,i; + int nb_nodes; /* Build the topology */ hwloc_topology_init(&topology); -#if HWLOC_API_VERSION >= 0x00020000 - hwloc_topology_set_all_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE); -#else /* HWLOC_API_VERSION >= 0x00020000 */ + +#if HWLOC_API_VERSION < 0x20000 hwloc_topology_ignore_all_keep_structure(topology); -#endif /* HWLOC_API_VERSION >= 0x00020000 */ +#else + hwloc_topology_set_all_types_filter(topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE); +#endif + hwloc_topology_load(topology); /* Test if symetric */ @@ -323,17 +380,15 @@ res->nb_constraints = 0; res->constraints = NULL; res->nb_levels = topodepth; - res->node_id = (int**)MALLOC(sizeof(int*)*res->nb_levels); - res->node_rank = (int**)MALLOC(sizeof(int*)*res->nb_levels); res->nb_nodes = (size_t*)MALLOC(sizeof(size_t)*res->nb_levels); res->arity = (int*)MALLOC(sizeof(int)*res->nb_levels); + res->oversub_fact = 1; //defaut + res->cost = NULL; /* Build TreeMatch topology */ for( depth = 0 ; depth < topodepth ; depth++ ){ nb_nodes = hwloc_get_nbobjs_by_depth(topology, depth); res->nb_nodes[depth] = nb_nodes; - res->node_id[depth] = (int*)MALLOC(sizeof(int)*nb_nodes); - res->node_rank[depth] = (int*)MALLOC(sizeof(int)*nb_nodes); objs = (hwloc_obj_t*)MALLOC(sizeof(hwloc_obj_t)*nb_nodes); objs[0] = hwloc_get_next_obj_by_depth(topology,depth,NULL); @@ -342,15 +397,14 @@ if (depth == topodepth -1){ res->nb_constraints = nb_nodes; - res->nb_proc_units = nb_nodes; - } + res->nb_proc_units = nb_nodes; + res->node_id = (int*)MALLOC(sizeof(int)*nb_nodes); + res->node_rank = (int*)MALLOC(sizeof(int)*nb_nodes); /* printf("%d:",res->arity[depth]); */ - /* Build process id tab */ - for (i = 0; i < nb_nodes; i++){ - res->node_id[depth][i] = objs[i]->os_index; - res->node_rank[depth][objs[i]->os_index] = i; - /* if(depth==topodepth-1) */ + /* Build process id tab */ + + build_process_tab_id(res, objs, "Local node topology"); } FREE(objs); } @@ -367,15 +421,9 @@ void tm_free_topology(tm_topology_t *topology) { - int i; - for( i = 0 ; i < topology->nb_levels ; i++ ){ - FREE(topology->node_id[i]); - FREE(topology->node_rank[i]); - } - - FREE(topology->constraints); FREE(topology->node_id); FREE(topology->node_rank); + FREE(topology->constraints); FREE(topology->nb_nodes); FREE(topology->arity); FREE(topology->cost); @@ -400,18 +448,15 @@ void tm_display_topology(tm_topology_t *topology) { int i; - unsigned int j; unsigned long id; for( i = 0 ; i < topology->nb_levels ; i++ ){ - printf("%d: ",i); - for( j = 0 ; j < topology->nb_nodes[i] ; j++) - printf("%d ",topology->node_id[i][j]); + printf("Level %d with arity %d ", i, topology->arity[i]); printf("\n"); } printf("Last level: "); for(id = 0; id < topology->nb_nodes[topology->nb_levels-1]/topology->oversub_fact; id++) - printf("%d ",topology->node_rank[topology->nb_levels-1][id]); + printf("%d ",topology->node_rank[id]); printf("\n"); @@ -430,9 +475,13 @@ void tm_display_arity(tm_topology_t *topology){ int depth; - for(depth=0; depth < topology->nb_levels; depth++) - printf("%d(%lf): ",topology->arity[depth], topology->cost[depth]); - + for(depth=0; depth < topology->nb_levels; depth++){ + printf("%d",topology->arity[depth]); + if(topology->cost) + printf("(%lf)",topology->cost[depth]); + else + printf(":"); + } printf("\n"); } @@ -447,7 +496,7 @@ int i; int depth = topology->nb_levels-1; for (i=0;inode_id[depth], topology->nb_nodes[depth], topology->constraints[i])){ + if(!in_tab(topology->node_id, topology->nb_nodes[depth], topology->constraints[i])){ if(tm_get_verbose_level() >= CRITICAL){ fprintf(stderr,"Error! Incompatible constraint with the topology: rank %d in the constraints is not a valid id of any nodes of the topology.\n",topology->constraints[i]); } @@ -497,7 +546,9 @@ /* compute the size of the array to store the constraints*/ n = 0; - fgets(line, LINE_SIZE, pf); + if (NULL == fgets(line, LINE_SIZE, pf)) { + line[0] = '\0'; + } l = line; while((ptr=strtok(l," \t"))){ l = NULL; @@ -508,7 +559,9 @@ tab = (int*)MALLOC(n*sizeof(int)); rewind(pf); - fgets(line, LINE_SIZE, pf); + if (NULL == fgets(line, LINE_SIZE, pf)) { + line[0] = '\0'; + } fclose(pf); l = line; i = 0; @@ -538,7 +591,7 @@ } -void topology_numbering_cpy(tm_topology_t *topology,int **numbering,int *nb_nodes) +void topology_numbering_cpy(tm_topology_t *topology,int **numbering_loc,int *nb_nodes) { int nb_levels; unsigned int vl = tm_get_verbose_level(); @@ -547,8 +600,8 @@ *nb_nodes = topology->nb_nodes[nb_levels-1]; if(vl >= INFO) printf("nb_nodes=%d\n",*nb_nodes); - *numbering = (int*)MALLOC(sizeof(int)*(*nb_nodes)); - memcpy(*numbering,topology->node_id[nb_levels-1],sizeof(int)*(*nb_nodes)); + *numbering_loc = (int*)MALLOC(sizeof(int)*(*nb_nodes)); + memcpy(*numbering_loc,topology->node_id,sizeof(int)*(*nb_nodes)); } void topology_arity_cpy(tm_topology_t *topology,int **arity,int *nb_levels) @@ -662,7 +715,7 @@ void tm_optimize_topology(tm_topology_t **topology){ int *arity = NULL,nb_levels; - int *numbering = NULL,nb_nodes; + int *numbering_loc = NULL,nb_nodes; tm_topology_t *new_topo; double *cost; unsigned int vl = tm_get_verbose_level(); @@ -673,13 +726,13 @@ tm_display_arity(*topology); topology_arity_cpy(*topology,&arity,&nb_levels); - topology_numbering_cpy(*topology,&numbering,&nb_nodes); + topology_numbering_cpy(*topology,&numbering_loc,&nb_nodes); topology_constraints_cpy(*topology,&constraints,&nb_constraints); topology_cost_cpy(*topology,&cost); optimize_arity(&arity,&cost,&nb_levels,nb_levels-2); - new_topo = tm_build_synthetic_topology(arity, NULL, nb_levels,numbering,nb_nodes); + new_topo = tm_build_synthetic_topology(arity, NULL, nb_levels,numbering_loc,nb_nodes); new_topo->cost = cost; new_topo->constraints = constraints; new_topo->nb_constraints = nb_constraints; @@ -699,9 +752,9 @@ tm_display_arity(new_topo); } FREE(arity); - FREE(numbering); + FREE(numbering_loc); tm_free_topology(*topology); - + *topology = new_topo; /* exit(-1); */ @@ -738,8 +791,6 @@ topology->constraints = NULL; topology->nb_levels = nb_levels; topology->arity = (int*)MALLOC(sizeof(int)*topology->nb_levels); - topology->node_id = (int**)MALLOC(sizeof(int*)*topology->nb_levels); - topology->node_rank = (int**)MALLOC(sizeof(int*)*topology->nb_levels); topology->nb_nodes = (size_t *)MALLOC(sizeof(size_t)*topology->nb_levels); if(cost) topology->cost = (double*)CALLOC(topology->nb_levels,sizeof(double)); @@ -753,27 +804,17 @@ n = 1; for( i = 0 ; i < topology->nb_levels ; i++ ){ topology->nb_nodes[i] = n; - topology->node_id[i] = (int*)MALLOC(sizeof(int)*n); - topology->node_rank[i] = (int*)MALLOC(sizeof(int)*n); - if( i < topology->nb_levels-1){ - for( j = 0 ; j < n ; j++ ){ - topology->node_id[i][j] = j; - topology->node_rank[i][j]=j; - } - }else{ + if (i == topology->nb_levels-1){ + topology->node_id = (int*)MALLOC(sizeof(int)*n); + topology->node_rank = (int*)MALLOC(sizeof(int)*n); + topology->nb_constraints = n; + topology->nb_proc_units = n; for( j = 0 ; j < n ; j++ ){ int id = core_numbering[j%nb_core_per_nodes] + (nb_core_per_nodes)*(j/nb_core_per_nodes); - topology->node_id[i][j] = id; - topology->node_rank[i][id] = j; + topology->node_id[j] = id; + topology->node_rank[id] = j; } } - - - if (i == topology->nb_levels-1){ - topology->nb_constraints = n; - topology->nb_proc_units = n; - } - n *= topology->arity[i]; } if(cost){ @@ -791,32 +832,30 @@ int i; size_t j,n = 1; - topology->node_id = (int**)MALLOC(sizeof(int*)*topology->nb_levels); - topology->node_rank = (int**)MALLOC(sizeof(int*)*topology->nb_levels); topology->nb_nodes = (size_t*) MALLOC(sizeof(size_t)*topology->nb_levels); for( i = 0 ; i < topology->nb_levels ; i++ ){ /* printf("n= %lld, arity := %d\n",n, topology->arity[i]); */ topology->nb_nodes[i] = n; - topology->node_id[i] = (int*)MALLOC(sizeof(long int)*n); - topology->node_rank[i] = (int*)MALLOC(sizeof(long int)*n); - if ( !topology->node_id[i] ){ - if(tm_get_verbose_level() >= CRITICAL) - fprintf(stderr,"Cannot allocate level %d (of size %ld) of the topology\n", i, (unsigned long int)n); - exit(-1); - } - + if (i == topology->nb_levels-1){ + topology->node_rank = (int*)MALLOC(sizeof(int)*n); + topology->node_id = (int*)MALLOC(sizeof(int)*n); + if ( !topology->node_id ){ + if(tm_get_verbose_level() >= CRITICAL) + fprintf(stderr,"Cannot allocate last level (of size %ld) of the topology\n", (unsigned long int)n); + exit(-1); + } + topology->nb_constraints = n; topology->nb_proc_units = n; + + for( j = 0 ; j < n ; j++ ){ + topology->node_id[j] = j; + topology->node_rank[j] = j; + } } - - - for( j = 0 ; j < n ; j++ ){ - topology->node_id[i][j] = j; - topology->node_rank[i][j] = j; - } n *= topology->arity[i]; } @@ -827,6 +866,7 @@ void tm_enable_oversubscribing(tm_topology_t *topology, unsigned int oversub_fact){ { int i,j,n; + int *node_id, *node_rank; if(oversub_fact <=1) return; @@ -834,8 +874,6 @@ topology -> nb_levels ++; topology -> arity = (int*) REALLOC(topology->arity, sizeof(int)*topology->nb_levels); topology -> cost = (double*) REALLOC(topology->cost, sizeof(double)*topology->nb_levels); - topology -> node_id = (int**) REALLOC(topology->node_id, sizeof(int*)*topology->nb_levels); - topology -> node_rank = (int**) REALLOC(topology->node_rank, sizeof(int*)*topology->nb_levels); topology -> nb_nodes = (size_t *)REALLOC(topology->nb_nodes, sizeof(size_t)*topology->nb_levels); topology -> oversub_fact = oversub_fact; @@ -843,15 +881,19 @@ n = topology->nb_nodes[i-1] * oversub_fact; topology->arity[i-1] = oversub_fact; topology->cost[i-1] = 0; - topology->node_id[i] = (int*)MALLOC(sizeof(int)*n); - topology->node_rank[i] = (int*)MALLOC(sizeof(int)*n); + node_id = (int*)MALLOC(sizeof(int)*n); + node_rank = (int*)MALLOC(sizeof(int)*n); topology->nb_nodes[i] = n; for( j = 0 ; j < n ; j++ ){ - int id = topology->node_id[i-1][j/oversub_fact]; - topology->node_id[i][j] = id; - topology->node_rank[i][id] = j; + int id = topology->node_id[j/oversub_fact]; + node_id[j] = id; + node_rank[id] = j; } + FREE(topology->node_id); + FREE(topology->node_rank); + topology->node_id = node_id; + topology->node_rank = node_rank; } } diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_topology.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_topology.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_topology.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_topology.h 2022-05-29 09:51:40.000000000 +0000 @@ -19,4 +19,5 @@ void topology_cost(tm_topology_t *topology,double **cost); void topology_numbering(tm_topology_t *topology,int **numbering,int *nb_nodes); double ** topology_to_arch(hwloc_topology_t topology); +int nb_processing_units(tm_topology_t *topology); diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_tree.c openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_tree.c --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/tm_tree.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/tm_tree.c 2022-05-29 09:51:40.000000000 +0000 @@ -5,7 +5,6 @@ #include #include -#include "treematch.h" #include "tm_tree.h" #include "tm_mapping.h" #include "tm_timings.h" @@ -82,12 +81,23 @@ void free_constraint_tree(tm_tree_t *); void free_tab_double(double**, int); void free_tab_int(int**, int ); -void partial_aggregate_aff_mat (int, void **, int); +static void partial_aggregate_aff_mat (int, void **, int); void free_affinity_mat(tm_affinity_mat_t *aff_mat); int int_cmp_inc(const void* x1, const void* x2); +double choose (long n, long k) +{ + /* compute C_n_k */ + double res = 1; + int i; + + for( i = 0 ; i < k ; i++ ){ + res *= ((double)(n-i)/(double)(k-i)); + } + return res; +} void tm_set_exhaustive_search_flag(int new_val){ @@ -105,8 +115,6 @@ FREE(aff_mat); } - - void free_list_child(tm_tree_t *tree) { int i; @@ -116,13 +124,14 @@ free_list_child(tree->child[i]); FREE(tree->child); - if(tree->dumb) + if(tree->dumb) /*in dumb subtrees internal nodes have been allocated individually, they need to bee freed one by one*/ FREE(tree); } } void free_tab_child(tm_tree_t *tree) { if(tree){ + /*in a non constaint tree internal node are allocated in an array an stored ib tab_child : they are freed globaly here */ free_tab_child(tree->tab_child); FREE(tree->tab_child); } @@ -130,20 +139,26 @@ void free_non_constraint_tree(tm_tree_t *tree) { - int d = tree->dumb; + if(tree->dumb){ + if(tm_get_verbose_level() <= CRITICAL){ + fprintf(stderr,"Error trying to free a dumb tree!\n. This should never be done like this: the root of a non-constraint tree cannot be a dumb one!\n"); + } + exit(-1); + } - free_tab_child(tree); - free_list_child(tree); - if(!d) - FREE(tree); + free_list_child(tree); /* free the tree->child array recursively and the nodes in dumb subtree*/ + free_tab_child(tree); /* free the tree->tab_child array that correspond of all the child nodes of a given node in non dumb subtrees */ + FREE(tree); } void free_constraint_tree(tm_tree_t *tree) { int i; + if(tree){ for(i=0;iarity;i++) free_constraint_tree(tree->child[i]); + /* tab_child field is NULL for all nodes in the constraint tree*/ FREE(tree->child); FREE(tree); } @@ -155,20 +170,9 @@ if(tree->constraint) free_constraint_tree(tree); else - free_non_constraint_tree(tree); + free_non_constraint_tree(tree); /* tab_child field is NULL for all nodes in the tree*/ } -double choose (long n, long k) -{ - /* compute C_n_k */ - double res = 1; - int i; - - for( i = 0 ; i < k ; i++ ){ - res *= ((double)(n-i)/(double)(k-i)); - } - return res; -} void set_node(tm_tree_t *node, tm_tree_t ** child, int arity, tm_tree_t *parent, int id, double val, tm_tree_t *tab_child, int depth) @@ -239,11 +243,12 @@ int M = *(int*)args[4]; double **mat = (double**)args[5]; double *sum_row = (double*)args[6]; + long int *nnz = (long int *)args[7]; int i, j, i1, j1; int id1, id2; - if(nb_args != 7){ + if(nb_args != 8){ if(verbose_level >= ERROR) fprintf(stderr, "Thread %d: Wrong number of args in %s: %d\n", thread_id, __func__, nb_args); exit(-1); @@ -262,6 +267,9 @@ mat[i][j] += old_mat[id1][id2]; /* printf("mat[%d][%d]+=old_mat[%d][%d]=%f\n", i, j, id1, id2, old_mat[id1][id2]);*/ } + } + if(mat[i][j]){ + (*nnz)++; sum_row[i] += mat[i][j]; } } @@ -274,7 +282,8 @@ int i, j, i1, j1, id1, id2; double **new_mat = NULL, **old_mat = aff_mat->mat; double *sum_row = NULL; - + long int nnz = 0; + new_mat = (double**)MALLOC(M*sizeof(double*)); for( i = 0 ; i < M ; i++ ) new_mat[i] = (double*)CALLOC((M), sizeof(double)); @@ -287,16 +296,19 @@ work_t **works; int *inf; int *sup; + long int *nnz_tab; nb_threads = MIN(M/512, get_nb_threads()); works = (work_t**)MALLOC(sizeof(work_t*)*nb_threads); inf = (int*)MALLOC(sizeof(int)*nb_threads); sup = (int*)MALLOC(sizeof(int)*nb_threads); + nnz_tab = (long int*)MALLOC(sizeof(long int)*nb_threads); for(id=0;id= DEBUG) printf("Executing %p\n", (void *)works[id]); @@ -315,13 +328,16 @@ for(id=0;idargs); + nnz += nnz_tab[id]; + destroy_work(works[id]); } - FREE(inf); FREE(sup); FREE(works); + FREE(nnz_tab); + }else{ for( i = 0 ; i < M ; i++ ) for( j = 0 ; j < M ; j++ ){ @@ -333,12 +349,16 @@ new_mat[i][j] += old_mat[id1][id2]; /* printf("mat[%d][%d]+=old_mat[%d][%d]=%f\n", i, j, id1, id2, old_mat[id1][id2]);*/ } + } + if(new_mat[i][j]){ + nnz ++; sum_row[i] += new_mat[i][j]; } } } } - return new_affinity_mat(new_mat, sum_row, M); + + return new_affinity_mat(new_mat, sum_row, M, nnz); } void free_tab_double(double**tab, int mat_order) @@ -918,7 +938,7 @@ work_unit_t *work = (work_unit_t *) args[7]; pthread_mutex_t *lock = (pthread_mutex_t *) args[8]; int *tab_i; - int id = 0, id1, id2; + int id=-1, id1, id2; int total_work = work->nb_work; int cur_work = 0; @@ -1009,12 +1029,7 @@ } -#if 0 -static int dbl_cmp_dec(const void* x1,const void* x2) -{ - return *((double *)x1) > *((double *)x2) ? -1 : 1; -} -#endif + static int dbl_cmp_inc(const void* x1,const void* x2) { return *((double *)x1) < *((double *)x2) ? -1 : 1; @@ -1181,6 +1196,7 @@ for(id=0;idargs); + destroy_work(works[id]); } exit(-1); @@ -1209,6 +1225,7 @@ return 0; } + #if 0 static int old_recurs_exhaustive_search(group_list_t **tab, int i, int n, int arity, int d, int solution_size, double val, double *best_val, group_list_t **selection, group_list_t **best_selection, int8_t **indep_mat) { @@ -1695,7 +1712,8 @@ double **old_mat; double avg; int i, j, mat_order; - + long int nnz = 0; + if(!obj_weight) return aff_mat; @@ -1727,8 +1745,9 @@ mat[i][j] = 1e-4*old_mat[i][j]/comm_speed-fabs(avg-(obj_weight[i]+obj_weight[j])/2); sum_row[i] += mat[i][j]; } + if(mat[i][j]) nnz++; } - return new_affinity_mat(mat, sum_row, mat_order); + return new_affinity_mat(mat, sum_row, mat_order,nnz); } @@ -1774,7 +1793,7 @@ /* if(nb_groups>30000||depth>5){*/ if( nbg > 30000 ){ - double duration; + double duration_loc; TIC; if( arity <= 2 ){ @@ -1792,9 +1811,9 @@ val = k_partition_grouping(cost_mat, tab_node, new_tab_node, arity, solution_size); } - duration = TOC; + duration_loc = TOC; if(verbose_level >= INFO) - printf("Fast grouping duration=%f\n", duration); + printf("Fast grouping duration=%f\n", duration_loc); if(verbose_level >= INFO) display_grouping(new_tab_node, solution_size, arity, val); @@ -1809,7 +1828,7 @@ best_selection = (group_list_t **)MALLOC(sizeof(group_list_t*)*solution_size); list_all_possible_groups(cost_mat, tab_node, 0, arity, 0, cur_group, &list); - assert( nb_groups == (unsigned long int)list.val ); + assert( list.val == nb_groups); tab_group = (group_list_t**)MALLOC(sizeof(group_list_t*)*nb_groups); list_to_tab(list.next, tab_group, nb_groups); if(verbose_level>=INFO) @@ -1952,7 +1971,7 @@ sum_row[i] = (*aff_mat)->sum_row[i]; } - *aff_mat = new_affinity_mat(new_mat, sum_row, M); + *aff_mat = new_affinity_mat(new_mat, sum_row, M, (*aff_mat)->nnz); } void complete_obj_weight(double **tab, int mat_order, int K) @@ -2001,7 +2020,9 @@ list_child[i]->dumb = 1; } - set_node(node, list_child, arity, NULL, -1, 0, list_child[0], depth); + /* list_child => node->child ; list_child[0] => node->tab_child */ + /* printf("list_child[0] = %p\n",list_child[0]); */ + set_node(node, list_child, arity, NULL, -1, 0, NULL, depth); } void complete_tab_node(tm_tree_t **tab, int mat_order, int K, int depth, tm_topology_t *topology) { @@ -2080,6 +2101,8 @@ TIC; K = arity*((mat_order/arity)+1)-mat_order; /*printf("****mat_order=%d arity=%d K=%d\n", mat_order, arity, K); */ + if(verbose_level >= INFO) + printf("****mat_order=%d arity=%d K=%d\n", mat_order, arity, K); /*display_tab(tab, mat_order);*/ /* add K rows and columns to comm_matrix*/ complete_aff_mat(&aff_mat, mat_order, K); @@ -2106,8 +2129,8 @@ for( i = 0 ; i < M ; i++ ){ tm_tree_t **list_child = NULL; list_child = (tm_tree_t**)CALLOC(arity, sizeof(tm_tree_t*)); - set_node(&new_tab_node[i], list_child, arity, NULL, i, 0, tab_node, depth); - } + set_node(&new_tab_node[i], list_child, arity, NULL, i, 0, tab_node, depth); + } duration = TOC; if(verbose_level >= INFO) printf("New nodes creation= %fs\n ", duration); @@ -2224,7 +2247,7 @@ In order to have all the ranks of a given id we need to shift them as follows: */ shift = 1 + i%topology->oversub_fact - topology->oversub_fact; - (*constraints)[i] = topology->node_rank[topology->nb_levels-1][topology->constraints[i/topology->oversub_fact]] +shift; + (*constraints)[i] = topology->node_rank[topology->constraints[i/topology->oversub_fact]] +shift; if((*constraints)[i] < last) sorted = 0; last = (*constraints)[i]; diff -Nru openmpi-4.1.2/ompi/mca/topo/treematch/treematch/treematch.h openmpi-4.1.4/ompi/mca/topo/treematch/treematch/treematch.h --- openmpi-4.1.2/ompi/mca/topo/treematch/treematch/treematch.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/topo/treematch/treematch/treematch.h 2022-05-29 09:51:40.000000000 +0000 @@ -21,6 +21,11 @@ TM_METRIC_HOP_BYTE = 3 } tm_metric_t; +/* numbering */ +typedef enum{ + TM_NUMBERING_LOGICAL = 0, + TM_NUMBERING_PHYSICAL = 1 +} tm_numbering_t; /********* TreeMatch Public Structures **********/ @@ -30,39 +35,42 @@ int finish_date; } tm_job_info_t; -typedef struct _tree_t{ +typedef struct _tm_tree_t{ int constraint; /* tells if the tree has been constructed with constraints on the nodes or not. Usefull for freeing it. needs to be set on the root only*/ - struct _tree_t **child; - struct _tree_t *parent; - struct _tree_t *tab_child; /*the pointer to be freed*/ + struct _tm_tree_t **child; + struct _tm_tree_t *parent; + struct _tm_tree_t *tab_child; /* The pointer to be freed */ double val; int arity; int depth; - int id; - int uniq; - int dumb; /* 1 if the node belongs to a dumb tree: hence has to be freed separately*/ + int id; /* id of the node or the leaf. Ids are different onmly on a given level */ + int uniq; /* uniq id in the whole tree */ + int dumb; /* 1 if the node belongs to a dumb tree: hence has to be freed separately */ tm_job_info_t *job_info; - int nb_processes; /* number of grouped processes (i.e. the order of the affinity matrix). Set at the root only*/ -}tm_tree_t; /* FT : changer le nom : tm_grouap_hierachy_t ?*/ + int nb_processes; /* number of grouped processes (i.e. the order of the affinity matrix). Set at the root only */ +}tm_tree_t; /* FT : changer le nom : tm_grouap_hierachy_t ? */ /* Maximum number of levels in the tree*/ #define TM_MAX_LEVELS 100 typedef struct { - int *arity; /* arity of the nodes of each level*/ - int nb_levels; /*number of levels of the tree. Levels are numbered from top to bottom starting at 0*/ - size_t *nb_nodes; /*nb of nodes of each level*/ - int **node_id; /*ID of the nodes of the tree for each level*/ - int **node_rank ; /*rank of the nodes of the tree for each level given its ID: this is the inverse tab of node_id*/ - size_t *nb_free_nodes; /*nb of available nodes of each level*/ - int **free_nodes; /*tab of node that are free: useful to simulate batch scheduler*/ - double *cost; /*cost of the communication depending on the distance: - cost[i] is the cost for communicating at distance nb_levels-i*/ - int *constraints; /* array of constraints: id of the nodes where it is possible to map processes */ - int nb_constraints; /* Size of the above array */ - int oversub_fact; /* maximum number of processes to be mapped on a given node */ - int nb_proc_units; /* the real number of units used for computation */ + int *arity; /* Arity of the nodes of each level*/ + int nb_levels; /* Number of levels of the tree. Levels are numbered from top to bottom starting at 0*/ + size_t *nb_nodes; /* Number of nodes of each level*/ + int physical_num; /* Flag set to !=0 if se use physical numberig and set to 0 is we use logical numbering */ + int *node_id; /* ID of the nodes of the tree of the last level*/ + int *node_rank ; /* Rank of the nodes of the tree for the last level given its ID: this is the inverse tab of node_id*/ + + size_t *nb_free_nodes; /* Nb of available nodes of each level*/ + int **free_nodes; /* array of node that are free: useful to simulate batch scheduler*/ + double *cost; /* Cost of the communication depending on the distance: + cost[i] is the cost for communicating at distance nb_levels-i*/ + + int *constraints; /* Array of constraints: id of the nodes where it is possible to map processes */ + int nb_constraints; /* Size of the above array */ + int oversub_fact; /* Maximum number of processes to be mapped on a given node */ + int nb_proc_units; /* The real number of units used for computation */ }tm_topology_t; @@ -70,17 +78,18 @@ double ** mat; double * sum_row; int order; + long int nnz; /* number of non zero entries */ } tm_affinity_mat_t; /* - sigma_i is such that process i is mapped on core sigma_i - k_i is such that core i exectutes process k_i_j (0<=j<<=oversubscribing factor - 1) + sigma[i] is such that process i is mapped on core sigma[i] + k[i][j] is such that core i executes process k[i][j] (0<=j<<=oversubscribing factor - 1) size of sigma is the number of processes (nb_objs) size of k is the number of cores/nodes (nb_compute_units) size of k[i] is the number of process we can execute per nodes (1 if no oversubscribing) - We must have numbe of process<=number of cores + We must have number of process<=number of cores k[i] == NULL if no process is mapped on core i */ @@ -95,8 +104,10 @@ /************ TreeMatch Public API ************/ +/* construct topology from local one using hwloc */ +tm_topology_t* tm_get_local_topology_with_hwloc(void); -/* load XML or TGT topology */ +/* Aletrnatively, load XML or TGT topology */ tm_topology_t *tm_load_topology(char *arch_filename, tm_file_type_t arch_file_type); /* Alternatively, build a synthetic balanced topology. @@ -120,7 +131,7 @@ double cost[5] = {500,100,50,10,0}; int arity[5] = {16,2,2,2,0}; - int cn[5]={0,1}; + int cn[2]={0,1}; topology = tm_build_synthetic_topology(arity,cost,5,cn,2); @@ -153,7 +164,7 @@ void tm_enable_oversubscribing(tm_topology_t *topology, unsigned int oversub_fact); /* core of the treematch: compute the solution tree */ tm_tree_t *tm_build_tree_from_topology(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, double *obj_weight, double *com_speed); -/* compute the mapping according to teh tree an dthe core numbering*/ +/* compute the mapping according to the tree and the core numbering*/ tm_solution_t *tm_compute_mapping(tm_topology_t *topology, tm_tree_t *comm_tree); /* display the solution*/ double tm_display_solution(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, tm_solution_t *sol, tm_metric_t metric); @@ -178,10 +189,21 @@ void tm_set_exhaustive_search_flag(int new_val); int tm_get_exhaustive_search_flag(void); +/* +Ask for greedy k-partitionning even if scotch is available + new_val == 0 : no greedy k-partitionning + new_val != 0 : greedy k-partitionning +*/ +void tm_set_greedy_flag(int new_val); +int tm_get_greedy_flag(void); + /* Setting the maximum number of threads you want to use in parallel parts of TreeMatch */ void tm_set_max_nb_threads(unsigned int val); +/* managing the usage of physical vs. logical core numbering when using hwloc/xml files */ +void tm_set_numbering(tm_numbering_t new_val); /* TM_NUMBERING_LOGICAL or TM_NUMBERING_PHYSICAL */ +tm_numbering_t tm_get_numbering(void); /* TM_NUMBERING_LOGICAL or TM_NUMBERING_PHYSICAL */ #include "tm_malloc.h" diff -Nru openmpi-4.1.2/ompi/mca/vprotocol/Makefile.in openmpi-4.1.4/ompi/mca/vprotocol/Makefile.in --- openmpi-4.1.2/ompi/mca/vprotocol/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/vprotocol/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mca/vprotocol/pessimist/Makefile.in openmpi-4.1.4/ompi/mca/vprotocol/pessimist/Makefile.in --- openmpi-4.1.2/ompi/mca/vprotocol/pessimist/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mca/vprotocol/pessimist/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/c/Makefile.in openmpi-4.1.4/ompi/mpi/c/Makefile.in --- openmpi-4.1.2/ompi/mpi/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -135,6 +135,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -373,6 +374,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -409,6 +411,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1648,6 +1651,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1797,9 +1804,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1860,6 +1864,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1873,6 +1880,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/c/profile/Makefile.in openmpi-4.1.4/ompi/mpi/c/profile/Makefile.in --- openmpi-4.1.2/ompi/mpi/c/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/c/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1591,6 +1594,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1740,9 +1747,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1803,6 +1807,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1816,6 +1823,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/cxx/Makefile.in openmpi-4.1.4/ompi/mpi/cxx/Makefile.in --- openmpi-4.1.2/ompi/mpi/cxx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/cxx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1517,6 +1520,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1666,9 +1673,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1729,6 +1733,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1742,6 +1749,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/base/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/base/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/base/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/base/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -134,6 +134,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -372,6 +373,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -408,6 +410,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1461,6 +1464,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1610,9 +1617,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1673,6 +1677,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1686,6 +1693,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/mpiext-use-mpi/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/mpiext-use-mpi/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/mpiext-use-mpi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/mpiext-use-mpi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1455,6 +1458,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1604,9 +1611,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1667,6 +1671,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1680,6 +1687,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1455,6 +1458,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1604,9 +1611,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1667,6 +1671,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1680,6 +1687,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/mpif-h/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/mpif-h/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/mpif-h/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/mpif-h/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -523,6 +523,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -761,6 +762,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -797,6 +799,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -2438,6 +2441,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -2587,9 +2594,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -2650,6 +2654,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -2663,6 +2670,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/mpif-h/profile/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/mpif-h/profile/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/mpif-h/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/mpif-h/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -153,6 +153,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -391,6 +392,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -427,6 +429,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1635,6 +1638,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1784,9 +1791,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1847,6 +1851,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1860,6 +1867,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/base/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/base/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/base/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/base/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1457,6 +1460,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1606,9 +1613,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1669,6 +1673,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1682,6 +1689,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -141,6 +141,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -379,6 +380,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -415,6 +417,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1483,6 +1486,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1632,9 +1639,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1695,6 +1699,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1708,6 +1715,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -152,6 +152,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -390,6 +391,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -426,6 +428,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -2601,6 +2604,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -2750,9 +2757,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -2813,6 +2817,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -2826,6 +2833,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -141,6 +141,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -379,6 +380,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -415,6 +417,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1491,6 +1494,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1640,9 +1647,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1703,6 +1707,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1716,6 +1723,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 2022-05-29 09:51:40.000000000 +0000 @@ -240,104 +240,104 @@ !... .EQ. operator !----------------- - logical function ompi_comm_op_eq(a, b) + elemental logical function ompi_comm_op_eq(a, b) type(MPI_Comm), intent(in) :: a, b ompi_comm_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_comm_op_eq - logical function ompi_datatype_op_eq(a, b) + elemental logical function ompi_datatype_op_eq(a, b) type(MPI_Datatype), intent(in) :: a, b ompi_datatype_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_datatype_op_eq - logical function ompi_errhandler_op_eq(a, b) + elemental logical function ompi_errhandler_op_eq(a, b) type(MPI_Errhandler), intent(in) :: a, b ompi_errhandler_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_errhandler_op_eq - logical function ompi_file_op_eq(a, b) + elemental logical function ompi_file_op_eq(a, b) type(MPI_File), intent(in) :: a, b ompi_file_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_file_op_eq - logical function ompi_group_op_eq(a, b) + elemental logical function ompi_group_op_eq(a, b) type(MPI_Group), intent(in) :: a, b ompi_group_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_group_op_eq - logical function ompi_info_op_eq(a, b) + elemental logical function ompi_info_op_eq(a, b) type(MPI_Info), intent(in) :: a, b ompi_info_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_info_op_eq - logical function ompi_message_op_eq(a, b) + elemental logical function ompi_message_op_eq(a, b) type(MPI_Message), intent(in) :: a, b ompi_message_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_message_op_eq - logical function ompi_op_op_eq(a, b) + elemental logical function ompi_op_op_eq(a, b) type(MPI_Op), intent(in) :: a, b ompi_op_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_op_op_eq - logical function ompi_request_op_eq(a, b) + elemental logical function ompi_request_op_eq(a, b) type(MPI_Request), intent(in) :: a, b ompi_request_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_request_op_eq - logical function ompi_win_op_eq(a, b) + elemental logical function ompi_win_op_eq(a, b) type(MPI_Win), intent(in) :: a, b ompi_win_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL) end function ompi_win_op_eq !... .NE. operator !----------------- - logical function ompi_comm_op_ne(a, b) + elemental logical function ompi_comm_op_ne(a, b) type(MPI_Comm), intent(in) :: a, b ompi_comm_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_comm_op_ne - logical function ompi_datatype_op_ne(a, b) + elemental logical function ompi_datatype_op_ne(a, b) type(MPI_Datatype), intent(in) :: a, b ompi_datatype_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_datatype_op_ne - logical function ompi_errhandler_op_ne(a, b) + elemental logical function ompi_errhandler_op_ne(a, b) type(MPI_Errhandler), intent(in) :: a, b ompi_errhandler_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_errhandler_op_ne - logical function ompi_file_op_ne(a, b) + elemental logical function ompi_file_op_ne(a, b) type(MPI_File), intent(in) :: a, b ompi_file_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_file_op_ne - logical function ompi_group_op_ne(a, b) + elemental logical function ompi_group_op_ne(a, b) type(MPI_Group), intent(in) :: a, b ompi_group_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_group_op_ne - logical function ompi_info_op_ne(a, b) + elemental logical function ompi_info_op_ne(a, b) type(MPI_Info), intent(in) :: a, b ompi_info_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_info_op_ne - logical function ompi_message_op_ne(a, b) + elemental logical function ompi_message_op_ne(a, b) type(MPI_Message), intent(in) :: a, b ompi_message_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_message_op_ne - logical function ompi_op_op_ne(a, b) + elemental logical function ompi_op_op_ne(a, b) type(MPI_Op), intent(in) :: a, b ompi_op_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_op_op_ne - logical function ompi_request_op_ne(a, b) + elemental logical function ompi_request_op_ne(a, b) type(MPI_Request), intent(in) :: a, b ompi_request_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_request_op_ne - logical function ompi_win_op_ne(a, b) + elemental logical function ompi_win_op_ne(a, b) type(MPI_Win), intent(in) :: a, b ompi_win_op_ne = (a%MPI_VAL .NE. b%MPI_VAL) end function ompi_win_op_ne diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1523,6 +1526,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1672,9 +1679,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1735,6 +1739,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1748,6 +1755,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/fortran/use-mpi-tkr/Makefile.in openmpi-4.1.4/ompi/mpi/fortran/use-mpi-tkr/Makefile.in --- openmpi-4.1.2/ompi/mpi/fortran/use-mpi-tkr/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/fortran/use-mpi-tkr/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -154,6 +154,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -392,6 +393,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -428,6 +430,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1544,6 +1547,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1693,9 +1700,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1756,6 +1760,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1769,6 +1776,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/java/c/Makefile.in openmpi-4.1.4/ompi/mpi/java/c/Makefile.in --- openmpi-4.1.2/ompi/mpi/java/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/java/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -124,6 +124,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -362,6 +363,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -398,6 +400,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/java/c/mpi_Info.c openmpi-4.1.4/ompi/mpi/java/c/mpi_Info.c --- openmpi-4.1.2/ompi/mpi/java/c/mpi_Info.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/java/c/mpi_Info.c 2022-05-29 09:51:40.000000000 +0000 @@ -45,17 +45,20 @@ return (jlong)MPI_INFO_NULL; } +// At least some versions of jni.h have a global named "jvalue", and +// we get a compiler warning if we have a parameter or variable of the +// same name. So use "ljvalue" instead. JNIEXPORT void JNICALL Java_mpi_Info_set( - JNIEnv *env, jobject jthis, jlong handle, jstring jkey, jstring jvalue) + JNIEnv *env, jobject jthis, jlong handle, jstring jkey, jstring ljvalue) { - const char *key = (*env)->GetStringUTFChars(env, jkey, NULL), - *value = (*env)->GetStringUTFChars(env, jvalue, NULL); + const char *key = (*env)->GetStringUTFChars(env, jkey, NULL), + *value = (*env)->GetStringUTFChars(env, ljvalue, NULL); int rc = MPI_Info_set((MPI_Info)handle, (char*)key, (char*)value); ompi_java_exceptionCheck(env, rc); - (*env)->ReleaseStringUTFChars(env, jkey, key); - (*env)->ReleaseStringUTFChars(env, jvalue, value); + (*env)->ReleaseStringUTFChars(env, jkey, key); + (*env)->ReleaseStringUTFChars(env, ljvalue, value); } JNIEXPORT jstring JNICALL Java_mpi_Info_get( @@ -83,9 +86,12 @@ return NULL; } - jstring jvalue = (*env)->NewStringUTF(env, value); + // At least some versions of jni.h have a global named "jvalue", + // and we get a compiler warning if we have a parameter or + // variable of the same name. So use "ljvalue" instead. + jstring ljvalue = (*env)->NewStringUTF(env, value); free(value); - return jvalue; + return ljvalue; } JNIEXPORT void JNICALL Java_mpi_Info_delete( diff -Nru openmpi-4.1.2/ompi/mpi/java/java/Makefile.in openmpi-4.1.4/ompi/mpi/java/java/Makefile.in --- openmpi-4.1.2/ompi/mpi/java/java/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/java/java/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -139,6 +139,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -377,6 +378,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -413,6 +415,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1458,6 +1461,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1607,9 +1614,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1670,6 +1674,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1683,6 +1690,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/java/Makefile.in openmpi-4.1.4/ompi/mpi/java/Makefile.in --- openmpi-4.1.2/ompi/mpi/java/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/java/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1447,6 +1450,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1596,9 +1603,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1659,6 +1663,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1672,6 +1679,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/man/man3/MPI_Comm_rank.3in openmpi-4.1.4/ompi/mpi/man/man3/MPI_Comm_rank.3in --- openmpi-4.1.2/ompi/mpi/man/man3/MPI_Comm_rank.3in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/man/man3/MPI_Comm_rank.3in 2022-05-29 09:51:40.000000000 +0000 @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" Copyright 2010 Cisco Systems, Inc. All rights reserved. +.\" Copyright (c) 2010-2022 Cisco Systems, Inc. All rights reserved .\" Copyright 2006-2008 Sun Microsystems, Inc. .\" Copyright (c) 1996 Thinking Machines Corporation .\" $COPYRIGHT$ @@ -60,7 +60,7 @@ particular communicator's group. It is equivalent to accessing the communicator's group with MPI_Comm_group, computing the rank using MPI_Group_rank, and then freeing the temporary group via MPI_Group_free. .sp -Many programs will be written with the master-slave model, where one process (such as the rank-zero process) will play a supervisory role, and the other processes will serve as compute nodes. In this framework, MPI_Comm_size and MPI_Comm_rank are useful for determining the roles of the various processes of a communicator. +Many programs will be written with the manager-worker model, where one process (such as the rank-zero process) will play a supervisory role, and the other processes will serve as compute nodes. In this framework, MPI_Comm_size and MPI_Comm_rank are useful for determining the roles of the various processes of a communicator. .SH ERRORS Almost all MPI routines return an error value; C routines as the value of the function and Fortran routines in the last argument. C++ functions do not return errors. If the default error handler is set to MPI::ERRORS_THROW_EXCEPTIONS, then on error the C++ exception mechanism will be used to throw an MPI::Exception object. diff -Nru openmpi-4.1.2/ompi/mpi/tool/Makefile.in openmpi-4.1.4/ompi/mpi/tool/Makefile.in --- openmpi-4.1.2/ompi/mpi/tool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/tool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -124,6 +124,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -362,6 +363,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -398,6 +400,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1530,6 +1533,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1679,9 +1686,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1742,6 +1746,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1755,6 +1762,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpi/tool/profile/Makefile.in openmpi-4.1.4/ompi/mpi/tool/profile/Makefile.in --- openmpi-4.1.2/ompi/mpi/tool/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpi/tool/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1508,6 +1511,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1657,9 +1664,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1720,6 +1724,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1733,6 +1740,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/affinity/c/Makefile.in openmpi-4.1.4/ompi/mpiext/affinity/c/Makefile.in --- openmpi-4.1.2/ompi/mpiext/affinity/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/affinity/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -138,6 +138,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -376,6 +377,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -412,6 +414,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/affinity/Makefile.in openmpi-4.1.4/ompi/mpiext/affinity/Makefile.in --- openmpi-4.1.2/ompi/mpiext/affinity/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/affinity/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1456,6 +1459,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1605,9 +1612,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1668,6 +1672,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1681,6 +1688,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/cr/c/Makefile.in openmpi-4.1.4/ompi/mpiext/cr/c/Makefile.in --- openmpi-4.1.2/ompi/mpiext/cr/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/cr/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/cr/Makefile.in openmpi-4.1.4/ompi/mpiext/cr/Makefile.in --- openmpi-4.1.2/ompi/mpiext/cr/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/cr/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1456,6 +1459,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1605,9 +1612,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1668,6 +1672,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1681,6 +1688,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/cuda/c/Makefile.in openmpi-4.1.4/ompi/mpiext/cuda/c/Makefile.in --- openmpi-4.1.2/ompi/mpiext/cuda/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/cuda/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -139,6 +139,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -377,6 +378,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -413,6 +415,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/cuda/Makefile.in openmpi-4.1.4/ompi/mpiext/cuda/Makefile.in --- openmpi-4.1.2/ompi/mpiext/cuda/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/cuda/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1457,6 +1460,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1606,9 +1613,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1669,6 +1673,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1682,6 +1689,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/c/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/c/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -157,6 +157,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -395,6 +396,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -431,6 +433,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1581,6 +1584,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1730,9 +1737,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1793,6 +1797,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1806,6 +1813,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/c/profile/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/c/profile/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/c/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/c/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -136,6 +136,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -374,6 +375,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -410,6 +412,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -115,6 +115,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -353,6 +354,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -389,6 +391,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1445,6 +1448,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1594,9 +1601,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1657,6 +1661,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1670,6 +1677,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/mpif-h/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/mpif-h/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/mpif-h/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/mpif-h/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -159,6 +159,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -397,6 +398,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -433,6 +435,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1591,6 +1594,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1740,9 +1747,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1803,6 +1807,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1816,6 +1823,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/mpif-h/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/use-mpi/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/use-mpi/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/use-mpi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/use-mpi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1412,6 +1415,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1561,9 +1568,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1624,6 +1628,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1637,6 +1644,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.in openmpi-4.1.4/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.in --- openmpi-4.1.2/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1532,6 +1535,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1681,9 +1688,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1744,6 +1748,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1757,6 +1764,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/tools/mpisync/Makefile.in openmpi-4.1.4/ompi/tools/mpisync/Makefile.in --- openmpi-4.1.2/ompi/tools/mpisync/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/tools/mpisync/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -150,6 +150,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -388,6 +389,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -424,6 +426,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1505,6 +1508,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1654,9 +1661,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1717,6 +1721,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1730,6 +1737,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/tools/ompi_info/Makefile.in openmpi-4.1.4/ompi/tools/ompi_info/Makefile.in --- openmpi-4.1.2/ompi/tools/ompi_info/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/tools/ompi_info/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/ompi/tools/wrappers/Makefile.in openmpi-4.1.4/ompi/tools/wrappers/Makefile.in --- openmpi-4.1.2/ompi/tools/wrappers/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/ompi/tools/wrappers/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1461,6 +1464,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1610,9 +1617,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1673,6 +1677,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1686,6 +1693,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/datatype/Makefile.in openmpi-4.1.4/opal/datatype/Makefile.in --- openmpi-4.1.2/opal/datatype/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/datatype/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -138,6 +138,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -376,6 +377,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -412,6 +414,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1525,6 +1528,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1674,9 +1681,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1737,6 +1741,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1750,6 +1757,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/datatype/opal_datatype_copy.c openmpi-4.1.4/opal/datatype/opal_datatype_copy.c --- openmpi-4.1.2/opal/datatype/opal_datatype_copy.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/datatype/opal_datatype_copy.c 2022-05-29 09:51:40.000000000 +0000 @@ -46,6 +46,8 @@ /** * Non overlapping memory regions */ +#undef MEM_OP_BLOCK_SIZE +#define MEM_OP_BLOCK_SIZE opal_datatype_memop_block_size #undef MEM_OP_NAME #define MEM_OP_NAME non_overlap #undef MEM_OP @@ -74,6 +76,8 @@ #if OPAL_CUDA_SUPPORT #include "opal_datatype_cuda.h" +#undef MEM_OP_BLOCK_SIZE +#define MEM_OP_BLOCK_SIZE total_length #undef MEM_OP_NAME #define MEM_OP_NAME non_overlap_cuda #undef MEM_OP diff -Nru openmpi-4.1.2/opal/datatype/opal_datatype_copy.h openmpi-4.1.4/opal/datatype/opal_datatype_copy.h --- openmpi-4.1.2/opal/datatype/opal_datatype_copy.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/datatype/opal_datatype_copy.h 2022-05-29 09:51:40.000000000 +0000 @@ -23,6 +23,9 @@ #if !defined(MEM_OP) #error #endif /* !defined(MEM_OP) */ +#if !defined(MEM_OP_BLOCK_SIZE) +#error +#endif /* !defined(MEM_OP_BLOCK_SIZE) */ #ifndef STRINGIFY # define STRINGIFY_(arg) #arg @@ -142,7 +145,7 @@ source += datatype->true_lb; if( (ptrdiff_t)datatype->size == extent ) { /* all contiguous == no gaps around */ size_t total_length = iov_len_local; - size_t memop_chunk = opal_datatype_memop_block_size; + size_t memop_chunk = MEM_OP_BLOCK_SIZE; OPAL_DATATYPE_SAFEGUARD_POINTER( source, iov_len_local, (unsigned char*)source_base, datatype, count ); while( total_length > 0 ) { diff -Nru openmpi-4.1.2/opal/etc/Makefile.in openmpi-4.1.4/opal/etc/Makefile.in --- openmpi-4.1.2/opal/etc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/etc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1395,6 +1398,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1544,9 +1551,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1607,6 +1611,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1620,6 +1627,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/include/Makefile.in openmpi-4.1.4/opal/include/Makefile.in --- openmpi-4.1.2/opal/include/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/include/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -339,6 +339,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -577,6 +578,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -613,6 +615,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1681,6 +1684,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1830,9 +1837,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1893,6 +1897,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1906,6 +1913,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/include/opal_config.h.in openmpi-4.1.4/opal/include/opal_config.h.in --- openmpi-4.1.2/opal/include/opal_config.h.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/include/opal_config.h.in 2022-05-29 09:51:40.000000000 +0000 @@ -1150,6 +1150,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TM_TREE_H +/* Define to 1 if you have the header file. */ +#undef HAVE_UCC_API_UCC_H + +/* Define to 1 if you have the `ucc_comm_free' function. */ +#undef HAVE_UCC_COMM_FREE + /* Define to 1 if you have the header file. */ #undef HAVE_UCONTEXT_H diff -Nru openmpi-4.1.2/opal/Makefile.in openmpi-4.1.4/opal/Makefile.in --- openmpi-4.1.2/opal/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -295,6 +295,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -533,6 +534,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -569,6 +571,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1727,6 +1730,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1876,9 +1883,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1939,6 +1943,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1952,6 +1959,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/allocator/basic/Makefile.in openmpi-4.1.4/opal/mca/allocator/basic/Makefile.in --- openmpi-4.1.2/opal/mca/allocator/basic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/allocator/basic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1493,6 +1496,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1642,9 +1649,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1705,6 +1709,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1718,6 +1725,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/allocator/bucket/Makefile.in openmpi-4.1.4/opal/mca/allocator/bucket/Makefile.in --- openmpi-4.1.2/opal/mca/allocator/bucket/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/allocator/bucket/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/allocator/Makefile.in openmpi-4.1.4/opal/mca/allocator/Makefile.in --- openmpi-4.1.2/opal/mca/allocator/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/allocator/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/backtrace/execinfo/Makefile.in openmpi-4.1.4/opal/mca/backtrace/execinfo/Makefile.in --- openmpi-4.1.2/opal/mca/backtrace/execinfo/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/backtrace/execinfo/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1445,6 +1448,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1594,9 +1601,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1657,6 +1661,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1670,6 +1677,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/backtrace/Makefile.in openmpi-4.1.4/opal/mca/backtrace/Makefile.in --- openmpi-4.1.2/opal/mca/backtrace/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/backtrace/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/backtrace/none/Makefile.in openmpi-4.1.4/opal/mca/backtrace/none/Makefile.in --- openmpi-4.1.2/opal/mca/backtrace/none/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/backtrace/none/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1445,6 +1448,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1594,9 +1601,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1657,6 +1661,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1670,6 +1677,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/backtrace/printstack/Makefile.in openmpi-4.1.4/opal/mca/backtrace/printstack/Makefile.in --- openmpi-4.1.2/opal/mca/backtrace/printstack/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/backtrace/printstack/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1445,6 +1448,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1594,9 +1601,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1657,6 +1661,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1670,6 +1677,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/base/Makefile.in openmpi-4.1.4/opal/mca/base/Makefile.in --- openmpi-4.1.2/opal/mca/base/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/base/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1492,6 +1495,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1641,9 +1648,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1704,6 +1708,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1717,6 +1724,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/Makefile.in openmpi-4.1.4/opal/mca/btl/Makefile.in --- openmpi-4.1.2/opal/mca/btl/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/ofi/btl_ofi_frag.c openmpi-4.1.4/opal/mca/btl/ofi/btl_ofi_frag.c --- openmpi-4.1.2/opal/mca/btl/ofi/btl_ofi_frag.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/ofi/btl_ofi_frag.c 2022-05-29 09:51:40.000000000 +0000 @@ -64,7 +64,7 @@ mca_btl_base_descriptor_t *mca_btl_ofi_alloc( mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint, - uint64_t order, size_t size, uint32_t flags) + uint8_t order, size_t size, uint32_t flags) { mca_btl_ofi_module_t *ofi_btl = (mca_btl_ofi_module_t*) btl; mca_btl_ofi_base_frag_t *frag = NULL; diff -Nru openmpi-4.1.2/opal/mca/btl/ofi/btl_ofi_frag.h openmpi-4.1.4/opal/mca/btl/ofi/btl_ofi_frag.h --- openmpi-4.1.2/opal/mca/btl/ofi/btl_ofi_frag.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/ofi/btl_ofi_frag.h 2022-05-29 09:51:40.000000000 +0000 @@ -32,7 +32,7 @@ mca_btl_base_descriptor_t *mca_btl_ofi_alloc( mca_btl_base_module_t *btl, mca_btl_base_endpoint_t *endpoint, - uint64_t order, size_t size, uint32_t flags); + uint8_t order, size_t size, uint32_t flags); int mca_btl_ofi_free (mca_btl_base_module_t *btl, mca_btl_base_descriptor_t *des); diff -Nru openmpi-4.1.2/opal/mca/btl/ofi/btl_ofi_module.c openmpi-4.1.4/opal/mca/btl/ofi/btl_ofi_module.c --- openmpi-4.1.2/opal/mca/btl/ofi/btl_ofi_module.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/ofi/btl_ofi_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -62,7 +62,7 @@ } else { /* We don't have this endpoint yet, create one */ peers[i] = mca_btl_ofi_endpoint_create (proc, ofi_btl->ofi_endpoint); - BTL_VERBOSE(("creating peer %p", peers[i])); + BTL_VERBOSE(("creating peer %p", (void*) peers[i])); if (OPAL_UNLIKELY(NULL == peers[i])) { return OPAL_ERR_OUT_OF_RESOURCE; diff -Nru openmpi-4.1.2/opal/mca/btl/ofi/Makefile.in openmpi-4.1.4/opal/mca/btl/ofi/Makefile.in --- openmpi-4.1.2/opal/mca/btl/ofi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/ofi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1512,6 +1515,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1661,9 +1668,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1724,6 +1728,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1737,6 +1744,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/openib/btl_openib_component.c openmpi-4.1.4/opal/mca/btl/openib/btl_openib_component.c --- openmpi-4.1.2/opal/mca/btl/openib/btl_openib_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/openib/btl_openib_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2006-2018 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved. * Copyright (c) 2006-2018 Los Alamos National Security, LLC. All rights * reserved. @@ -1868,7 +1868,7 @@ "eager RDMA and progress threads", true); } - asprintf (&rcache_resources.cache_name, "verbs.%" PRIu64, device->ib_dev_attr.node_guid); + asprintf (&rcache_resources.cache_name, "verbs.%" PRIu64, (uint64_t) device->ib_dev_attr.node_guid); rcache_resources.reg_data = (void*)device; rcache_resources.sizeof_reg = sizeof(mca_btl_openib_reg_t); rcache_resources.register_mem = openib_reg_mr; diff -Nru openmpi-4.1.2/opal/mca/btl/openib/Makefile.in openmpi-4.1.4/opal/mca/btl/openib/Makefile.in --- openmpi-4.1.2/opal/mca/btl/openib/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/openib/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -159,6 +159,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -397,6 +398,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -433,6 +435,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1591,6 +1594,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1740,9 +1747,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1803,6 +1807,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1816,6 +1823,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/portals4/Makefile.in openmpi-4.1.4/opal/mca/btl/portals4/Makefile.in --- openmpi-4.1.2/opal/mca/btl/portals4/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/portals4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1502,6 +1505,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1651,9 +1658,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1714,6 +1718,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1727,6 +1734,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/self/btl_self.c openmpi-4.1.4/opal/mca/btl/self/btl_self.c --- openmpi-4.1.2/opal/mca/btl/self/btl_self.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/self/btl_self.c 2022-05-29 09:51:40.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2013 The University of Tennessee and The University + * Copyright (c) 2004-2022 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -246,7 +246,9 @@ frag = mca_btl_self_prepare_src (btl, endpoint, convertor, order, header_size, &payload_size, flags | MCA_BTL_DES_FLAGS_BTL_OWNERSHIP); if (NULL == frag) { - *descriptor = NULL; + if( NULL != descriptor ) { + *descriptor = NULL; + } return OPAL_ERR_OUT_OF_RESOURCE; } diff -Nru openmpi-4.1.2/opal/mca/btl/self/Makefile.in openmpi-4.1.4/opal/mca/btl/self/Makefile.in --- openmpi-4.1.2/opal/mca/btl/self/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/self/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/sm/Makefile.in openmpi-4.1.4/opal/mca/btl/sm/Makefile.in --- openmpi-4.1.2/opal/mca/btl/sm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/sm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/smcuda/btl_smcuda.c openmpi-4.1.4/opal/mca/btl/smcuda/btl_smcuda.c --- openmpi-4.1.2/opal/mca/btl/smcuda/btl_smcuda.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/smcuda/btl_smcuda.c 2022-05-29 09:51:40.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright (c) 2004-2011 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2014 The University of Tennessee and The University + * Copyright (c) 2004-2022 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, @@ -925,10 +925,7 @@ } /* We do not want to use this path when we have CUDA IPC support */ if ((convertor->flags & CONVERTOR_CUDA) && (IPC_ACKED == endpoint->ipcstate)) { - if (NULL != descriptor) { - *descriptor = mca_btl_smcuda_alloc(btl, endpoint, order, payload_size+header_size, flags); - } - return OPAL_ERR_RESOURCE_BUSY; + goto return_resource_busy; } #endif /* OPAL_CUDA_SUPPORT */ @@ -938,9 +935,8 @@ /* allocate a fragment, giving up if we can't get one */ /* note that frag==NULL is equivalent to rc returning an error code */ MCA_BTL_SMCUDA_FRAG_ALLOC_EAGER(frag); - if( OPAL_UNLIKELY(NULL == frag) ) { - *descriptor = NULL; - return OPAL_ERR_OUT_OF_RESOURCE; + if (OPAL_UNLIKELY(NULL == frag)) { + goto return_resource_busy; } /* fill in fragment fields */ @@ -987,9 +983,10 @@ return OPAL_SUCCESS; } - /* presumably, this code path will never get executed */ - *descriptor = mca_btl_smcuda_alloc( btl, endpoint, order, - payload_size + header_size, flags); + return_resource_busy: + if (NULL != descriptor) { + *descriptor = mca_btl_smcuda_alloc(btl, endpoint, order, length, flags); + } return OPAL_ERR_RESOURCE_BUSY; } @@ -1053,9 +1050,11 @@ int access_flags = flags & MCA_BTL_REG_FLAG_ACCESS_ANY; int rcache_flags = 0; +#if OPAL_CUDA_GDR_SUPPORT if (MCA_BTL_REG_FLAG_CUDA_GPU_MEM & flags) { rcache_flags |= MCA_RCACHE_FLAGS_CUDA_GPU_MEM; } +#endif smcuda_module->rcache->rcache_register (smcuda_module->rcache, base, size, rcache_flags, access_flags, (mca_rcache_base_registration_t **) ®); diff -Nru openmpi-4.1.2/opal/mca/btl/smcuda/btl_smcuda_component.c openmpi-4.1.4/opal/mca/btl/smcuda/btl_smcuda_component.c --- openmpi-4.1.2/opal/mca/btl/smcuda/btl_smcuda_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/smcuda/btl_smcuda_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -203,11 +203,13 @@ if (0 == mca_btl_smcuda.super.btl_cuda_max_send_size) { mca_btl_smcuda.super.btl_cuda_max_send_size = 128*1024; } +#if OPAL_CUDA_GDR_SUPPORT /* If user has not set the value, then set to magic number which will be converted to the minimum * size needed to fit the PML header (see pml_ob1.c) */ if (0 == mca_btl_smcuda.super.btl_cuda_eager_limit) { mca_btl_smcuda.super.btl_cuda_eager_limit = SIZE_MAX; /* magic number */ } +#endif mca_common_cuda_register_mca_variables(); #endif /* OPAL_CUDA_SUPPORT */ return mca_btl_smcuda_component_verify(); diff -Nru openmpi-4.1.2/opal/mca/btl/smcuda/Makefile.in openmpi-4.1.4/opal/mca/btl/smcuda/Makefile.in --- openmpi-4.1.2/opal/mca/btl/smcuda/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/smcuda/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1506,6 +1509,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1655,9 +1662,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1718,6 +1722,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1731,6 +1738,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/tcp/btl_tcp_component.c openmpi-4.1.4/opal/mca/btl/tcp/btl_tcp_component.c --- openmpi-4.1.2/opal/mca/btl/tcp/btl_tcp_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/tcp/btl_tcp_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -577,8 +577,8 @@ */ static char **split_and_resolve(char **orig_str, char *name, bool reqd) { - int i, ret, save, if_index; - char **argv, *str, *tmp; + int i, n, ret, if_index, match_count, interface_count; + char **argv, **interfaces, *str, *tmp; char if_name[IF_NAMESIZE]; struct sockaddr_storage argv_inaddr, if_inaddr; uint32_t argv_prefix; @@ -592,9 +592,22 @@ if (NULL == argv) { return NULL; } - for (save = i = 0; NULL != argv[i]; ++i) { + interface_count = 0; + interfaces = NULL; + for (i = 0; NULL != argv[i]; ++i) { if (isalpha(argv[i][0])) { - argv[save++] = argv[i]; + /* This is an interface name. If not already in the interfaces array, add it */ + for (n = 0; n < interface_count; n++) { + if (0 == strcmp(argv[i], interfaces[n])) { + break; + } + } + if (n == interface_count) { + opal_output_verbose(20, + opal_btl_base_framework.framework_output, + "btl: tcp: Using interface: %s ", argv[i]); + opal_argv_append(&interface_count, &interfaces, argv[i]); + } continue; } @@ -634,6 +647,7 @@ argv_prefix); /* Go through all interfaces and see if we can find a match */ + match_count = 0; for (if_index = opal_ifbegin(); if_index >= 0; if_index = opal_ifnext(if_index)) { opal_ifindextoaddr(if_index, @@ -642,12 +656,28 @@ if (opal_net_samenetwork((struct sockaddr*) &argv_inaddr, (struct sockaddr*) &if_inaddr, argv_prefix)) { - break; + /* We found a match. If it's not already in the interfaces array, + add it. If it's already in the array, treat it as a match */ + match_count = match_count + 1; + opal_ifindextoname(if_index, if_name, sizeof(if_name)); + for (n = 0; n < interface_count; n++) { + if (0 == strcmp(if_name, interfaces[n])) { + break; + } + } + if (n == interface_count) { + opal_output_verbose(20, + opal_btl_base_framework.framework_output, + "btl: tcp: Found match: %s (%s)", + opal_net_get_hostname((struct sockaddr*) &if_inaddr), + if_name); + opal_argv_append(&interface_count, &interfaces, if_name); + } } } /* If we didn't find a match, keep trying */ - if (if_index < 0) { + if (0 == match_count) { if (reqd || mca_btl_tcp_component.report_all_unfound_interfaces) { opal_show_help("help-mpi-btl-tcp.txt", "invalid if_inexclude", true, name, opal_process_info.nodename, tmp, @@ -657,23 +687,17 @@ continue; } - /* We found a match; get the name and replace it in the - argv */ - opal_ifindextoname(if_index, if_name, sizeof(if_name)); - opal_output_verbose(20, opal_btl_base_framework.framework_output, - "btl: tcp: Found match: %s (%s)", - opal_net_get_hostname((struct sockaddr*) &if_inaddr), - if_name); - argv[save++] = strdup(if_name); free(tmp); } - /* The list may have been compressed if there were invalid - entries, so ensure we end it with a NULL entry */ - argv[save] = NULL; + /* Mark the end of the interface name array with NULL */ + if (NULL != interfaces) { + interfaces[interface_count] = NULL; + } + free(argv); free(*orig_str); - *orig_str = opal_argv_join(argv, ','); - return argv; + *orig_str = opal_argv_join(interfaces, ','); + return interfaces; } diff -Nru openmpi-4.1.2/opal/mca/btl/tcp/Makefile.in openmpi-4.1.4/opal/mca/btl/tcp/Makefile.in --- openmpi-4.1.2/opal/mca/btl/tcp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/tcp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1506,6 +1509,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1655,9 +1662,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1718,6 +1722,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1731,6 +1738,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/uct/btl_uct_component.c openmpi-4.1.4/opal/mca/btl/uct/btl_uct_component.c --- openmpi-4.1.2/opal/mca/btl/uct/btl_uct_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/uct/btl_uct_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -113,9 +113,11 @@ int core_count = 36; (void) opal_hwloc_base_get_topology (); - core_count = hwloc_get_nbobjs_by_type (opal_hwloc_topology, HWLOC_OBJ_CORE); + if (0 > (core_count = hwloc_get_nbobjs_by_type(opal_hwloc_topology, HWLOC_OBJ_CORE))) { + return OPAL_ERROR; + } - if (core_count <= opal_process_info.num_local_peers || !opal_using_threads()) { + if ((uint32_t)core_count <= opal_process_info.num_local_peers || !opal_using_threads()) { /* there is probably no benefit to using multiple device contexts when not * using threads or oversubscribing the node with mpi processes. */ mca_btl_uct_component.num_contexts_per_module = 1; @@ -437,9 +439,9 @@ return OPAL_ERROR; } - for (int i = 0 ; i < attr.md_resource_count ; ++i) { - rc = mca_btl_uct_component_process_uct_md (component, attr.md_resources + i, - allowed_ifaces); + for (unsigned i = 0; i < attr.md_resource_count; ++i) { + rc = mca_btl_uct_component_process_uct_md(component, attr.md_resources + i, + allowed_ifaces); if (OPAL_SUCCESS != rc) { break; } @@ -464,8 +466,6 @@ { /* for this BTL to be useful the interface needs to support RDMA and certain atomic operations */ struct mca_btl_base_module_t **base_modules; - uct_md_resource_desc_t *resources; - unsigned resource_count; ucs_status_t ucs_status; char **allowed_ifaces; int rc; @@ -506,6 +506,8 @@ uct_release_component_list (components); #else /* UCT 1.6 and older */ + uct_md_resource_desc_t *resources; + unsigned resource_count; uct_query_md_resources (&resources, &resource_count); diff -Nru openmpi-4.1.2/opal/mca/btl/uct/Makefile.in openmpi-4.1.4/opal/mca/btl/uct/Makefile.in --- openmpi-4.1.2/opal/mca/btl/uct/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/uct/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1508,6 +1511,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1657,9 +1664,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1720,6 +1724,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1733,6 +1740,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/ugni/Makefile.in openmpi-4.1.4/opal/mca/btl/ugni/Makefile.in --- openmpi-4.1.2/opal/mca/btl/ugni/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/ugni/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/usnic/btl_usnic_compat.h openmpi-4.1.4/opal/mca/btl/usnic/btl_usnic_compat.h --- openmpi-4.1.2/opal/mca/btl/usnic/btl_usnic_compat.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/usnic/btl_usnic_compat.h 2022-05-29 09:51:40.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* - * Copyright (c) 2013-2018 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2013-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2018 Intel, Inc. All rights reserved. @@ -234,7 +234,7 @@ /* - * Replicate functions that exist on master + * Replicate functions that exist on main */ char* opal_get_proc_hostname(opal_proc_t *proc); diff -Nru openmpi-4.1.2/opal/mca/btl/usnic/Makefile.in openmpi-4.1.4/opal/mca/btl/usnic/Makefile.in --- openmpi-4.1.2/opal/mca/btl/usnic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/usnic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -137,6 +137,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -375,6 +376,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -411,6 +413,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1546,6 +1549,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1695,9 +1702,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1758,6 +1762,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1771,6 +1778,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/btl/usnic/README.txt openmpi-4.1.4/opal/mca/btl/usnic/README.txt --- openmpi-4.1.2/opal/mca/btl/usnic/README.txt 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/usnic/README.txt 2022-05-29 09:51:40.000000000 +0000 @@ -289,10 +289,10 @@ November 2014 / SC 2014 Update February 2015 -The usnic BTL code has been unified across master and the v1.8 +The usnic BTL code has been unified across main and the v1.8 branches. That is, you can copy the code from -v1.8:ompi/mca/btl/usnic/* to master:opal/mca/btl/usnic*, and then only -have to make 3 changes in the resulting code in master: +v1.8:ompi/mca/btl/usnic/* to main:opal/mca/btl/usnic*, and then only +have to make 3 changes in the resulting code in main: 1. Edit Makefile.am: s/ompi/opal/gi 2. Edit configure.m4: s/ompi/opal/gi diff -Nru openmpi-4.1.2/opal/mca/btl/vader/Makefile.in openmpi-4.1.4/opal/mca/btl/vader/Makefile.in --- openmpi-4.1.2/opal/mca/btl/vader/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/btl/vader/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/cuda/Makefile.in openmpi-4.1.4/opal/mca/common/cuda/Makefile.in --- openmpi-4.1.2/opal/mca/common/cuda/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/cuda/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -153,6 +153,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -391,6 +392,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -427,6 +429,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1528,6 +1531,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1677,9 +1684,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1740,6 +1744,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1753,6 +1760,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/Makefile.in openmpi-4.1.4/opal/mca/common/Makefile.in --- openmpi-4.1.2/opal/mca/common/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1395,6 +1398,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1544,9 +1551,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1607,6 +1611,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1620,6 +1627,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/ofi/Makefile.in openmpi-4.1.4/opal/mca/common/ofi/Makefile.in --- openmpi-4.1.2/opal/mca/common/ofi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/ofi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -142,6 +142,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -380,6 +381,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -416,6 +418,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1520,6 +1523,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1669,9 +1676,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1732,6 +1736,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1745,6 +1752,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/sm/Makefile.in openmpi-4.1.4/opal/mca/common/sm/Makefile.in --- openmpi-4.1.2/opal/mca/common/sm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/sm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -156,6 +156,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -394,6 +395,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -430,6 +432,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1526,6 +1529,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1675,9 +1682,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1738,6 +1742,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1751,6 +1758,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/ucx/common_ucx.c openmpi-4.1.4/opal/mca/common/ucx/common_ucx.c --- openmpi-4.1.2/opal/mca/common/ucx/common_ucx.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/ucx/common_ucx.c 2022-05-29 09:51:40.000000000 +0000 @@ -1,5 +1,13 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* * 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 + * and Technology (RIST). All rights reserved. + * Copyright (c) 2021 Triad National Security, LLC. All rights + * reserved. + * Copyright (c) 2022 Google, LLC. All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -15,6 +23,7 @@ #include "opal/mca/pmix/pmix.h" #include "opal/memoryhooks/memory.h" #include "opal/util/argv.h" +#include "opal/util/printf.h" #include #include @@ -24,14 +33,16 @@ extern mca_base_framework_t opal_memory_base_framework; -opal_common_ucx_module_t opal_common_ucx = { - .verbose = 0, +opal_common_ucx_module_t opal_common_ucx = +{ .progress_iterations = 100, - .registered = 0, - .opal_mem_hooks = 0, - .tls = NULL + .opal_mem_hooks = 1, + .tls = NULL, + .devices = NULL, }; +static opal_mutex_t opal_common_ucx_mutex = OPAL_MUTEX_STATIC_INIT; + static void opal_common_ucx_mem_release_cb(void *buf, size_t length, void *cbdata, bool from_alloc) { @@ -40,60 +51,74 @@ OPAL_DECLSPEC void opal_common_ucx_mca_var_register(const mca_base_component_t *component) { - static const char *default_tls = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,ud_mlx5,cuda_ipc,rocm_ipc"; - static const char *default_devices = "mlx*"; - static int registered = 0; - static int hook_index; - static int verbose_index; - static int progress_index; - static int tls_index; - static int devices_index; - - if (!registered) { - verbose_index = mca_base_var_register("opal", "opal_common", "ucx", "verbose", - "Verbose level of the UCX components", - MCA_BASE_VAR_TYPE_INT, NULL, 0, - MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3, - MCA_BASE_VAR_SCOPE_LOCAL, - &opal_common_ucx.verbose); - progress_index = mca_base_var_register("opal", "opal_common", "ucx", "progress_iterations", - "Set number of calls of internal UCX progress " - "calls per opal_progress call", - MCA_BASE_VAR_TYPE_INT, NULL, 0, - MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3, - MCA_BASE_VAR_SCOPE_LOCAL, - &opal_common_ucx.progress_iterations); - hook_index = mca_base_var_register("opal", "opal_common", "ucx", "opal_mem_hooks", - "Use OPAL memory hooks, instead of UCX internal " - "memory hooks", MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0, - OPAL_INFO_LVL_3, + char *default_tls = "rc_verbs,ud_verbs,rc_mlx5,dc_mlx5,ud_mlx5,cuda_ipc,rocm_ipc"; + char *default_devices = "mlx*"; + int hook_index; + int verbose_index; + int progress_index; + int tls_index; + int devices_index; + + OPAL_THREAD_LOCK(&opal_common_ucx_mutex); + + /* It is harmless to re-register variables so go ahead an re-register. */ + verbose_index = mca_base_var_register("opal", "opal_common", "ucx", "verbose", + "Verbose level of the UCX components", + MCA_BASE_VAR_TYPE_INT, NULL, 0, + MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3, + MCA_BASE_VAR_SCOPE_LOCAL, &opal_common_ucx.verbose); + progress_index = mca_base_var_register("opal", "opal_common", "ucx", "progress_iterations", + "Set number of calls of internal UCX progress " + "calls per opal_progress call", + MCA_BASE_VAR_TYPE_INT, NULL, 0, + MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3, MCA_BASE_VAR_SCOPE_LOCAL, - &opal_common_ucx.opal_mem_hooks); - - opal_common_ucx.tls = malloc(sizeof(*opal_common_ucx.tls)); + &opal_common_ucx.progress_iterations); + hook_index = mca_base_var_register("opal", "opal_common", "ucx", "opal_mem_hooks", + "Use OPAL memory hooks, instead of UCX internal " + "memory hooks", + MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0, OPAL_INFO_LVL_3, + MCA_BASE_VAR_SCOPE_LOCAL, + &opal_common_ucx.opal_mem_hooks); + + if (NULL == opal_common_ucx.tls || NULL == *opal_common_ucx.tls) { + // Extra level of string indirection needed to make ompi_info + // happy since it will unload this library before the MCA base + // cleans up the MCA vars. This will cause the string to go + // out of scope unless we place the pointer to it on the heap. + if( NULL == opal_common_ucx.tls ) { + opal_common_ucx.tls = (char **) malloc(sizeof(char *)); + } *opal_common_ucx.tls = strdup(default_tls); - tls_index = mca_base_var_register("opal", "opal_common", "ucx", "tls", - "List of UCX transports which should be supported on the system, to enable " - "selecting the UCX component. Special values: any (any available). " - "A '^' prefix negates the list. " - "For example, in order to exclude on shared memory and TCP transports, " - "please set to '^posix,sysv,self,tcp,cma,knem,xpmem'.", - MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, - OPAL_INFO_LVL_3, - MCA_BASE_VAR_SCOPE_LOCAL, - opal_common_ucx.tls); + } - opal_common_ucx.devices = malloc(sizeof(*opal_common_ucx.devices)); + tls_index = mca_base_var_register( + "opal", "opal_common", "ucx", "tls", + "List of UCX transports which should be supported on the system, to enable " + "selecting the UCX component. Special values: any (any available). " + "A '^' prefix negates the list. " + "For example, in order to exclude on shared memory and TCP transports, " + "please set to '^posix,sysv,self,tcp,cma,knem,xpmem'.", + MCA_BASE_VAR_TYPE_STRING, NULL, 0, + MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3, + MCA_BASE_VAR_SCOPE_LOCAL, + opal_common_ucx.tls); + + if (NULL == opal_common_ucx.devices || NULL == *opal_common_ucx.devices) { + if( NULL == opal_common_ucx.devices ) { + opal_common_ucx.devices = (char **) malloc(sizeof(char *)); + } *opal_common_ucx.devices = strdup(default_devices); - devices_index = mca_base_var_register("opal", "opal_common", "ucx", "devices", - "List of device driver pattern names, which, if supported by UCX, will " - "bump its priority above ob1. Special values: any (any available)", - MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, - OPAL_INFO_LVL_3, - MCA_BASE_VAR_SCOPE_LOCAL, - opal_common_ucx.devices); - registered = 1; } + devices_index = mca_base_var_register( + "opal", "opal_common", "ucx", "devices", + "List of device driver pattern names, which, if supported by UCX, will " + "bump its priority above ob1. Special values: any (any available)", + MCA_BASE_VAR_TYPE_STRING, NULL, 0, + MCA_BASE_VAR_FLAG_SETTABLE, OPAL_INFO_LVL_3, + MCA_BASE_VAR_SCOPE_LOCAL, + opal_common_ucx.devices); + if (component) { mca_base_var_register_synonym(verbose_index, component->mca_project_name, component->mca_type_name, @@ -116,6 +141,8 @@ component->mca_component_name, "devices", 0); } + + OPAL_THREAD_UNLOCK(&opal_common_ucx_mutex); } OPAL_DECLSPEC void opal_common_ucx_mca_register(void) @@ -168,13 +195,16 @@ { char sysfs_driver_link[PATH_MAX]; char driver_path[PATH_MAX]; - char *ib_device_name; + char ib_device_name[NAME_MAX]; char *driver_name; char **list_item; ssize_t ret; + char ib_device_name_fmt[NAME_MAX]; /* mlx5_0:1 */ - ret = sscanf(device_name, "%m[^:]%*d", &ib_device_name); + opal_snprintf(ib_device_name_fmt, sizeof(ib_device_name_fmt), + "%%%u[^:]%%*d", NAME_MAX - 1); + ret = sscanf(device_name, ib_device_name_fmt, &ib_device_name); if (ret != 1) { return false; } @@ -182,7 +212,6 @@ sysfs_driver_link[sizeof(sysfs_driver_link) - 1] = '\0'; snprintf(sysfs_driver_link, sizeof(sysfs_driver_link) - 1, "/sys/class/infiniband/%s/device/driver", ib_device_name); - free(ib_device_name); ret = readlink(sysfs_driver_link, driver_path, sizeof(driver_path) - 1); if (ret < 0) { @@ -215,7 +244,8 @@ [OPAL_COMMON_UCX_SUPPORT_DEVICE] = "transports and devices" }; #if HAVE_DECL_OPEN_MEMSTREAM - char *rsc_tl_name, *rsc_device_name; + char rsc_tl_name[NAME_MAX], rsc_device_name[NAME_MAX]; + char rsc_name_fmt[NAME_MAX]; char **tl_list, **device_list, **list_item; bool is_any_tl, is_any_device; bool found_tl, negate; @@ -226,20 +256,19 @@ int ret; #endif - is_any_tl = !strcmp(*opal_common_ucx.tls, "any"); + is_any_tl = !strcmp(*opal_common_ucx.tls, "any"); is_any_device = !strcmp(*opal_common_ucx.devices, "any"); /* Check for special value "any" */ if (is_any_tl && is_any_device) { - MCA_COMMON_UCX_VERBOSE(1, "ucx is enabled on any transport or device", - *opal_common_ucx.tls); + MCA_COMMON_UCX_VERBOSE(1, "ucx is enabled on any transport or device"); support_level = OPAL_COMMON_UCX_SUPPORT_DEVICE; goto out; } #if HAVE_DECL_OPEN_MEMSTREAM /* Split transports list */ - negate = ('^' == (*opal_common_ucx.tls)[0]); + negate = ('^' == (*opal_common_ucx.tls)[0]); tl_list = opal_argv_split(*opal_common_ucx.tls + (negate ? 1 : 0), ','); if (tl_list == NULL) { MCA_COMMON_UCX_VERBOSE(1, "failed to split tl list '%s', ucx is disabled", @@ -266,17 +295,17 @@ /* Print ucx transports information to the memory stream */ ucp_context_print_info(context, stream); + /* "# resource 6 : md 5 dev 4 flags -- rc_verbs/mlx5_0:1" */ + opal_snprintf(rsc_name_fmt, sizeof(rsc_name_fmt), + "# resource %%*d : md %%*d dev %%*d flags -- %%%u[^/ \n\r]/%%%u[^/ \n\r]", + NAME_MAX - 1, NAME_MAX - 1); + /* Rewind and read transports/devices list from the stream */ fseek(stream, 0, SEEK_SET); while ((support_level != OPAL_COMMON_UCX_SUPPORT_DEVICE) && (fgets(line, sizeof(line), stream) != NULL)) { - rsc_tl_name = NULL; - ret = sscanf(line, - /* "# resource 6 : md 5 dev 4 flags -- rc_verbs/mlx5_0:1" */ - "# resource %*d : md %*d dev %*d flags -- %m[^/ \n\r]/%m[^/ \n\r]", - &rsc_tl_name, &rsc_device_name); + ret = sscanf(line, rsc_name_fmt, rsc_tl_name, rsc_device_name); if (ret != 2) { - free(rsc_tl_name); continue; } @@ -303,9 +332,6 @@ MCA_COMMON_UCX_VERBOSE(2, "%s/%s: did not match transport list", rsc_tl_name, rsc_device_name); } - - free(rsc_device_name); - free(rsc_tl_name); } MCA_COMMON_UCX_VERBOSE(2, "support level is %s", support_level_names[support_level]); diff -Nru openmpi-4.1.2/opal/mca/common/ucx/common_ucx.h openmpi-4.1.4/opal/mca/common/ucx/common_ucx.h --- openmpi-4.1.2/opal/mca/common/ucx/common_ucx.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/ucx/common_ucx.h 2022-05-29 09:51:40.000000000 +0000 @@ -1,6 +1,7 @@ /* * Copyright (c) 2018 Mellanox Technologies. All rights reserved. * All rights reserved. + * Copyright (c) 2022 IBM Corporation. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow diff -Nru openmpi-4.1.2/opal/mca/common/ucx/Makefile.in openmpi-4.1.4/opal/mca/common/ucx/Makefile.in --- openmpi-4.1.2/opal/mca/common/ucx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/ucx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -124,6 +124,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -362,6 +363,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -398,6 +400,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1506,6 +1509,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1655,9 +1662,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1718,6 +1722,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1731,6 +1738,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/verbs/Makefile.in openmpi-4.1.4/opal/mca/common/verbs/Makefile.in --- openmpi-4.1.2/opal/mca/common/verbs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/verbs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/common/verbs_usnic/Makefile.in openmpi-4.1.4/opal/mca/common/verbs_usnic/Makefile.in --- openmpi-4.1.2/opal/mca/common/verbs_usnic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/common/verbs_usnic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1480,6 +1483,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1629,9 +1636,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1692,6 +1696,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1705,6 +1712,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/compress/bzip/Makefile.in openmpi-4.1.4/opal/mca/compress/bzip/Makefile.in --- openmpi-4.1.2/opal/mca/compress/bzip/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/compress/bzip/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/compress/gzip/Makefile.in openmpi-4.1.4/opal/mca/compress/gzip/Makefile.in --- openmpi-4.1.2/opal/mca/compress/gzip/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/compress/gzip/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/compress/Makefile.in openmpi-4.1.4/opal/mca/compress/Makefile.in --- openmpi-4.1.2/opal/mca/compress/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/compress/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/crs/Makefile.in openmpi-4.1.4/opal/mca/crs/Makefile.in --- openmpi-4.1.2/opal/mca/crs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/crs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -160,6 +160,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -398,6 +399,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -434,6 +436,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1517,6 +1520,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1666,9 +1673,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1729,6 +1733,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1742,6 +1749,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/crs/none/Makefile.in openmpi-4.1.4/opal/mca/crs/none/Makefile.in --- openmpi-4.1.2/opal/mca/crs/none/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/crs/none/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/crs/self/Makefile.in openmpi-4.1.4/opal/mca/crs/self/Makefile.in --- openmpi-4.1.2/opal/mca/crs/self/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/crs/self/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1492,6 +1495,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1641,9 +1648,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1704,6 +1708,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1717,6 +1724,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/dl/dlopen/Makefile.in openmpi-4.1.4/opal/mca/dl/dlopen/Makefile.in --- openmpi-4.1.2/opal/mca/dl/dlopen/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/dl/dlopen/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1442,6 +1445,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1591,9 +1598,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1654,6 +1658,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1667,6 +1674,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/dl/libltdl/Makefile.in openmpi-4.1.4/opal/mca/dl/libltdl/Makefile.in --- openmpi-4.1.2/opal/mca/dl/libltdl/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/dl/libltdl/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1443,6 +1446,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1592,9 +1599,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1655,6 +1659,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1668,6 +1675,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/dl/Makefile.in openmpi-4.1.4/opal/mca/dl/Makefile.in --- openmpi-4.1.2/opal/mca/dl/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/dl/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1483,6 +1486,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1632,9 +1639,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1695,6 +1699,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1708,6 +1715,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/event/external/Makefile.in openmpi-4.1.4/opal/mca/event/external/Makefile.in --- openmpi-4.1.2/opal/mca/event/external/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/event/external/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1473,6 +1476,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1622,9 +1629,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1685,6 +1689,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1698,6 +1705,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/event/libevent2022/Makefile.in openmpi-4.1.4/opal/mca/event/libevent2022/Makefile.in --- openmpi-4.1.2/opal/mca/event/libevent2022/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/event/libevent2022/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -163,6 +163,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -401,6 +402,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -437,6 +439,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1595,6 +1598,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1744,9 +1751,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1807,6 +1811,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1820,6 +1827,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/event/Makefile.in openmpi-4.1.4/opal/mca/event/Makefile.in --- openmpi-4.1.2/opal/mca/event/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/event/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1478,6 +1481,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1627,9 +1634,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1690,6 +1694,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1703,6 +1710,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/hwloc/external/Makefile.in openmpi-4.1.4/opal/mca/hwloc/external/Makefile.in --- openmpi-4.1.2/opal/mca/hwloc/external/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/hwloc/external/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -124,6 +124,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -362,6 +363,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -398,6 +400,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1478,6 +1481,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1627,9 +1634,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1690,6 +1694,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1703,6 +1710,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/hwloc/hwloc201/hwloc/hwloc/Makefile.in openmpi-4.1.4/opal/mca/hwloc/hwloc201/hwloc/hwloc/Makefile.in --- openmpi-4.1.2/opal/mca/hwloc/hwloc201/hwloc/hwloc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/hwloc/hwloc201/hwloc/hwloc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1630,6 +1633,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1779,9 +1786,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1842,6 +1846,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1855,6 +1862,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/hwloc/hwloc201/hwloc/include/Makefile.in openmpi-4.1.4/opal/mca/hwloc/hwloc201/hwloc/include/Makefile.in --- openmpi-4.1.2/opal/mca/hwloc/hwloc201/hwloc/include/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/hwloc/hwloc201/hwloc/include/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1459,6 +1462,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1608,9 +1615,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1671,6 +1675,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1684,6 +1691,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/hwloc/hwloc201/hwloc/Makefile.in openmpi-4.1.4/opal/mca/hwloc/hwloc201/hwloc/Makefile.in --- openmpi-4.1.2/opal/mca/hwloc/hwloc201/hwloc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/hwloc/hwloc201/hwloc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/hwloc/hwloc201/Makefile.in openmpi-4.1.4/opal/mca/hwloc/hwloc201/Makefile.in --- openmpi-4.1.2/opal/mca/hwloc/hwloc201/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/hwloc/hwloc201/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1564,6 +1567,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1713,9 +1720,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1776,6 +1780,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1789,6 +1796,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/hwloc/Makefile.in openmpi-4.1.4/opal/mca/hwloc/Makefile.in --- openmpi-4.1.2/opal/mca/hwloc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/hwloc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/if/bsdx_ipv4/Makefile.in openmpi-4.1.4/opal/mca/if/bsdx_ipv4/Makefile.in --- openmpi-4.1.2/opal/mca/if/bsdx_ipv4/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/if/bsdx_ipv4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -116,6 +116,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -354,6 +355,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -390,6 +392,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1434,6 +1437,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1583,9 +1590,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1646,6 +1650,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1659,6 +1666,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/if/bsdx_ipv6/Makefile.in openmpi-4.1.4/opal/mca/if/bsdx_ipv6/Makefile.in --- openmpi-4.1.2/opal/mca/if/bsdx_ipv6/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/if/bsdx_ipv6/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -116,6 +116,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -354,6 +355,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -390,6 +392,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1434,6 +1437,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1583,9 +1590,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1646,6 +1650,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1659,6 +1666,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/if/linux_ipv6/Makefile.in openmpi-4.1.4/opal/mca/if/linux_ipv6/Makefile.in --- openmpi-4.1.2/opal/mca/if/linux_ipv6/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/if/linux_ipv6/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -116,6 +116,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -354,6 +355,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -390,6 +392,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1435,6 +1438,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1584,9 +1591,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1647,6 +1651,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1660,6 +1667,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/if/Makefile.in openmpi-4.1.4/opal/mca/if/Makefile.in --- openmpi-4.1.2/opal/mca/if/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/if/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1478,6 +1481,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1627,9 +1634,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1690,6 +1694,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1703,6 +1710,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/if/posix_ipv4/Makefile.in openmpi-4.1.4/opal/mca/if/posix_ipv4/Makefile.in --- openmpi-4.1.2/opal/mca/if/posix_ipv4/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/if/posix_ipv4/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -116,6 +116,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -354,6 +355,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -390,6 +392,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1435,6 +1438,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1584,9 +1591,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1647,6 +1651,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1660,6 +1667,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/if/solaris_ipv6/Makefile.in openmpi-4.1.4/opal/mca/if/solaris_ipv6/Makefile.in --- openmpi-4.1.2/opal/mca/if/solaris_ipv6/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/if/solaris_ipv6/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -116,6 +116,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -354,6 +355,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -390,6 +392,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1435,6 +1438,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1584,9 +1591,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1647,6 +1651,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1660,6 +1667,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/installdirs/config/Makefile.in openmpi-4.1.4/opal/mca/installdirs/config/Makefile.in --- openmpi-4.1.2/opal/mca/installdirs/config/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/installdirs/config/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1443,6 +1446,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1592,9 +1599,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1655,6 +1659,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1668,6 +1675,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/installdirs/env/Makefile.in openmpi-4.1.4/opal/mca/installdirs/env/Makefile.in --- openmpi-4.1.2/opal/mca/installdirs/env/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/installdirs/env/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1438,6 +1441,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1587,9 +1594,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1650,6 +1654,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1663,6 +1670,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/installdirs/Makefile.in openmpi-4.1.4/opal/mca/installdirs/Makefile.in --- openmpi-4.1.2/opal/mca/installdirs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/installdirs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1483,6 +1486,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1632,9 +1639,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1695,6 +1699,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1708,6 +1715,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/memchecker/Makefile.in openmpi-4.1.4/opal/mca/memchecker/Makefile.in --- openmpi-4.1.2/opal/mca/memchecker/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/memchecker/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/memchecker/valgrind/Makefile.in openmpi-4.1.4/opal/mca/memchecker/valgrind/Makefile.in --- openmpi-4.1.2/opal/mca/memchecker/valgrind/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/memchecker/valgrind/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/memcpy/Makefile.in openmpi-4.1.4/opal/mca/memcpy/Makefile.in --- openmpi-4.1.2/opal/mca/memcpy/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/memcpy/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/memory/Makefile.in openmpi-4.1.4/opal/mca/memory/Makefile.in --- openmpi-4.1.2/opal/mca/memory/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/memory/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/memory/malloc_solaris/Makefile.in openmpi-4.1.4/opal/mca/memory/malloc_solaris/Makefile.in --- openmpi-4.1.2/opal/mca/memory/malloc_solaris/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/memory/malloc_solaris/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1447,6 +1450,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1596,9 +1603,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1659,6 +1663,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1672,6 +1679,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/memory/patcher/Makefile.in openmpi-4.1.4/opal/mca/memory/patcher/Makefile.in --- openmpi-4.1.2/opal/mca/memory/patcher/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/memory/patcher/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1453,6 +1456,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1602,9 +1609,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1665,6 +1669,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1678,6 +1685,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/mpool/hugepage/Makefile.in openmpi-4.1.4/opal/mca/mpool/hugepage/Makefile.in --- openmpi-4.1.2/opal/mca/mpool/hugepage/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/mpool/hugepage/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/mpool/Makefile.in openmpi-4.1.4/opal/mca/mpool/Makefile.in --- openmpi-4.1.2/opal/mca/mpool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/mpool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -149,6 +149,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -387,6 +388,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -423,6 +425,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1506,6 +1509,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1655,9 +1662,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1718,6 +1722,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1731,6 +1738,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/mpool/memkind/Makefile.in openmpi-4.1.4/opal/mca/mpool/memkind/Makefile.in --- openmpi-4.1.2/opal/mca/mpool/memkind/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/mpool/memkind/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/patcher/linux/Makefile.in openmpi-4.1.4/opal/mca/patcher/linux/Makefile.in --- openmpi-4.1.2/opal/mca/patcher/linux/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/patcher/linux/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/patcher/Makefile.in openmpi-4.1.4/opal/mca/patcher/Makefile.in --- openmpi-4.1.2/opal/mca/patcher/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/patcher/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -150,6 +150,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -388,6 +389,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -424,6 +426,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/patcher/overwrite/Makefile.in openmpi-4.1.4/opal/mca/patcher/overwrite/Makefile.in --- openmpi-4.1.2/opal/mca/patcher/overwrite/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/patcher/overwrite/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1505,6 +1508,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1654,9 +1661,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1717,6 +1721,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1730,6 +1737,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/cray/Makefile.in openmpi-4.1.4/opal/mca/pmix/cray/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/cray/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/cray/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/ext1x/Makefile.in openmpi-4.1.4/opal/mca/pmix/ext1x/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/ext1x/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/ext1x/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/ext2x/Makefile.in openmpi-4.1.4/opal/mca/pmix/ext2x/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/ext2x/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/ext2x/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/ext3x/Makefile.in openmpi-4.1.4/opal/mca/pmix/ext3x/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/ext3x/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/ext3x/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1507,6 +1510,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1656,9 +1663,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1719,6 +1723,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1732,6 +1739,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/flux/Makefile.in openmpi-4.1.4/opal/mca/pmix/flux/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/flux/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/flux/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/flux/pmix_flux.c openmpi-4.1.4/opal/mca/pmix/flux/pmix_flux.c --- openmpi-4.1.2/opal/mca/pmix/flux/pmix_flux.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/flux/pmix_flux.c 2022-05-29 09:51:40.000000000 +0000 @@ -3,7 +3,7 @@ * Copyright (c) 2014-2019 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2016-2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -682,7 +682,6 @@ opal_pmix_op_cbfunc_t cbfunc, void *cbdata) { int rc; - int status; if (PMI_SUCCESS != (rc = PMI_Barrier())) { OPAL_PMI_ERROR(rc, "PMI_Barrier"); return OPAL_ERROR; @@ -690,7 +689,7 @@ if (NULL == cbfunc) { return OPAL_ERROR; } else { - cbfunc(status, cbdata); + cbfunc(rc, cbdata); } return OPAL_SUCCESS; } diff -Nru openmpi-4.1.2/opal/mca/pmix/isolated/Makefile.in openmpi-4.1.4/opal/mca/pmix/isolated/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/isolated/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/isolated/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1483,6 +1486,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1632,9 +1639,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1695,6 +1699,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1708,6 +1715,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/Makefile.in openmpi-4.1.4/opal/mca/pmix/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/pmix3x/Makefile.in openmpi-4.1.4/opal/mca/pmix/pmix3x/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/pmix3x/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/pmix3x/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1539,6 +1542,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1688,9 +1695,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1751,6 +1755,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1764,6 +1771,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/pmix3x/pmix/config/autogen_found_items.m4 openmpi-4.1.4/opal/mca/pmix/pmix3x/pmix/config/autogen_found_items.m4 --- openmpi-4.1.2/opal/mca/pmix/pmix3x/pmix/config/autogen_found_items.m4 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/pmix3x/pmix/config/autogen_found_items.m4 2022-05-29 09:51:40.000000000 +0000 @@ -5,8 +5,8 @@ dnl This file is automatically created by autogen.pl; it should not dnl be edited by hand!! dnl -dnl Generated by ec2-user at Wed Nov 24 16:40:55 2021 -dnl on ip-172-31-1-198.us-west-2.compute.internal. +dnl Generated by ec2-user at Thu May 26 14:32:56 2022 +dnl on ip-172-31-4-35.us-west-2.compute.internal. dnl --------------------------------------------------------------------------- m4_define([autogen_platform_file], []) diff -Nru openmpi-4.1.2/opal/mca/pmix/pmix3x/pmix3x_component.c openmpi-4.1.4/opal/mca/pmix/pmix3x/pmix3x_component.c --- openmpi-4.1.2/opal/mca/pmix/pmix3x/pmix3x_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/pmix3x/pmix3x_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (c) 2014-2018 Intel, Inc. All rights reserved. * Copyright (c) 2014-2018 Research Organization for Information Science * and Technology (RIST). All rights reserved. - * Copyright (c) 2016-2018 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2016-2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -141,7 +141,7 @@ static int external_component_query(mca_base_module_t **module, int *priority) { - char *t, *id; + char *t; /* see if a PMIx server is present */ if (NULL != (t = getenv("PMIX_NAMESPACE"))) { diff -Nru openmpi-4.1.2/opal/mca/pmix/s1/Makefile.in openmpi-4.1.4/opal/mca/pmix/s1/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/s1/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/s1/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pmix/s2/Makefile.in openmpi-4.1.4/opal/mca/pmix/s2/Makefile.in --- openmpi-4.1.2/opal/mca/pmix/s2/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pmix/s2/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pstat/linux/Makefile.in openmpi-4.1.4/opal/mca/pstat/linux/Makefile.in --- openmpi-4.1.2/opal/mca/pstat/linux/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pstat/linux/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1491,6 +1494,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1640,9 +1647,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1703,6 +1707,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1716,6 +1723,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pstat/Makefile.in openmpi-4.1.4/opal/mca/pstat/Makefile.in --- openmpi-4.1.2/opal/mca/pstat/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pstat/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/pstat/test/Makefile.in openmpi-4.1.4/opal/mca/pstat/test/Makefile.in --- openmpi-4.1.2/opal/mca/pstat/test/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/pstat/test/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/rcache/gpusm/Makefile.in openmpi-4.1.4/opal/mca/rcache/gpusm/Makefile.in --- openmpi-4.1.2/opal/mca/rcache/gpusm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/rcache/gpusm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -134,6 +134,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -372,6 +373,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -408,6 +410,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/rcache/grdma/Makefile.in openmpi-4.1.4/opal/mca/rcache/grdma/Makefile.in --- openmpi-4.1.2/opal/mca/rcache/grdma/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/rcache/grdma/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/rcache/Makefile.in openmpi-4.1.4/opal/mca/rcache/Makefile.in --- openmpi-4.1.2/opal/mca/rcache/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/rcache/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1506,6 +1509,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1655,9 +1662,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1718,6 +1722,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1731,6 +1738,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/rcache/rgpusm/Makefile.in openmpi-4.1.4/opal/mca/rcache/rgpusm/Makefile.in --- openmpi-4.1.2/opal/mca/rcache/rgpusm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/rcache/rgpusm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/rcache/udreg/Makefile.in openmpi-4.1.4/opal/mca/rcache/udreg/Makefile.in --- openmpi-4.1.2/opal/mca/rcache/udreg/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/rcache/udreg/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/reachable/Makefile.in openmpi-4.1.4/opal/mca/reachable/Makefile.in --- openmpi-4.1.2/opal/mca/reachable/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/reachable/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/reachable/netlink/configure.m4 openmpi-4.1.4/opal/mca/reachable/netlink/configure.m4 --- openmpi-4.1.2/opal/mca/reachable/netlink/configure.m4 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/reachable/netlink/configure.m4 2022-05-29 09:51:40.000000000 +0000 @@ -36,7 +36,7 @@ AS_IF([test $opal_libnl_version -eq 1], [opal_reachable_netlink_happy=0], [OPAL_CHECK_LIBNL_V3([$opal_libnl_location], - [opal_reachable_netlink]) + [reachable_netlink]) AS_IF([test "$OPAL_HAVE_LIBNL3" != "1"], [opal_reachable_netlink_happy=0])]) @@ -44,9 +44,9 @@ [$1], [$2]) - AC_SUBST([opal_reachable_netlink_CPPFLAGS]) - AC_SUBST([opal_reachable_netlink_LDFLAGS]) - AC_SUBST([opal_reachable_netlink_LIBS]) + AC_SUBST([reachable_netlink_CPPFLAGS]) + AC_SUBST([reachable_netlink_LDFLAGS]) + AC_SUBST([reachable_netlink_LIBS]) OPAL_VAR_SCOPE_POP() ]) diff -Nru openmpi-4.1.2/opal/mca/reachable/netlink/Makefile.am openmpi-4.1.4/opal/mca/reachable/netlink/Makefile.am --- openmpi-4.1.2/opal/mca/reachable/netlink/Makefile.am 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/reachable/netlink/Makefile.am 2022-05-29 09:51:40.000000000 +0000 @@ -3,6 +3,7 @@ # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. +# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -31,17 +32,17 @@ endif AM_CPPFLAGS = \ - $(opal_reachable_netlink_CPPFLAGS) \ + $(reachable_netlink_CPPFLAGS) \ -DOPAL_HAVE_LIBNL3=$(OPAL_HAVE_LIBNL3) mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_reachable_netlink_la_SOURCES = $(sources) -mca_reachable_netlink_la_LDFLAGS = -module -avoid-version +mca_reachable_netlink_la_LDFLAGS = -module -avoid-version $(reachable_netlink_LDFLAGS) mca_reachable_netlink_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \ - $(opal_reachable_netlink_LIBS) + $(reachable_netlink_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_reachable_netlink_la_SOURCES =$(sources) -libmca_reachable_netlink_la_LDFLAGS = -module -avoid-version -libmca_reachable_netlink_la_LIBADD = $(opal_reachable_netlink_LIBS) +libmca_reachable_netlink_la_LDFLAGS = -module -avoid-version $(reachable_netlink_LDFLAGS) +libmca_reachable_netlink_la_LIBADD = $(reachable_netlink_LIBS) diff -Nru openmpi-4.1.2/opal/mca/reachable/netlink/Makefile.in openmpi-4.1.4/opal/mca/reachable/netlink/Makefile.in --- openmpi-4.1.2/opal/mca/reachable/netlink/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/reachable/netlink/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -19,6 +19,7 @@ # Copyright (c) 2016 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2017 IBM Corporation. All rights reserved. +# Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -119,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1489,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1638,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1701,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1714,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ @@ -1757,20 +1769,20 @@ @MCA_BUILD_opal_reachable_netlink_DSO_FALSE@component_install = @MCA_BUILD_opal_reachable_netlink_DSO_TRUE@component_install = mca_reachable_netlink.la AM_CPPFLAGS = \ - $(opal_reachable_netlink_CPPFLAGS) \ + $(reachable_netlink_CPPFLAGS) \ -DOPAL_HAVE_LIBNL3=$(OPAL_HAVE_LIBNL3) mcacomponentdir = $(opallibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_reachable_netlink_la_SOURCES = $(sources) -mca_reachable_netlink_la_LDFLAGS = -module -avoid-version +mca_reachable_netlink_la_LDFLAGS = -module -avoid-version $(reachable_netlink_LDFLAGS) mca_reachable_netlink_la_LIBADD = $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \ - $(opal_reachable_netlink_LIBS) + $(reachable_netlink_LIBS) noinst_LTLIBRARIES = $(component_noinst) libmca_reachable_netlink_la_SOURCES = $(sources) -libmca_reachable_netlink_la_LDFLAGS = -module -avoid-version -libmca_reachable_netlink_la_LIBADD = $(opal_reachable_netlink_LIBS) +libmca_reachable_netlink_la_LDFLAGS = -module -avoid-version $(reachable_netlink_LDFLAGS) +libmca_reachable_netlink_la_LIBADD = $(reachable_netlink_LIBS) all: all-am .SUFFIXES: diff -Nru openmpi-4.1.2/opal/mca/reachable/weighted/Makefile.in openmpi-4.1.4/opal/mca/reachable/weighted/Makefile.in --- openmpi-4.1.2/opal/mca/reachable/weighted/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/reachable/weighted/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/shmem/Makefile.in openmpi-4.1.4/opal/mca/shmem/Makefile.in --- openmpi-4.1.2/opal/mca/shmem/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/shmem/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -149,6 +149,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -387,6 +388,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -423,6 +425,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/shmem/mmap/Makefile.in openmpi-4.1.4/opal/mca/shmem/mmap/Makefile.in --- openmpi-4.1.2/opal/mca/shmem/mmap/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/shmem/mmap/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/shmem/posix/Makefile.in openmpi-4.1.4/opal/mca/shmem/posix/Makefile.in --- openmpi-4.1.2/opal/mca/shmem/posix/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/shmem/posix/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/shmem/sysv/Makefile.in openmpi-4.1.4/opal/mca/shmem/sysv/Makefile.in --- openmpi-4.1.2/opal/mca/shmem/sysv/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/shmem/sysv/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -108,6 +108,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -346,6 +347,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -382,6 +384,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1474,6 +1477,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1623,9 +1630,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1686,6 +1690,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1699,6 +1706,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/timer/altix/Makefile.in openmpi-4.1.4/opal/mca/timer/altix/Makefile.in --- openmpi-4.1.2/opal/mca/timer/altix/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/timer/altix/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1443,6 +1446,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1592,9 +1599,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1655,6 +1659,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1668,6 +1675,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/timer/darwin/Makefile.in openmpi-4.1.4/opal/mca/timer/darwin/Makefile.in --- openmpi-4.1.2/opal/mca/timer/darwin/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/timer/darwin/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1444,6 +1447,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1593,9 +1600,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1656,6 +1660,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1669,6 +1676,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/timer/linux/Makefile.in openmpi-4.1.4/opal/mca/timer/linux/Makefile.in --- openmpi-4.1.2/opal/mca/timer/linux/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/timer/linux/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1475,6 +1478,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1624,9 +1631,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1687,6 +1691,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1700,6 +1707,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/timer/Makefile.in openmpi-4.1.4/opal/mca/timer/Makefile.in --- openmpi-4.1.2/opal/mca/timer/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/timer/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/mca/timer/solaris/Makefile.in openmpi-4.1.4/opal/mca/timer/solaris/Makefile.in --- openmpi-4.1.2/opal/mca/timer/solaris/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/mca/timer/solaris/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1445,6 +1448,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1594,9 +1601,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1657,6 +1661,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1670,6 +1677,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/threads/thread_usage.h openmpi-4.1.4/opal/threads/thread_usage.h --- openmpi-4.1.2/opal/threads/thread_usage.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/threads/thread_usage.h 2022-05-29 09:51:40.000000000 +0000 @@ -10,7 +10,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007-2014 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2014-2016 Research Organization for Information Science * and Technology (RIST). All rights reserved. * Copyright (c) 2015-2017 Los Alamos National Security, LLC. All rights @@ -88,7 +88,7 @@ } -// Back-ported from master (2019-05-04) as part of +// Back-ported from main (2019-05-04) as part of // a16cf0e4dd6df4dea820fecedd5920df632935b8 typedef volatile size_t opal_atomic_size_t; diff -Nru openmpi-4.1.2/opal/tools/opal-checkpoint/Makefile.in openmpi-4.1.4/opal/tools/opal-checkpoint/Makefile.in --- openmpi-4.1.2/opal/tools/opal-checkpoint/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/tools/opal-checkpoint/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -143,6 +143,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -381,6 +382,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -417,6 +419,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/tools/opal-restart/Makefile.in openmpi-4.1.4/opal/tools/opal-restart/Makefile.in --- openmpi-4.1.2/opal/tools/opal-restart/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/tools/opal-restart/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -143,6 +143,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -381,6 +382,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -417,6 +419,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/tools/wrappers/Makefile.in openmpi-4.1.4/opal/tools/wrappers/Makefile.in --- openmpi-4.1.2/opal/tools/wrappers/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/tools/wrappers/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/util/keyval/Makefile.in openmpi-4.1.4/opal/util/keyval/Makefile.in --- openmpi-4.1.2/opal/util/keyval/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/util/keyval/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1454,6 +1457,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1603,9 +1610,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1666,6 +1670,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1679,6 +1686,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/opal/util/Makefile.in openmpi-4.1.4/opal/util/Makefile.in --- openmpi-4.1.2/opal/util/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/opal/util/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -136,6 +136,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -374,6 +375,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -410,6 +412,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1566,6 +1569,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1715,9 +1722,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1778,6 +1782,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1791,6 +1798,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/etc/Makefile.in openmpi-4.1.4/orte/etc/Makefile.in --- openmpi-4.1.2/orte/etc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/etc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1395,6 +1398,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1544,9 +1551,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1607,6 +1611,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1620,6 +1627,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/include/Makefile.in openmpi-4.1.4/orte/include/Makefile.in --- openmpi-4.1.2/orte/include/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/include/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -149,6 +149,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -387,6 +388,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -423,6 +425,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1469,6 +1472,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1618,9 +1625,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1681,6 +1685,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1694,6 +1701,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/Makefile.in openmpi-4.1.4/orte/Makefile.in --- openmpi-4.1.2/orte/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -334,6 +334,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -572,6 +573,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -608,6 +610,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1796,6 +1799,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1945,9 +1952,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -2008,6 +2012,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -2021,6 +2028,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/common/alps/Makefile.in openmpi-4.1.4/orte/mca/common/alps/Makefile.in --- openmpi-4.1.2/orte/mca/common/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/common/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1492,6 +1495,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1641,9 +1648,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1704,6 +1708,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1717,6 +1724,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/common/Makefile.in openmpi-4.1.4/orte/mca/common/Makefile.in --- openmpi-4.1.2/orte/mca/common/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/common/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1395,6 +1398,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1544,9 +1551,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1607,6 +1611,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1620,6 +1627,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/errmgr/default_app/Makefile.in openmpi-4.1.4/orte/mca/errmgr/default_app/Makefile.in --- openmpi-4.1.2/orte/mca/errmgr/default_app/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/errmgr/default_app/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/errmgr/default_hnp/Makefile.in openmpi-4.1.4/orte/mca/errmgr/default_hnp/Makefile.in --- openmpi-4.1.2/orte/mca/errmgr/default_hnp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/errmgr/default_hnp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/errmgr/default_orted/Makefile.in openmpi-4.1.4/orte/mca/errmgr/default_orted/Makefile.in --- openmpi-4.1.2/orte/mca/errmgr/default_orted/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/errmgr/default_orted/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/errmgr/default_tool/Makefile.in openmpi-4.1.4/orte/mca/errmgr/default_tool/Makefile.in --- openmpi-4.1.2/orte/mca/errmgr/default_tool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/errmgr/default_tool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/errmgr/Makefile.in openmpi-4.1.4/orte/mca/errmgr/Makefile.in --- openmpi-4.1.2/orte/mca/errmgr/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/errmgr/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/alps/Makefile.in openmpi-4.1.4/orte/mca/ess/alps/Makefile.in --- openmpi-4.1.2/orte/mca/ess/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/env/Makefile.in openmpi-4.1.4/orte/mca/ess/env/Makefile.in --- openmpi-4.1.2/orte/mca/ess/env/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/env/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/hnp/Makefile.in openmpi-4.1.4/orte/mca/ess/hnp/Makefile.in --- openmpi-4.1.2/orte/mca/ess/hnp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/hnp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1492,6 +1495,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1641,9 +1648,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1704,6 +1708,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1717,6 +1724,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/lsf/Makefile.in openmpi-4.1.4/orte/mca/ess/lsf/Makefile.in --- openmpi-4.1.2/orte/mca/ess/lsf/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/lsf/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1492,6 +1495,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1641,9 +1648,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1704,6 +1708,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1717,6 +1724,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/Makefile.in openmpi-4.1.4/orte/mca/ess/Makefile.in --- openmpi-4.1.2/orte/mca/ess/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/pmi/Makefile.in openmpi-4.1.4/orte/mca/ess/pmi/Makefile.in --- openmpi-4.1.2/orte/mca/ess/pmi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/pmi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/singleton/Makefile.in openmpi-4.1.4/orte/mca/ess/singleton/Makefile.in --- openmpi-4.1.2/orte/mca/ess/singleton/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/singleton/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1493,6 +1496,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1642,9 +1649,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1705,6 +1709,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1718,6 +1725,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/slurm/Makefile.in openmpi-4.1.4/orte/mca/ess/slurm/Makefile.in --- openmpi-4.1.2/orte/mca/ess/slurm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/slurm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/tm/Makefile.in openmpi-4.1.4/orte/mca/ess/tm/Makefile.in --- openmpi-4.1.2/orte/mca/ess/tm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/tm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ess/tool/Makefile.in openmpi-4.1.4/orte/mca/ess/tool/Makefile.in --- openmpi-4.1.2/orte/mca/ess/tool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ess/tool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1491,6 +1494,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1640,9 +1647,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1703,6 +1707,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1716,6 +1723,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/filem/Makefile.in openmpi-4.1.4/orte/mca/filem/Makefile.in --- openmpi-4.1.2/orte/mca/filem/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/filem/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -160,6 +160,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -398,6 +399,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -434,6 +436,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1517,6 +1520,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1666,9 +1673,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1729,6 +1733,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1742,6 +1749,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/filem/raw/Makefile.in openmpi-4.1.4/orte/mca/filem/raw/Makefile.in --- openmpi-4.1.2/orte/mca/filem/raw/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/filem/raw/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/grpcomm/direct/Makefile.in openmpi-4.1.4/orte/mca/grpcomm/direct/Makefile.in --- openmpi-4.1.2/orte/mca/grpcomm/direct/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/grpcomm/direct/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/grpcomm/Makefile.in openmpi-4.1.4/orte/mca/grpcomm/Makefile.in --- openmpi-4.1.2/orte/mca/grpcomm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/grpcomm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -147,6 +147,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -385,6 +386,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -421,6 +423,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/iof/hnp/Makefile.in openmpi-4.1.4/orte/mca/iof/hnp/Makefile.in --- openmpi-4.1.2/orte/mca/iof/hnp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/iof/hnp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/iof/Makefile.in openmpi-4.1.4/orte/mca/iof/Makefile.in --- openmpi-4.1.2/orte/mca/iof/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/iof/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -146,6 +146,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -384,6 +385,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -420,6 +422,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/iof/orted/Makefile.in openmpi-4.1.4/orte/mca/iof/orted/Makefile.in --- openmpi-4.1.2/orte/mca/iof/orted/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/iof/orted/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/iof/tool/Makefile.in openmpi-4.1.4/orte/mca/iof/tool/Makefile.in --- openmpi-4.1.2/orte/mca/iof/tool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/iof/tool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/odls/alps/Makefile.in openmpi-4.1.4/orte/mca/odls/alps/Makefile.in --- openmpi-4.1.2/orte/mca/odls/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/odls/default/Makefile.in openmpi-4.1.4/orte/mca/odls/default/Makefile.in --- openmpi-4.1.2/orte/mca/odls/default/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/default/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/odls/default/odls_default_component.c openmpi-4.1.4/orte/mca/odls/default/odls_default_component.c --- openmpi-4.1.2/orte/mca/odls/default/odls_default_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/default/odls_default_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -13,6 +13,7 @@ * Copyright (c) 2015 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2017 Intel, Inc. All rights reserved. + * Copyright (c) 2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -60,6 +61,7 @@ /* Component open and close functions */ .mca_open_component = orte_odls_default_component_open, .mca_close_component = orte_odls_default_component_close, + .mca_register_component_params = orte_odls_default_component_register, .mca_query_component = orte_odls_default_component_query, }, .base_data = { @@ -68,6 +70,7 @@ }, }; +int orte_odls_default_maxfd = 1024; int orte_odls_default_component_open(void) @@ -75,6 +78,20 @@ return ORTE_SUCCESS; } +int orte_odls_default_component_register(void) +{ + mca_base_component_var_register(&mca_odls_default_component.version, "maxfd", + "In non-Linux environments, use this value as a maximum number of file descriptors to close when forking a new child process", + MCA_BASE_VAR_TYPE_INT, + NULL, + 0, + 0, + OPAL_INFO_LVL_6, + MCA_BASE_VAR_SCOPE_READONLY, + &orte_odls_default_maxfd); + return ORTE_SUCCESS; +} + int orte_odls_default_component_query(mca_base_module_t **module, int *priority) { /* the base open/select logic protects us against operation when diff -Nru openmpi-4.1.2/orte/mca/odls/default/odls_default.h openmpi-4.1.4/orte/mca/odls/default/odls_default.h --- openmpi-4.1.2/orte/mca/odls/default/odls_default.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/default/odls_default.h 2022-05-29 09:51:40.000000000 +0000 @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2022 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -35,6 +36,7 @@ */ int orte_odls_default_component_open(void); int orte_odls_default_component_close(void); +int orte_odls_default_component_register(void); int orte_odls_default_component_query(mca_base_module_t **module, int *priority); /* @@ -43,6 +45,11 @@ extern orte_odls_base_module_t orte_odls_default_module; ORTE_MODULE_DECLSPEC extern orte_odls_base_component_t mca_odls_default_component; +/* In non-Linux environments where we can't just see which fd's are + open (e.g., MacOS), use this value as the maximum number of FDs + to close when forking a new child process. */ +extern int orte_odls_default_maxfd; + END_C_DECLS #endif /* ORTE_ODLS_H */ diff -Nru openmpi-4.1.2/orte/mca/odls/default/odls_default_module.c openmpi-4.1.4/orte/mca/odls/default/odls_default_module.c --- openmpi-4.1.2/orte/mca/odls/default/odls_default_module.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/default/odls_default_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2008 The University of Tennessee and The University + * Copyright (c) 2004-2022 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -11,7 +11,7 @@ * All rights reserved. * Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007 Evergrid, Inc. All rights reserved. - * Copyright (c) 2008-2017 Cisco Systems, Inc. All rights reserved + * Copyright (c) 2008-2022 Cisco Systems, Inc. All rights reserved * Copyright (c) 2010 IBM Corporation. All rights reserved. * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights * reserved. @@ -297,7 +297,11 @@ and the pipe up to the parent. */ static int close_open_file_descriptors(int write_fd, orte_iof_base_io_conf_t opts) { +#if defined(__OSX__) + DIR *dir = opendir("/dev/fd"); +#else /* Linux */ DIR *dir = opendir("/proc/self/fd"); +#endif /* defined(__OSX__) */ if (NULL == dir) { return ORTE_ERR_FILE_OPEN_FAILURE; } @@ -310,7 +314,6 @@ return ORTE_ERR_FILE_OPEN_FAILURE; } - while (NULL != (files = readdir(dir))) { if (!isdigit(files->d_name[0])) { continue; @@ -337,7 +340,6 @@ { int i; sigset_t sigs; - long fd, fdmax = sysconf(_SC_OPEN_MAX); char dir[MAXPATHLEN]; #if HAVE_SETPGID @@ -400,8 +402,27 @@ the pipe used for the IOF INTERNAL messages, and the pipe up to the parent. */ if (ORTE_SUCCESS != close_open_file_descriptors(write_fd, cd->opts)) { + /* On some versions of MacOS (e.g., 12.3.1), we have seen + sysconf(_SC_OPEN_MAX) -- and "ulimit -n" -- return very + large numbers, and sometime return -1 (which means + "unlimited"). This can result in an unreasonably large + loop over closing all FDs (especially if -1 gets + interpreted as LONG_MAX). + https://github.com/open-mpi/ompi/issues/10358 has some + links to others who have seen this kind of behavior. + + Protect against -1 and arbitrarily large values being + returned from sysconf(_SC_OPEN_MAX): use an MCA param to + cap the max value that we'll use, just in case there's an + actual reason for a user to change the built-in default + value that we're (somewhat arbitrarily) picking. */ + long fd, fdmax = sysconf(_SC_OPEN_MAX); + if (-1 == fdmax || orte_odls_default_maxfd < fdmax) { + fdmax = orte_odls_default_maxfd; + } + // close *all* file descriptors -- slow - for(fd=3; fdopts.p_internal[1] && diff -Nru openmpi-4.1.2/orte/mca/odls/Makefile.in openmpi-4.1.4/orte/mca/odls/Makefile.in --- openmpi-4.1.2/orte/mca/odls/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/odls/pspawn/Makefile.in openmpi-4.1.4/orte/mca/odls/pspawn/Makefile.in --- openmpi-4.1.2/orte/mca/odls/pspawn/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/pspawn/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/odls/pspawn/odls_pspawn.c openmpi-4.1.4/orte/mca/odls/pspawn/odls_pspawn.c --- openmpi-4.1.2/orte/mca/odls/pspawn/odls_pspawn.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/odls/pspawn/odls_pspawn.c 2022-05-29 09:51:40.000000000 +0000 @@ -2,7 +2,7 @@ * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * University Research and Technology * Corporation. All rights reserved. - * Copyright (c) 2004-2008 The University of Tennessee and The University + * Copyright (c) 2004-2022 The University of Tennessee and The University * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, @@ -226,7 +226,11 @@ and the pipe up to the parent. */ static int close_open_file_descriptors(posix_spawn_file_actions_t *factions) { +#if defined(__OSX__) + DIR *dir = opendir("/dev/fd"); +#else /* Linux */ DIR *dir = opendir("/proc/self/fd"); +#endif /* defined(__OSX__) */ if (NULL == dir) { return ORTE_ERR_FILE_OPEN_FAILURE; } diff -Nru openmpi-4.1.2/orte/mca/oob/alps/Makefile.in openmpi-4.1.4/orte/mca/oob/alps/Makefile.in --- openmpi-4.1.2/orte/mca/oob/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/oob/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/oob/Makefile.in openmpi-4.1.4/orte/mca/oob/Makefile.in --- openmpi-4.1.2/orte/mca/oob/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/oob/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -149,6 +149,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -387,6 +388,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -423,6 +425,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/oob/tcp/Makefile.in openmpi-4.1.4/orte/mca/oob/tcp/Makefile.in --- openmpi-4.1.2/orte/mca/oob/tcp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/oob/tcp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/oob/tcp/oob_tcp_component.c openmpi-4.1.4/orte/mca/oob/tcp/oob_tcp_component.c --- openmpi-4.1.2/orte/mca/oob/tcp/oob_tcp_component.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/oob/tcp/oob_tcp_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -1237,8 +1237,8 @@ */ static char **split_and_resolve(char **orig_str, char *name) { - int i, ret, save, if_index; - char **argv, *str, *tmp; + int i, n, ret, if_index, match_count, interface_count; + char **argv, **interfaces, *str, *tmp; char if_name[IF_NAMESIZE]; struct sockaddr_storage argv_inaddr, if_inaddr; uint32_t argv_prefix; @@ -1252,9 +1252,22 @@ if (NULL == argv) { return NULL; } - for (save = i = 0; NULL != argv[i]; ++i) { + interface_count = 0; + interfaces = NULL; + for (i = 0; NULL != argv[i]; ++i) { if (isalpha(argv[i][0])) { - argv[save++] = argv[i]; + /* This is an interface name. If not already in the interfaces array, add it */ + for (n = 0; n < interface_count; n++) { + if (0 == strcmp(argv[i], interfaces[n])) { + break; + } + } + if (n == interface_count) { + opal_output_verbose(20, + orte_oob_base_framework.framework_output, + "oob:tcp: Using interface: %s ", argv[i]); + opal_argv_append(&interface_count, &interfaces, argv[i]); + } continue; } @@ -1295,6 +1308,7 @@ argv_prefix); /* Go through all interfaces and see if we can find a match */ + match_count = 0; for (if_index = opal_ifbegin(); if_index >= 0; if_index = opal_ifnext(if_index)) { opal_ifindextoaddr(if_index, @@ -1303,11 +1317,27 @@ if (opal_net_samenetwork((struct sockaddr*) &argv_inaddr, (struct sockaddr*) &if_inaddr, argv_prefix)) { - break; + /* We found a match. If it's not already in the interfaces array, + add it. If it's already in the array, treat it as a match */ + match_count = match_count + 1; + opal_ifindextoname(if_index, if_name, sizeof(if_name)); + for (n = 0; n < interface_count; n++) { + if (0 == strcmp(if_name, interfaces[n])) { + break; + } + } + if (n == interface_count) { + opal_output_verbose(20, + orte_oob_base_framework.framework_output, + "oob:tcp: Found match: %s (%s)", + opal_net_get_hostname((struct sockaddr*) &if_inaddr), + if_name); + opal_argv_append(&interface_count, &interfaces, if_name); + } } } /* If we didn't find a match, keep trying */ - if (if_index < 0) { + if (0 == match_count) { orte_show_help("help-oob-tcp.txt", "invalid if_inexclude", true, name, orte_process_info.nodename, tmp, "Did not find interface matching this subnet"); @@ -1315,24 +1345,17 @@ continue; } - /* We found a match; get the name and replace it in the - argv */ - opal_ifindextoname(if_index, if_name, sizeof(if_name)); - opal_output_verbose(20, orte_oob_base_framework.framework_output, - "%s oob:tcp: Found match: %s (%s)", - ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), - opal_net_get_hostname((struct sockaddr*) &if_inaddr), - if_name); - argv[save++] = strdup(if_name); free(tmp); } - /* The list may have been compressed if there were invalid - entries, so ensure we end it with a NULL entry */ - argv[save] = NULL; + /* Mark the end of the interface name array with NULL */ + if (NULL != interfaces) { + interfaces[interface_count] = NULL; + } + free(argv); free(*orig_str); - *orig_str = opal_argv_join(argv, ','); - return argv; + *orig_str = opal_argv_join(interfaces, ','); + return interfaces; } /* OOB TCP Class instances */ diff -Nru openmpi-4.1.2/orte/mca/plm/alps/Makefile.in openmpi-4.1.4/orte/mca/plm/alps/Makefile.in --- openmpi-4.1.2/orte/mca/plm/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1502,6 +1505,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1651,9 +1658,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1714,6 +1718,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1727,6 +1734,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/plm/isolated/Makefile.in openmpi-4.1.4/orte/mca/plm/isolated/Makefile.in --- openmpi-4.1.2/orte/mca/plm/isolated/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/isolated/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1493,6 +1496,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1642,9 +1649,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1705,6 +1709,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1718,6 +1725,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/plm/lsf/Makefile.in openmpi-4.1.4/orte/mca/plm/lsf/Makefile.in --- openmpi-4.1.2/orte/mca/plm/lsf/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/lsf/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/plm/Makefile.in openmpi-4.1.4/orte/mca/plm/Makefile.in --- openmpi-4.1.2/orte/mca/plm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1505,6 +1508,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1654,9 +1661,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1717,6 +1721,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1730,6 +1737,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/plm/rsh/Makefile.in openmpi-4.1.4/orte/mca/plm/rsh/Makefile.in --- openmpi-4.1.2/orte/mca/plm/rsh/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/rsh/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1493,6 +1496,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1642,9 +1649,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1705,6 +1709,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1718,6 +1725,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/plm/slurm/Makefile.in openmpi-4.1.4/orte/mca/plm/slurm/Makefile.in --- openmpi-4.1.2/orte/mca/plm/slurm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/slurm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/plm/tm/Makefile.in openmpi-4.1.4/orte/mca/plm/tm/Makefile.in --- openmpi-4.1.2/orte/mca/plm/tm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/plm/tm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/alps/Makefile.in openmpi-4.1.4/orte/mca/ras/alps/Makefile.in --- openmpi-4.1.2/orte/mca/ras/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1504,6 +1507,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1653,9 +1660,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1716,6 +1720,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1729,6 +1736,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/gridengine/Makefile.in openmpi-4.1.4/orte/mca/ras/gridengine/Makefile.in --- openmpi-4.1.2/orte/mca/ras/gridengine/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/gridengine/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1499,6 +1502,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1648,9 +1655,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1711,6 +1715,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1724,6 +1731,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/lsf/Makefile.in openmpi-4.1.4/orte/mca/ras/lsf/Makefile.in --- openmpi-4.1.2/orte/mca/ras/lsf/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/lsf/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/Makefile.in openmpi-4.1.4/orte/mca/ras/Makefile.in --- openmpi-4.1.2/orte/mca/ras/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/simulator/Makefile.in openmpi-4.1.4/orte/mca/ras/simulator/Makefile.in --- openmpi-4.1.2/orte/mca/ras/simulator/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/simulator/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1495,6 +1498,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1644,9 +1651,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1707,6 +1711,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1720,6 +1727,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/slurm/Makefile.in openmpi-4.1.4/orte/mca/ras/slurm/Makefile.in --- openmpi-4.1.2/orte/mca/ras/slurm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/slurm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1502,6 +1505,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1651,9 +1658,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1714,6 +1718,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1727,6 +1734,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/ras/tm/Makefile.in openmpi-4.1.4/orte/mca/ras/tm/Makefile.in --- openmpi-4.1.2/orte/mca/ras/tm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/ras/tm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/regx/fwd/Makefile.in openmpi-4.1.4/orte/mca/regx/fwd/Makefile.in --- openmpi-4.1.2/orte/mca/regx/fwd/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/regx/fwd/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1480,6 +1483,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1629,9 +1636,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1692,6 +1696,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1705,6 +1712,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/regx/Makefile.in openmpi-4.1.4/orte/mca/regx/Makefile.in --- openmpi-4.1.2/orte/mca/regx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/regx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/regx/naive/Makefile.in openmpi-4.1.4/orte/mca/regx/naive/Makefile.in --- openmpi-4.1.2/orte/mca/regx/naive/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/regx/naive/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1480,6 +1483,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1629,9 +1636,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1692,6 +1696,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1705,6 +1712,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/regx/reverse/Makefile.in openmpi-4.1.4/orte/mca/regx/reverse/Makefile.in --- openmpi-4.1.2/orte/mca/regx/reverse/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/regx/reverse/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/Makefile.in openmpi-4.1.4/orte/mca/rmaps/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -150,6 +150,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -388,6 +389,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -424,6 +426,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1508,6 +1511,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1657,9 +1664,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1720,6 +1724,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1733,6 +1740,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/mindist/Makefile.in openmpi-4.1.4/orte/mca/rmaps/mindist/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/mindist/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/mindist/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/ppr/Makefile.in openmpi-4.1.4/orte/mca/rmaps/ppr/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/ppr/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/ppr/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/rank_file/Makefile.in openmpi-4.1.4/orte/mca/rmaps/rank_file/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/rank_file/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/rank_file/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1511,6 +1514,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1660,9 +1667,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1723,6 +1727,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1736,6 +1743,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/resilient/Makefile.in openmpi-4.1.4/orte/mca/rmaps/resilient/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/resilient/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/resilient/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/round_robin/Makefile.in openmpi-4.1.4/orte/mca/rmaps/round_robin/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/round_robin/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/round_robin/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rmaps/seq/Makefile.in openmpi-4.1.4/orte/mca/rmaps/seq/Makefile.in --- openmpi-4.1.2/orte/mca/rmaps/seq/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rmaps/seq/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1494,6 +1497,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1643,9 +1650,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1706,6 +1710,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1719,6 +1726,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rml/Makefile.in openmpi-4.1.4/orte/mca/rml/Makefile.in --- openmpi-4.1.2/orte/mca/rml/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rml/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -148,6 +148,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -386,6 +387,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -422,6 +424,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rml/oob/Makefile.in openmpi-4.1.4/orte/mca/rml/oob/Makefile.in --- openmpi-4.1.2/orte/mca/rml/oob/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rml/oob/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/routed/binomial/Makefile.in openmpi-4.1.4/orte/mca/routed/binomial/Makefile.in --- openmpi-4.1.2/orte/mca/routed/binomial/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/routed/binomial/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -121,6 +121,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -359,6 +360,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -395,6 +397,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1487,6 +1490,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1636,9 +1643,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1699,6 +1703,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1712,6 +1719,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/routed/direct/Makefile.in openmpi-4.1.4/orte/mca/routed/direct/Makefile.in --- openmpi-4.1.2/orte/mca/routed/direct/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/routed/direct/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/routed/Makefile.in openmpi-4.1.4/orte/mca/routed/Makefile.in --- openmpi-4.1.2/orte/mca/routed/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/routed/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/routed/radix/Makefile.in openmpi-4.1.4/orte/mca/routed/radix/Makefile.in --- openmpi-4.1.2/orte/mca/routed/radix/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/routed/radix/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rtc/hwloc/Makefile.in openmpi-4.1.4/orte/mca/rtc/hwloc/Makefile.in --- openmpi-4.1.2/orte/mca/rtc/hwloc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rtc/hwloc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/rtc/Makefile.in openmpi-4.1.4/orte/mca/rtc/Makefile.in --- openmpi-4.1.2/orte/mca/rtc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/rtc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/alps/Makefile.in openmpi-4.1.4/orte/mca/schizo/alps/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/alps/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/alps/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/flux/Makefile.in openmpi-4.1.4/orte/mca/schizo/flux/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/flux/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/flux/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/jsm/Makefile.in openmpi-4.1.4/orte/mca/schizo/jsm/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/jsm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/jsm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1480,6 +1483,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1629,9 +1636,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1692,6 +1696,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1705,6 +1712,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/Makefile.in openmpi-4.1.4/orte/mca/schizo/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/moab/Makefile.in openmpi-4.1.4/orte/mca/schizo/moab/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/moab/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/moab/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1483,6 +1486,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1632,9 +1639,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1695,6 +1699,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1708,6 +1715,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/ompi/Makefile.in openmpi-4.1.4/orte/mca/schizo/ompi/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/ompi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/ompi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/orte/Makefile.in openmpi-4.1.4/orte/mca/schizo/orte/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/orte/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/orte/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/singularity/Makefile.in openmpi-4.1.4/orte/mca/schizo/singularity/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/singularity/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/singularity/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/schizo/slurm/Makefile.in openmpi-4.1.4/orte/mca/schizo/slurm/Makefile.in --- openmpi-4.1.2/orte/mca/schizo/slurm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/schizo/slurm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/snapc/full/Makefile.in openmpi-4.1.4/orte/mca/snapc/full/Makefile.in --- openmpi-4.1.2/orte/mca/snapc/full/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/snapc/full/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -126,6 +126,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -364,6 +365,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -400,6 +402,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1493,6 +1496,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1642,9 +1649,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1705,6 +1709,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1718,6 +1725,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/snapc/Makefile.in openmpi-4.1.4/orte/mca/snapc/Makefile.in --- openmpi-4.1.2/orte/mca/snapc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/snapc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -161,6 +161,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -399,6 +400,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -435,6 +437,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1519,6 +1522,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1668,9 +1675,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1731,6 +1735,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1744,6 +1751,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/sstore/central/Makefile.in openmpi-4.1.4/orte/mca/sstore/central/Makefile.in --- openmpi-4.1.2/orte/mca/sstore/central/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/sstore/central/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/sstore/Makefile.in openmpi-4.1.4/orte/mca/sstore/Makefile.in --- openmpi-4.1.2/orte/mca/sstore/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/sstore/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1502,6 +1505,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1651,9 +1658,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1714,6 +1718,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1727,6 +1734,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/sstore/stage/Makefile.in openmpi-4.1.4/orte/mca/sstore/stage/Makefile.in --- openmpi-4.1.2/orte/mca/sstore/stage/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/sstore/stage/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1489,6 +1492,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1638,9 +1645,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1701,6 +1705,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1714,6 +1721,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/state/app/Makefile.in openmpi-4.1.4/orte/mca/state/app/Makefile.in --- openmpi-4.1.2/orte/mca/state/app/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/state/app/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/state/hnp/Makefile.in openmpi-4.1.4/orte/mca/state/hnp/Makefile.in --- openmpi-4.1.2/orte/mca/state/hnp/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/state/hnp/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/state/Makefile.in openmpi-4.1.4/orte/mca/state/Makefile.in --- openmpi-4.1.2/orte/mca/state/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/state/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -131,6 +131,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -369,6 +370,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -405,6 +407,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/state/novm/Makefile.in openmpi-4.1.4/orte/mca/state/novm/Makefile.in --- openmpi-4.1.2/orte/mca/state/novm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/state/novm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/state/orted/Makefile.in openmpi-4.1.4/orte/mca/state/orted/Makefile.in --- openmpi-4.1.2/orte/mca/state/orted/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/state/orted/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/mca/state/tool/Makefile.in openmpi-4.1.4/orte/mca/state/tool/Makefile.in --- openmpi-4.1.2/orte/mca/state/tool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/mca/state/tool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1480,6 +1483,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1629,9 +1636,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1692,6 +1696,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1705,6 +1712,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/orted/orted-mpir/Makefile.in openmpi-4.1.4/orte/orted/orted-mpir/Makefile.in --- openmpi-4.1.2/orte/orted/orted-mpir/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/orted/orted-mpir/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1429,6 +1432,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1578,9 +1585,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1641,6 +1645,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1654,6 +1661,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/tools/orte-clean/Makefile.in openmpi-4.1.4/orte/tools/orte-clean/Makefile.in --- openmpi-4.1.2/orte/tools/orte-clean/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/tools/orte-clean/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -142,6 +142,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -380,6 +381,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -416,6 +418,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/tools/orted/Makefile.in openmpi-4.1.4/orte/tools/orted/Makefile.in --- openmpi-4.1.2/orte/tools/orted/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/tools/orted/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -141,6 +141,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -379,6 +380,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -415,6 +417,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1496,6 +1499,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1645,9 +1652,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1708,6 +1712,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1721,6 +1728,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/tools/orte-info/Makefile.in openmpi-4.1.4/orte/tools/orte-info/Makefile.in --- openmpi-4.1.2/orte/tools/orte-info/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/tools/orte-info/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -144,6 +144,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -382,6 +383,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -418,6 +420,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1501,6 +1504,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1650,9 +1657,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1713,6 +1717,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1726,6 +1733,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/tools/orterun/Makefile.in openmpi-4.1.4/orte/tools/orterun/Makefile.in --- openmpi-4.1.2/orte/tools/orterun/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/tools/orterun/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -144,6 +144,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -382,6 +383,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -418,6 +420,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1500,6 +1503,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1649,9 +1656,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1712,6 +1716,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1725,6 +1732,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/tools/orte-server/Makefile.in openmpi-4.1.4/orte/tools/orte-server/Makefile.in --- openmpi-4.1.2/orte/tools/orte-server/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/tools/orte-server/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -142,6 +142,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -380,6 +381,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -416,6 +418,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1498,6 +1501,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1647,9 +1654,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1710,6 +1714,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1723,6 +1730,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/orte/tools/wrappers/Makefile.in openmpi-4.1.4/orte/tools/wrappers/Makefile.in --- openmpi-4.1.2/orte/tools/wrappers/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/orte/tools/wrappers/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1430,6 +1433,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1579,9 +1586,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1642,6 +1646,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1655,6 +1662,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/include/Makefile.in openmpi-4.1.4/oshmem/include/Makefile.in --- openmpi-4.1.2/oshmem/include/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/include/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1457,6 +1460,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1606,9 +1613,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1669,6 +1673,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1682,6 +1689,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/Makefile.in openmpi-4.1.4/oshmem/Makefile.in --- openmpi-4.1.2/oshmem/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -273,6 +273,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -511,6 +512,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -547,6 +549,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1698,6 +1701,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1847,9 +1854,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1910,6 +1914,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1923,6 +1930,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/atomic/basic/Makefile.in openmpi-4.1.4/oshmem/mca/atomic/basic/Makefile.in --- openmpi-4.1.2/oshmem/mca/atomic/basic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/atomic/basic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/atomic/Makefile.in openmpi-4.1.4/oshmem/mca/atomic/Makefile.in --- openmpi-4.1.2/oshmem/mca/atomic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/atomic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1482,6 +1485,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1631,9 +1638,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1694,6 +1698,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1707,6 +1714,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/atomic/mxm/Makefile.in openmpi-4.1.4/oshmem/mca/atomic/mxm/Makefile.in --- openmpi-4.1.2/oshmem/mca/atomic/mxm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/atomic/mxm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/atomic/ucx/atomic_ucx_cswap.c openmpi-4.1.4/oshmem/mca/atomic/ucx/atomic_ucx_cswap.c --- openmpi-4.1.2/oshmem/mca/atomic/ucx/atomic_ucx_cswap.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/atomic/ucx/atomic_ucx_cswap.c 2022-05-29 09:51:40.000000000 +0000 @@ -29,7 +29,7 @@ { ucs_status_ptr_t status_ptr; spml_ucx_mkey_t *ucx_mkey; - uint64_t rva; + void *rva = NULL; mca_spml_ucx_ctx_t *ucx_ctx = (mca_spml_ucx_ctx_t *)ctx; #if HAVE_DECL_UCP_ATOMIC_OP_NBX ucp_request_param_t param = { @@ -48,16 +48,16 @@ assert(NULL != prev); *prev = value; - ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, pe, target, (void *)&rva, mca_spml_self); + ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, pe, target, &rva, mca_spml_self); assert(NULL != ucx_mkey); #if HAVE_DECL_UCP_ATOMIC_OP_NBX status_ptr = ucp_atomic_op_nbx(ucx_ctx->ucp_peers[pe].ucp_conn, - UCP_ATOMIC_OP_CSWAP, &cond, 1, rva, + UCP_ATOMIC_OP_CSWAP, &cond, 1, (uint64_t)rva, ucx_mkey->rkey, ¶m); #else status_ptr = ucp_atomic_fetch_nb(ucx_ctx->ucp_peers[pe].ucp_conn, UCP_ATOMIC_FETCH_OP_CSWAP, cond, prev, size, - rva, ucx_mkey->rkey, + (uint64_t)rva, ucx_mkey->rkey, opal_common_ucx_empty_complete_cb); #endif diff -Nru openmpi-4.1.2/oshmem/mca/atomic/ucx/atomic_ucx_module.c openmpi-4.1.4/oshmem/mca/atomic/ucx/atomic_ucx_module.c --- openmpi-4.1.2/oshmem/mca/atomic/ucx/atomic_ucx_module.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/atomic/ucx/atomic_ucx_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -56,7 +56,7 @@ #endif { spml_ucx_mkey_t *ucx_mkey; - uint64_t rva; + void *rva = NULL; mca_spml_ucx_ctx_t *ucx_ctx = (mca_spml_ucx_ctx_t *)ctx; #if HAVE_DECL_UCP_ATOMIC_OP_NBX ucs_status_ptr_t status_ptr; @@ -67,17 +67,17 @@ assert((8 == size) || (4 == size)); - ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, pe, target, (void *)&rva, mca_spml_self); + ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, pe, target, &rva, mca_spml_self); assert(NULL != ucx_mkey); #if HAVE_DECL_UCP_ATOMIC_OP_NBX status_ptr = ucp_atomic_op_nbx(ucx_ctx->ucp_peers[pe].ucp_conn, - op, &value, 1, rva, ucx_mkey->rkey, + op, &value, 1, (uint64_t)rva, ucx_mkey->rkey, &mca_spml_ucp_request_params[size >> 3]); res = opal_common_ucx_wait_request(status_ptr, ucx_ctx->ucp_worker[0], "ucp_atomic_op_nbx post"); #else status = ucp_atomic_post(ucx_ctx->ucp_peers[pe].ucp_conn, - op, value, size, rva, + op, value, size, (uint64_t)rva, ucx_mkey->rkey); res = ucx_status_to_oshmem(status); #endif @@ -104,7 +104,7 @@ { ucs_status_ptr_t status_ptr; spml_ucx_mkey_t *ucx_mkey; - uint64_t rva; + void *rva = NULL; mca_spml_ucx_ctx_t *ucx_ctx = (mca_spml_ucx_ctx_t *)ctx; #if HAVE_DECL_UCP_ATOMIC_OP_NBX ucp_request_param_t param = { @@ -117,17 +117,17 @@ assert((8 == size) || (4 == size)); - ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, pe, target, (void *)&rva, mca_spml_self); + ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, pe, target, &rva, mca_spml_self); assert(NULL != ucx_mkey); #if HAVE_DECL_UCP_ATOMIC_OP_NBX status_ptr = ucp_atomic_op_nbx(ucx_ctx->ucp_peers[pe].ucp_conn, op, &value, 1, - rva, ucx_mkey->rkey, ¶m); + (uint64_t)rva, ucx_mkey->rkey, ¶m); return opal_common_ucx_wait_request(status_ptr, ucx_ctx->ucp_worker[0], "ucp_atomic_op_nbx"); #else status_ptr = ucp_atomic_fetch_nb(ucx_ctx->ucp_peers[pe].ucp_conn, op, value, prev, size, - rva, ucx_mkey->rkey, + (uint64_t)rva, ucx_mkey->rkey, opal_common_ucx_empty_complete_cb); return opal_common_ucx_wait_request(status_ptr, ucx_ctx->ucp_worker[0], "ucp_atomic_fetch_nb"); diff -Nru openmpi-4.1.2/oshmem/mca/atomic/ucx/Makefile.in openmpi-4.1.4/oshmem/mca/atomic/ucx/Makefile.in --- openmpi-4.1.2/oshmem/mca/atomic/ucx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/atomic/ucx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/memheap/base/base.h openmpi-4.1.4/oshmem/mca/memheap/base/base.h --- openmpi-4.1.2/oshmem/mca/memheap/base/base.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/memheap/base/base.h 2022-05-29 09:51:40.000000000 +0000 @@ -199,7 +199,7 @@ if (mkeys_cache) { if (mkeys_cache[pe]) { if ((va >= mkeys_cache[pe]->va_base) && - (va < mkeys_cache[pe]->va_base + mkeys_cache[pe]->len)) { + ((char*)va < (char*)mkeys_cache[pe]->va_base + mkeys_cache[pe]->len)) { return i; } } diff -Nru openmpi-4.1.2/oshmem/mca/memheap/buddy/Makefile.in openmpi-4.1.4/oshmem/mca/memheap/buddy/Makefile.in --- openmpi-4.1.2/oshmem/mca/memheap/buddy/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/memheap/buddy/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1483,6 +1486,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1632,9 +1639,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1695,6 +1699,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1708,6 +1715,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/memheap/Makefile.in openmpi-4.1.4/oshmem/mca/memheap/Makefile.in --- openmpi-4.1.2/oshmem/mca/memheap/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/memheap/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/memheap/ptmalloc/Makefile.in openmpi-4.1.4/oshmem/mca/memheap/ptmalloc/Makefile.in --- openmpi-4.1.2/oshmem/mca/memheap/ptmalloc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/memheap/ptmalloc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/scoll/basic/Makefile.in openmpi-4.1.4/oshmem/mca/scoll/basic/Makefile.in --- openmpi-4.1.2/oshmem/mca/scoll/basic/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/basic/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/scoll/fca/Makefile.in openmpi-4.1.4/oshmem/mca/scoll/fca/Makefile.in --- openmpi-4.1.2/oshmem/mca/scoll/fca/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/fca/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1490,6 +1493,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1639,9 +1646,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1702,6 +1706,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1715,6 +1722,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/scoll/Makefile.in openmpi-4.1.4/oshmem/mca/scoll/Makefile.in --- openmpi-4.1.2/oshmem/mca/scoll/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1481,6 +1484,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1630,9 +1637,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1693,6 +1697,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1706,6 +1713,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/scoll/mpi/Makefile.in openmpi-4.1.4/oshmem/mca/scoll/mpi/Makefile.in --- openmpi-4.1.2/oshmem/mca/scoll/mpi/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/mpi/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/configure.m4 openmpi-4.1.4/oshmem/mca/scoll/ucc/configure.m4 --- openmpi-4.1.2/oshmem/mca/scoll/ucc/configure.m4 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/configure.m4 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,38 @@ +# -*- shell-script -*- +# +# +# Copyright (c) 2021 Mellanox Technologies. All rights reserved. +# Copyright (c) 2015 Research Organization for Information Science +# and Technology (RIST). All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + + +# MCA_scoll_ucc_CONFIG([action-if-can-compile], +# [action-if-cant-compile]) +# ------------------------------------------------ +AC_DEFUN([MCA_oshmem_scoll_ucc_CONFIG],[ + AC_CONFIG_FILES([oshmem/mca/scoll/ucc/Makefile]) + + OMPI_CHECK_UCC([scoll_ucc], + [scoll_ucc_happy="yes"], + [scoll_ucc_happy="no"]) + + AS_IF([test "$scoll_ucc_happy" = "yes"], + [scoll_ucc_WRAPPER_EXTRA_LDFLAGS="$scoll_ucc_LDFLAGS" + scoll_ucc_CPPFLAGS="$scoll_ucc_CPPFLAGS" + scoll_ucc_WRAPPER_EXTRA_LIBS="$scoll_ucc_LIBS" + $1], + [$2]) + + # substitute in the things needed to build ucc + AC_SUBST([scoll_ucc_CFLAGS]) + AC_SUBST([scoll_ucc_CPPFLAGS]) + AC_SUBST([scoll_ucc_LDFLAGS]) + AC_SUBST([scoll_ucc_LIBS]) +])dnl + diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/help-oshmem-scoll-ucc.txt openmpi-4.1.4/oshmem/mca/scoll/ucc/help-oshmem-scoll-ucc.txt --- openmpi-4.1.2/oshmem/mca/scoll/ucc/help-oshmem-scoll-ucc.txt 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/help-oshmem-scoll-ucc.txt 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,16 @@ +# +# Copyright (c) 2021 Mellanox Technologies, Inc. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# +[module_enable:fatal] +scoll:ucc module reports issue during module enabling phase. +Try to use scoll:ucc component with anoter one +for example scoll:basic + + Error: %s +# diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/Makefile.am openmpi-4.1.4/oshmem/mca/scoll/ucc/Makefile.am --- openmpi-4.1.2/oshmem/mca/scoll/ucc/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/Makefile.am 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,46 @@ +# Copyright (c) 2021 Mellanox Technologies, Inc. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# +# + +dist_oshmemdata_DATA = \ + help-oshmem-scoll-ucc.txt + +AM_CPPFLAGS = $(scoll_ucc_CPPFLAGS) + +scoll_ucc_sources = \ + scoll_ucc.h \ + scoll_ucc_debug.h \ + scoll_ucc_dtypes.h \ + scoll_ucc_common.h \ + scoll_ucc_module.c \ + scoll_ucc_component.c \ + scoll_ucc_barrier.c \ + scoll_ucc_broadcast.c \ + scoll_ucc_reduce.c \ + scoll_ucc_collect.c \ + scoll_ucc_alltoall.c +if MCA_BUILD_oshmem_scoll_ucc_DSO +component_noinst = +component_install = mca_scoll_ucc.la +else +component_noinst = libmca_scoll_ucc.la +component_install = +endif + +mcacomponentdir = $(pkglibdir) +mcacomponent_LTLIBRARIES = $(component_install) +mca_scoll_ucc_la_SOURCES = $(scoll_ucc_sources) +mca_scoll_ucc_la_LIBADD = $(top_builddir)/oshmem/liboshmem.la \ + $(scoll_ucc_LIBS) +mca_scoll_ucc_la_LDFLAGS = -module -avoid-version $(scoll_ucc_LDFLAGS) + +noinst_LTLIBRARIES = $(component_noinst) +libmca_scoll_ucc_la_SOURCES =$(scoll_ucc_sources) +libmca_scoll_ucc_la_LIBADD = $(scoll_ucc_LIBS) +libmca_scoll_ucc_la_LDFLAGS = -module -avoid-version $(scoll_ucc_LDFLAGS) diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/Makefile.in openmpi-4.1.4/oshmem/mca/scoll/ucc/Makefile.in --- openmpi-4.1.2/oshmem/mca/scoll/ucc/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,2153 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Copyright (c) 2021 Mellanox Technologies, Inc. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# +# + + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = oshmem/mca/scoll/ucc +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/c_get_alignment.m4 \ + $(top_srcdir)/config/c_weak_symbols.m4 \ + $(top_srcdir)/config/libtool.m4 \ + $(top_srcdir)/config/ltoptions.m4 \ + $(top_srcdir)/config/ltsugar.m4 \ + $(top_srcdir)/config/ltversion.m4 \ + $(top_srcdir)/config/lt~obsolete.m4 \ + $(top_srcdir)/config/ompi_check_gpfs.m4 \ + $(top_srcdir)/config/ompi_check_ime.m4 \ + $(top_srcdir)/config/ompi_check_libfca.m4 \ + $(top_srcdir)/config/ompi_check_libhcoll.m4 \ + $(top_srcdir)/config/ompi_check_lustre.m4 \ + $(top_srcdir)/config/ompi_check_mxm.m4 \ + $(top_srcdir)/config/ompi_check_psm.m4 \ + $(top_srcdir)/config/ompi_check_psm2.m4 \ + $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ + $(top_srcdir)/config/ompi_check_ucx.m4 \ + $(top_srcdir)/config/ompi_config_files.m4 \ + $(top_srcdir)/config/ompi_configure_options.m4 \ + $(top_srcdir)/config/ompi_contrib.m4 \ + $(top_srcdir)/config/ompi_cxx_find_exception_flags.m4 \ + $(top_srcdir)/config/ompi_cxx_find_template_parameters.m4 \ + $(top_srcdir)/config/ompi_cxx_find_template_repository.m4 \ + $(top_srcdir)/config/ompi_cxx_have_exceptions.m4 \ + $(top_srcdir)/config/ompi_endpoint_tag.m4 \ + $(top_srcdir)/config/ompi_ext.m4 \ + $(top_srcdir)/config/ompi_find_mpi_aint_count_offset.m4 \ + $(top_srcdir)/config/ompi_fortran_check.m4 \ + $(top_srcdir)/config/ompi_fortran_check_abstract.m4 \ + $(top_srcdir)/config/ompi_fortran_check_asynchronous.m4 \ + $(top_srcdir)/config/ompi_fortran_check_bind_c.m4 \ + $(top_srcdir)/config/ompi_fortran_check_c_funloc.m4 \ + $(top_srcdir)/config/ompi_fortran_check_f08_assumed_rank.m4 \ + $(top_srcdir)/config/ompi_fortran_check_ignore_tkr.m4 \ + $(top_srcdir)/config/ompi_fortran_check_interface.m4 \ + $(top_srcdir)/config/ompi_fortran_check_iso_fortran_env.m4 \ + $(top_srcdir)/config/ompi_fortran_check_logical_array.m4 \ + $(top_srcdir)/config/ompi_fortran_check_max_array_rank.m4 \ + $(top_srcdir)/config/ompi_fortran_check_optional_args.m4 \ + $(top_srcdir)/config/ompi_fortran_check_preprocess_f90.m4 \ + $(top_srcdir)/config/ompi_fortran_check_private.m4 \ + $(top_srcdir)/config/ompi_fortran_check_procedure.m4 \ + $(top_srcdir)/config/ompi_fortran_check_protected.m4 \ + $(top_srcdir)/config/ompi_fortran_check_real16_c_equiv.m4 \ + $(top_srcdir)/config/ompi_fortran_check_storage_size.m4 \ + $(top_srcdir)/config/ompi_fortran_check_type.m4 \ + $(top_srcdir)/config/ompi_fortran_check_use_only.m4 \ + $(top_srcdir)/config/ompi_fortran_find_ext_symbol_convention.m4 \ + $(top_srcdir)/config/ompi_fortran_find_module_include_flag.m4 \ + $(top_srcdir)/config/ompi_fortran_get_alignment.m4 \ + $(top_srcdir)/config/ompi_fortran_get_handle_max.m4 \ + $(top_srcdir)/config/ompi_fortran_get_kind_value.m4 \ + $(top_srcdir)/config/ompi_fortran_get_sizeof.m4 \ + $(top_srcdir)/config/ompi_fortran_get_value_true.m4 \ + $(top_srcdir)/config/ompi_interix.m4 \ + $(top_srcdir)/config/ompi_setup_contrib.m4 \ + $(top_srcdir)/config/ompi_setup_cxx.m4 \ + $(top_srcdir)/config/ompi_setup_fc.m4 \ + $(top_srcdir)/config/ompi_setup_java.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_ext.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_fortran.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_java.m4 \ + $(top_srcdir)/config/ompi_setup_mpi_profiling.m4 \ + $(top_srcdir)/config/opal_case_sensitive_fs_setup.m4 \ + $(top_srcdir)/config/opal_check_alps.m4 \ + $(top_srcdir)/config/opal_check_attributes.m4 \ + $(top_srcdir)/config/opal_check_broken_qsort.m4 \ + $(top_srcdir)/config/opal_check_cma.m4 \ + $(top_srcdir)/config/opal_check_compiler_version.m4 \ + $(top_srcdir)/config/opal_check_compiler_works.m4 \ + $(top_srcdir)/config/opal_check_cray_pmi.m4 \ + $(top_srcdir)/config/opal_check_cuda.m4 \ + $(top_srcdir)/config/opal_check_icc.m4 \ + $(top_srcdir)/config/opal_check_ident.m4 \ + $(top_srcdir)/config/opal_check_knem.m4 \ + $(top_srcdir)/config/opal_check_libnl.m4 \ + $(top_srcdir)/config/opal_check_offsetof.m4 \ + $(top_srcdir)/config/opal_check_ofi.m4 \ + $(top_srcdir)/config/opal_check_openfabrics.m4 \ + $(top_srcdir)/config/opal_check_os_flavors.m4 \ + $(top_srcdir)/config/opal_check_package.m4 \ + $(top_srcdir)/config/opal_check_pmi.m4 \ + $(top_srcdir)/config/opal_check_portals4.m4 \ + $(top_srcdir)/config/opal_check_ps.m4 \ + $(top_srcdir)/config/opal_check_pthread_pids.m4 \ + $(top_srcdir)/config/opal_check_singularity.m4 \ + $(top_srcdir)/config/opal_check_ugni.m4 \ + $(top_srcdir)/config/opal_check_vendor.m4 \ + $(top_srcdir)/config/opal_check_verbs.m4 \ + $(top_srcdir)/config/opal_check_visibility.m4 \ + $(top_srcdir)/config/opal_check_withdir.m4 \ + $(top_srcdir)/config/opal_check_xpmem.m4 \ + $(top_srcdir)/config/opal_config_asm.m4 \ + $(top_srcdir)/config/opal_config_files.m4 \ + $(top_srcdir)/config/opal_config_pthreads.m4 \ + $(top_srcdir)/config/opal_config_subdir.m4 \ + $(top_srcdir)/config/opal_config_subdir_args.m4 \ + $(top_srcdir)/config/opal_config_threads.m4 \ + $(top_srcdir)/config/opal_configure_options.m4 \ + $(top_srcdir)/config/opal_ensure_contains_optflags.m4 \ + $(top_srcdir)/config/opal_find_type.m4 \ + $(top_srcdir)/config/opal_functions.m4 \ + $(top_srcdir)/config/opal_lang_link_with_c.m4 \ + $(top_srcdir)/config/opal_load_platform.m4 \ + $(top_srcdir)/config/opal_mca.m4 \ + $(top_srcdir)/config/opal_save_version.m4 \ + $(top_srcdir)/config/opal_search_libs.m4 \ + $(top_srcdir)/config/opal_set_lib_prefix.m4 \ + $(top_srcdir)/config/opal_set_mca_prefix.m4 \ + $(top_srcdir)/config/opal_setup_cc.m4 \ + $(top_srcdir)/config/opal_setup_cli.m4 \ + $(top_srcdir)/config/opal_setup_cxx.m4 \ + $(top_srcdir)/config/opal_setup_ft.m4 \ + $(top_srcdir)/config/opal_setup_wrappers.m4 \ + $(top_srcdir)/config/opal_setup_zlib.m4 \ + $(top_srcdir)/config/opal_strip_optflags.m4 \ + $(top_srcdir)/config/opal_summary.m4 \ + $(top_srcdir)/config/opal_try_assemble.m4 \ + $(top_srcdir)/config/orte_check_lsf.m4 \ + $(top_srcdir)/config/orte_check_moab.m4 \ + $(top_srcdir)/config/orte_check_sge.m4 \ + $(top_srcdir)/config/orte_check_slurm.m4 \ + $(top_srcdir)/config/orte_check_tm.m4 \ + $(top_srcdir)/config/orte_config_files.m4 \ + $(top_srcdir)/config/orte_configure_options.m4 \ + $(top_srcdir)/config/orte_setup_debugger_flags.m4 \ + $(top_srcdir)/config/oshmem_config_files.m4 \ + $(top_srcdir)/config/oshmem_configure_options.m4 \ + $(top_srcdir)/config/oshmem_setup_profiling.m4 \ + $(top_srcdir)/config/pkg.m4 \ + $(top_srcdir)/config/autogen_found_items.m4 \ + $(top_srcdir)/opal/mca/backtrace/configure.m4 \ + $(top_srcdir)/opal/mca/dl/configure.m4 \ + $(top_srcdir)/opal/mca/event/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/configure.m4 \ + $(top_srcdir)/opal/mca/installdirs/configure.m4 \ + $(top_srcdir)/opal/mca/memchecker/configure.m4 \ + $(top_srcdir)/opal/mca/memcpy/configure.m4 \ + $(top_srcdir)/opal/mca/memory/configure.m4 \ + $(top_srcdir)/opal/mca/pstat/configure.m4 \ + $(top_srcdir)/opal/mca/timer/configure.m4 \ + $(top_srcdir)/opal/mca/common/cuda/configure.m4 \ + $(top_srcdir)/opal/mca/common/ofi/configure.m4 \ + $(top_srcdir)/opal/mca/common/sm/configure.m4 \ + $(top_srcdir)/opal/mca/common/ucx/configure.m4 \ + $(top_srcdir)/opal/mca/common/verbs/configure.m4 \ + $(top_srcdir)/opal/mca/common/verbs_usnic/configure.m4 \ + $(top_srcdir)/opal/mca/backtrace/execinfo/configure.m4 \ + $(top_srcdir)/opal/mca/backtrace/none/configure.m4 \ + $(top_srcdir)/opal/mca/backtrace/printstack/configure.m4 \ + $(top_srcdir)/opal/mca/btl/ofi/configure.m4 \ + $(top_srcdir)/opal/mca/btl/openib/configure.m4 \ + $(top_srcdir)/opal/mca/btl/portals4/configure.m4 \ + $(top_srcdir)/opal/mca/btl/sm/configure.m4 \ + $(top_srcdir)/opal/mca/btl/smcuda/configure.m4 \ + $(top_srcdir)/opal/mca/btl/tcp/configure.m4 \ + $(top_srcdir)/opal/mca/btl/uct/configure.m4 \ + $(top_srcdir)/opal/mca/btl/ugni/configure.m4 \ + $(top_srcdir)/opal/mca/btl/usnic/configure.m4 \ + $(top_srcdir)/opal/mca/btl/vader/configure.m4 \ + $(top_srcdir)/opal/mca/crs/self/configure.m4 \ + $(top_srcdir)/opal/mca/dl/dlopen/configure.m4 \ + $(top_srcdir)/opal/mca/dl/libltdl/configure.m4 \ + $(top_srcdir)/opal/mca/event/external/configure.m4 \ + $(top_srcdir)/opal/mca/event/libevent2022/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/external/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/configure.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_pkg.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_check_attributes.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_check_visibility.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_check_vendor.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_components.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/hwloc_internal.m4 \ + $(top_srcdir)/opal/mca/hwloc/hwloc201/hwloc/config/netloc.m4 \ + $(top_srcdir)/opal/mca/if/bsdx_ipv4/configure.m4 \ + $(top_srcdir)/opal/mca/if/bsdx_ipv6/configure.m4 \ + $(top_srcdir)/opal/mca/if/linux_ipv6/configure.m4 \ + $(top_srcdir)/opal/mca/if/posix_ipv4/configure.m4 \ + $(top_srcdir)/opal/mca/if/solaris_ipv6/configure.m4 \ + $(top_srcdir)/opal/mca/installdirs/config/configure.m4 \ + $(top_srcdir)/opal/mca/installdirs/env/configure.m4 \ + $(top_srcdir)/opal/mca/memchecker/valgrind/configure.m4 \ + $(top_srcdir)/opal/mca/memory/malloc_solaris/configure.m4 \ + $(top_srcdir)/opal/mca/memory/patcher/configure.m4 \ + $(top_srcdir)/opal/mca/mpool/memkind/configure.m4 \ + $(top_srcdir)/opal/mca/patcher/linux/configure.m4 \ + $(top_srcdir)/opal/mca/patcher/overwrite/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/cray/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/ext1x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/ext2x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/ext3x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/flux/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/pmix3x/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/s1/configure.m4 \ + $(top_srcdir)/opal/mca/pmix/s2/configure.m4 \ + $(top_srcdir)/opal/mca/pstat/linux/configure.m4 \ + $(top_srcdir)/opal/mca/pstat/test/configure.m4 \ + $(top_srcdir)/opal/mca/rcache/gpusm/configure.m4 \ + $(top_srcdir)/opal/mca/rcache/rgpusm/configure.m4 \ + $(top_srcdir)/opal/mca/rcache/udreg/configure.m4 \ + $(top_srcdir)/opal/mca/reachable/netlink/configure.m4 \ + $(top_srcdir)/opal/mca/shmem/mmap/configure.m4 \ + $(top_srcdir)/opal/mca/shmem/posix/configure.m4 \ + $(top_srcdir)/opal/mca/shmem/sysv/configure.m4 \ + $(top_srcdir)/opal/mca/timer/altix/configure.m4 \ + $(top_srcdir)/opal/mca/timer/darwin/configure.m4 \ + $(top_srcdir)/opal/mca/timer/linux/configure.m4 \ + $(top_srcdir)/opal/mca/timer/solaris/configure.m4 \ + $(top_srcdir)/orte/mca/common/alps/configure.m4 \ + $(top_srcdir)/orte/mca/ess/alps/configure.m4 \ + $(top_srcdir)/orte/mca/ess/lsf/configure.m4 \ + $(top_srcdir)/orte/mca/ess/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/ess/tm/configure.m4 \ + $(top_srcdir)/orte/mca/odls/alps/configure.m4 \ + $(top_srcdir)/orte/mca/odls/default/configure.m4 \ + $(top_srcdir)/orte/mca/odls/pspawn/configure.m4 \ + $(top_srcdir)/orte/mca/oob/alps/configure.m4 \ + $(top_srcdir)/orte/mca/oob/tcp/configure.m4 \ + $(top_srcdir)/orte/mca/plm/alps/configure.m4 \ + $(top_srcdir)/orte/mca/plm/isolated/configure.m4 \ + $(top_srcdir)/orte/mca/plm/lsf/configure.m4 \ + $(top_srcdir)/orte/mca/plm/rsh/configure.m4 \ + $(top_srcdir)/orte/mca/plm/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/plm/tm/configure.m4 \ + $(top_srcdir)/orte/mca/ras/alps/configure.m4 \ + $(top_srcdir)/orte/mca/ras/gridengine/configure.m4 \ + $(top_srcdir)/orte/mca/ras/lsf/configure.m4 \ + $(top_srcdir)/orte/mca/ras/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/ras/tm/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/alps/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/jsm/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/moab/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/singularity/configure.m4 \ + $(top_srcdir)/orte/mca/schizo/slurm/configure.m4 \ + $(top_srcdir)/orte/mca/snapc/full/configure.m4 \ + $(top_srcdir)/orte/mca/sstore/central/configure.m4 \ + $(top_srcdir)/orte/mca/sstore/stage/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/configure.m4 \ + $(top_srcdir)/ompi/mca/fcoll/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/configure.m4 \ + $(top_srcdir)/ompi/mca/hook/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/configure.m4 \ + $(top_srcdir)/ompi/mca/rte/configure.m4 \ + $(top_srcdir)/ompi/mca/sharedfp/configure.m4 \ + $(top_srcdir)/ompi/mca/common/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/common/ompio/configure.m4 \ + $(top_srcdir)/ompi/mca/bml/r2/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/cuda/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/fca/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ + $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ + $(top_srcdir)/ompi/mca/fbtl/pvfs2/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/gpfs/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/ime/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/lustre/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/pvfs2/configure.m4 \ + $(top_srcdir)/ompi/mca/fs/ufs/configure.m4 \ + $(top_srcdir)/ompi/mca/io/ompio/configure.m4 \ + $(top_srcdir)/ompi/mca/io/romio321/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/ofi/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/psm/configure.m4 \ + $(top_srcdir)/ompi/mca/mtl/psm2/configure.m4 \ + $(top_srcdir)/ompi/mca/op/avx/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/pt2pt/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/rdma/configure.m4 \ + $(top_srcdir)/ompi/mca/osc/ucx/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/crcpw/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/monitoring/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/ob1/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/ucx/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/v/configure.m4 \ + $(top_srcdir)/ompi/mca/pml/yalla/configure.m4 \ + $(top_srcdir)/ompi/mca/rte/orte/configure.m4 \ + $(top_srcdir)/ompi/mca/rte/pmix/configure.m4 \ + $(top_srcdir)/ompi/mca/sharedfp/sm/configure.m4 \ + $(top_srcdir)/ompi/mca/topo/treematch/configure.m4 \ + $(top_srcdir)/oshmem/mca/memheap/configure.m4 \ + $(top_srcdir)/oshmem/mca/spml/configure.m4 \ + $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ + $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ + $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ + $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/sysv/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/ucx/configure.m4 \ + $(top_srcdir)/oshmem/mca/sshmem/verbs/configure.m4 \ + $(top_srcdir)/ompi/mpiext/affinity/configure.m4 \ + $(top_srcdir)/ompi/mpiext/cr/configure.m4 \ + $(top_srcdir)/ompi/mpiext/cuda/configure.m4 \ + $(top_srcdir)/ompi/mpiext/pcollreq/configure.m4 \ + $(top_srcdir)/ompi/contrib/libompitrace/configure.m4 \ + $(top_srcdir)/config/opal_get_version.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_oshmemdata_DATA) \ + $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/opal/include/opal_config.h \ + $(top_builddir)/ompi/include/mpi.h \ + $(top_builddir)/oshmem/include/shmem.h \ + $(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/private/autogen/config.h \ + $(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/hwloc/autogen/config.h \ + $(top_builddir)/ompi/mpiext/cuda/c/mpiext_cuda_c.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(mcacomponentdir)" \ + "$(DESTDIR)$(oshmemdatadir)" +LTLIBRARIES = $(mcacomponent_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__DEPENDENCIES_1 = +libmca_scoll_ucc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_1 = scoll_ucc_module.lo scoll_ucc_component.lo \ + scoll_ucc_barrier.lo scoll_ucc_broadcast.lo \ + scoll_ucc_reduce.lo scoll_ucc_collect.lo scoll_ucc_alltoall.lo +am_libmca_scoll_ucc_la_OBJECTS = $(am__objects_1) +libmca_scoll_ucc_la_OBJECTS = $(am_libmca_scoll_ucc_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libmca_scoll_ucc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libmca_scoll_ucc_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE@am_libmca_scoll_ucc_la_rpath = +mca_scoll_ucc_la_DEPENDENCIES = $(top_builddir)/oshmem/liboshmem.la \ + $(am__DEPENDENCIES_1) +am_mca_scoll_ucc_la_OBJECTS = $(am__objects_1) +mca_scoll_ucc_la_OBJECTS = $(am_mca_scoll_ucc_la_OBJECTS) +mca_scoll_ucc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(mca_scoll_ucc_la_LDFLAGS) $(LDFLAGS) \ + -o $@ +@MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE@am_mca_scoll_ucc_la_rpath = \ +@MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE@ -rpath $(mcacomponentdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/opal/include -I$(top_builddir)/ompi/include -I$(top_builddir)/oshmem/include -I$(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/private/autogen -I$(top_builddir)/opal/mca/hwloc/hwloc201/hwloc/include/hwloc/autogen -I$(top_builddir)/ompi/mpiext/cuda/c +depcomp = $(SHELL) $(top_srcdir)/config/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libmca_scoll_ucc_la_SOURCES) $(mca_scoll_ucc_la_SOURCES) +DIST_SOURCES = $(libmca_scoll_ucc_la_SOURCES) \ + $(mca_scoll_ucc_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DATA = $(dist_oshmemdata_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMCA_PARAM_SETS_DIR = @AMCA_PARAM_SETS_DIR@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASH = @BASH@ +CC = @CC@ +CCAS = @CCAS@ +CCASDEPMODE = @CCASDEPMODE@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CFLAGS_WITHOUT_OPTFLAGS = @CFLAGS_WITHOUT_OPTFLAGS@ +CLEANFILES = @CLEANFILES@ +CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CRAY_ALPSLLI_CFLAGS = @CRAY_ALPSLLI_CFLAGS@ +CRAY_ALPSLLI_LIBS = @CRAY_ALPSLLI_LIBS@ +CRAY_ALPSLLI_STATIC_LIBS = @CRAY_ALPSLLI_STATIC_LIBS@ +CRAY_ALPSUTIL_CFLAGS = @CRAY_ALPSUTIL_CFLAGS@ +CRAY_ALPSUTIL_LIBS = @CRAY_ALPSUTIL_LIBS@ +CRAY_ALPSUTIL_STATIC_LIBS = @CRAY_ALPSUTIL_STATIC_LIBS@ +CRAY_ALPS_CFLAGS = @CRAY_ALPS_CFLAGS@ +CRAY_ALPS_LIBS = @CRAY_ALPS_LIBS@ +CRAY_ALPS_STATIC_LIBS = @CRAY_ALPS_STATIC_LIBS@ +CRAY_PMI_CFLAGS = @CRAY_PMI_CFLAGS@ +CRAY_PMI_LIBS = @CRAY_PMI_LIBS@ +CRAY_PMI_STATIC_LIBS = @CRAY_PMI_STATIC_LIBS@ +CRAY_UDREG_CFLAGS = @CRAY_UDREG_CFLAGS@ +CRAY_UDREG_LIBS = @CRAY_UDREG_LIBS@ +CRAY_UGNI_CFLAGS = @CRAY_UGNI_CFLAGS@ +CRAY_UGNI_LIBS = @CRAY_UGNI_LIBS@ +CRAY_WLM_DETECT_CFLAGS = @CRAY_WLM_DETECT_CFLAGS@ +CRAY_WLM_DETECT_LIBS = @CRAY_WLM_DETECT_LIBS@ +CRAY_WLM_DETECT_STATIC_LIBS = @CRAY_WLM_DETECT_STATIC_LIBS@ +CRAY_XPMEM_CFLAGS = @CRAY_XPMEM_CFLAGS@ +CRAY_XPMEM_LIBS = @CRAY_XPMEM_LIBS@ +CRAY_XPMEM_STATIC_LIBS = @CRAY_XPMEM_STATIC_LIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXCPPFLAGS = @CXXCPPFLAGS@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEBUGGER_CFLAGS = @DEBUGGER_CFLAGS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FC = @FC@ +FCFLAGS = @FCFLAGS@ +FCFLAGS_f = @FCFLAGS_f@ +FCFLAGS_f90 = @FCFLAGS_f90@ +FFLAGS = @FFLAGS@ +FGREP = @FGREP@ +FLUX_PMI_CFLAGS = @FLUX_PMI_CFLAGS@ +FLUX_PMI_LIBS = @FLUX_PMI_LIBS@ +GREP = @GREP@ +HWLOC_CFLAGS = @HWLOC_CFLAGS@ +HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@ +HWLOC_CUDA_LIBS = @HWLOC_CUDA_LIBS@ +HWLOC_EMBEDDED_CFLAGS = @HWLOC_EMBEDDED_CFLAGS@ +HWLOC_EMBEDDED_CPPFLAGS = @HWLOC_EMBEDDED_CPPFLAGS@ +HWLOC_EMBEDDED_LDADD = @HWLOC_EMBEDDED_LDADD@ +HWLOC_EMBEDDED_LIBS = @HWLOC_EMBEDDED_LIBS@ +HWLOC_GL_LIBS = @HWLOC_GL_LIBS@ +HWLOC_HAVE_LIBXML2 = @HWLOC_HAVE_LIBXML2@ +HWLOC_HAVE_NVML = @HWLOC_HAVE_NVML@ +HWLOC_HAVE_OPENCL = @HWLOC_HAVE_OPENCL@ +HWLOC_LDFLAGS = @HWLOC_LDFLAGS@ +HWLOC_LIBS = @HWLOC_LIBS@ +HWLOC_LIBS_PRIVATE = @HWLOC_LIBS_PRIVATE@ +HWLOC_LIBXML2_CFLAGS = @HWLOC_LIBXML2_CFLAGS@ +HWLOC_LIBXML2_LIBS = @HWLOC_LIBXML2_LIBS@ +HWLOC_MS_LIB = @HWLOC_MS_LIB@ +HWLOC_MS_LIB_ARCH = @HWLOC_MS_LIB_ARCH@ +HWLOC_NVML_LIBS = @HWLOC_NVML_LIBS@ +HWLOC_OPENCL_CFLAGS = @HWLOC_OPENCL_CFLAGS@ +HWLOC_OPENCL_LDFLAGS = @HWLOC_OPENCL_LDFLAGS@ +HWLOC_OPENCL_LIBS = @HWLOC_OPENCL_LIBS@ +HWLOC_PCIACCESS_CFLAGS = @HWLOC_PCIACCESS_CFLAGS@ +HWLOC_PCIACCESS_LIBS = @HWLOC_PCIACCESS_LIBS@ +HWLOC_PLUGINS_DIR = @HWLOC_PLUGINS_DIR@ +HWLOC_PLUGINS_PATH = @HWLOC_PLUGINS_PATH@ +HWLOC_RELEASE_DATE = @HWLOC_RELEASE_DATE@ +HWLOC_REQUIRES = @HWLOC_REQUIRES@ +HWLOC_VERSION = @HWLOC_VERSION@ +HWLOC_X11_CPPFLAGS = @HWLOC_X11_CPPFLAGS@ +HWLOC_X11_LIBS = @HWLOC_X11_LIBS@ +HWLOC_top_builddir = @HWLOC_top_builddir@ +HWLOC_top_srcdir = @HWLOC_top_srcdir@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JAR = @JAR@ +JAVAC = @JAVAC@ +JAVADOC = @JAVADOC@ +JAVAH = @JAVAH@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MCA_BUILD_OP_AVX2_FLAGS = @MCA_BUILD_OP_AVX2_FLAGS@ +MCA_BUILD_OP_AVX512_FLAGS = @MCA_BUILD_OP_AVX512_FLAGS@ +MCA_BUILD_OP_AVX_FLAGS = @MCA_BUILD_OP_AVX_FLAGS@ +MCA_PROJECT_DIST_SUBDIRS = @MCA_PROJECT_DIST_SUBDIRS@ +MCA_PROJECT_SUBDIRS = @MCA_PROJECT_SUBDIRS@ +MCA_ompi_FRAMEWORKS = @MCA_ompi_FRAMEWORKS@ +MCA_ompi_FRAMEWORKS_SUBDIRS = @MCA_ompi_FRAMEWORKS_SUBDIRS@ +MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_ompi_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_ompi_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_ompi_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_ompi_FRAMEWORK_LIBS = @MCA_ompi_FRAMEWORK_LIBS@ +MCA_ompi_bml_ALL_COMPONENTS = @MCA_ompi_bml_ALL_COMPONENTS@ +MCA_ompi_bml_ALL_SUBDIRS = @MCA_ompi_bml_ALL_SUBDIRS@ +MCA_ompi_bml_DSO_COMPONENTS = @MCA_ompi_bml_DSO_COMPONENTS@ +MCA_ompi_bml_DSO_SUBDIRS = @MCA_ompi_bml_DSO_SUBDIRS@ +MCA_ompi_bml_STATIC_COMPONENTS = @MCA_ompi_bml_STATIC_COMPONENTS@ +MCA_ompi_bml_STATIC_LTLIBS = @MCA_ompi_bml_STATIC_LTLIBS@ +MCA_ompi_bml_STATIC_SUBDIRS = @MCA_ompi_bml_STATIC_SUBDIRS@ +MCA_ompi_coll_ALL_COMPONENTS = @MCA_ompi_coll_ALL_COMPONENTS@ +MCA_ompi_coll_ALL_SUBDIRS = @MCA_ompi_coll_ALL_SUBDIRS@ +MCA_ompi_coll_DSO_COMPONENTS = @MCA_ompi_coll_DSO_COMPONENTS@ +MCA_ompi_coll_DSO_SUBDIRS = @MCA_ompi_coll_DSO_SUBDIRS@ +MCA_ompi_coll_STATIC_COMPONENTS = @MCA_ompi_coll_STATIC_COMPONENTS@ +MCA_ompi_coll_STATIC_LTLIBS = @MCA_ompi_coll_STATIC_LTLIBS@ +MCA_ompi_coll_STATIC_SUBDIRS = @MCA_ompi_coll_STATIC_SUBDIRS@ +MCA_ompi_common_ALL_COMPONENTS = @MCA_ompi_common_ALL_COMPONENTS@ +MCA_ompi_common_ALL_SUBDIRS = @MCA_ompi_common_ALL_SUBDIRS@ +MCA_ompi_common_DSO_COMPONENTS = @MCA_ompi_common_DSO_COMPONENTS@ +MCA_ompi_common_DSO_SUBDIRS = @MCA_ompi_common_DSO_SUBDIRS@ +MCA_ompi_common_STATIC_COMPONENTS = @MCA_ompi_common_STATIC_COMPONENTS@ +MCA_ompi_common_STATIC_LTLIBS = @MCA_ompi_common_STATIC_LTLIBS@ +MCA_ompi_common_STATIC_SUBDIRS = @MCA_ompi_common_STATIC_SUBDIRS@ +MCA_ompi_crcp_ALL_COMPONENTS = @MCA_ompi_crcp_ALL_COMPONENTS@ +MCA_ompi_crcp_ALL_SUBDIRS = @MCA_ompi_crcp_ALL_SUBDIRS@ +MCA_ompi_crcp_DSO_COMPONENTS = @MCA_ompi_crcp_DSO_COMPONENTS@ +MCA_ompi_crcp_DSO_SUBDIRS = @MCA_ompi_crcp_DSO_SUBDIRS@ +MCA_ompi_crcp_STATIC_COMPONENTS = @MCA_ompi_crcp_STATIC_COMPONENTS@ +MCA_ompi_crcp_STATIC_LTLIBS = @MCA_ompi_crcp_STATIC_LTLIBS@ +MCA_ompi_crcp_STATIC_SUBDIRS = @MCA_ompi_crcp_STATIC_SUBDIRS@ +MCA_ompi_fbtl_ALL_COMPONENTS = @MCA_ompi_fbtl_ALL_COMPONENTS@ +MCA_ompi_fbtl_ALL_SUBDIRS = @MCA_ompi_fbtl_ALL_SUBDIRS@ +MCA_ompi_fbtl_DSO_COMPONENTS = @MCA_ompi_fbtl_DSO_COMPONENTS@ +MCA_ompi_fbtl_DSO_SUBDIRS = @MCA_ompi_fbtl_DSO_SUBDIRS@ +MCA_ompi_fbtl_STATIC_COMPONENTS = @MCA_ompi_fbtl_STATIC_COMPONENTS@ +MCA_ompi_fbtl_STATIC_LTLIBS = @MCA_ompi_fbtl_STATIC_LTLIBS@ +MCA_ompi_fbtl_STATIC_SUBDIRS = @MCA_ompi_fbtl_STATIC_SUBDIRS@ +MCA_ompi_fcoll_ALL_COMPONENTS = @MCA_ompi_fcoll_ALL_COMPONENTS@ +MCA_ompi_fcoll_ALL_SUBDIRS = @MCA_ompi_fcoll_ALL_SUBDIRS@ +MCA_ompi_fcoll_DSO_COMPONENTS = @MCA_ompi_fcoll_DSO_COMPONENTS@ +MCA_ompi_fcoll_DSO_SUBDIRS = @MCA_ompi_fcoll_DSO_SUBDIRS@ +MCA_ompi_fcoll_STATIC_COMPONENTS = @MCA_ompi_fcoll_STATIC_COMPONENTS@ +MCA_ompi_fcoll_STATIC_LTLIBS = @MCA_ompi_fcoll_STATIC_LTLIBS@ +MCA_ompi_fcoll_STATIC_SUBDIRS = @MCA_ompi_fcoll_STATIC_SUBDIRS@ +MCA_ompi_fs_ALL_COMPONENTS = @MCA_ompi_fs_ALL_COMPONENTS@ +MCA_ompi_fs_ALL_SUBDIRS = @MCA_ompi_fs_ALL_SUBDIRS@ +MCA_ompi_fs_DSO_COMPONENTS = @MCA_ompi_fs_DSO_COMPONENTS@ +MCA_ompi_fs_DSO_SUBDIRS = @MCA_ompi_fs_DSO_SUBDIRS@ +MCA_ompi_fs_STATIC_COMPONENTS = @MCA_ompi_fs_STATIC_COMPONENTS@ +MCA_ompi_fs_STATIC_LTLIBS = @MCA_ompi_fs_STATIC_LTLIBS@ +MCA_ompi_fs_STATIC_SUBDIRS = @MCA_ompi_fs_STATIC_SUBDIRS@ +MCA_ompi_hook_ALL_COMPONENTS = @MCA_ompi_hook_ALL_COMPONENTS@ +MCA_ompi_hook_ALL_SUBDIRS = @MCA_ompi_hook_ALL_SUBDIRS@ +MCA_ompi_hook_DSO_COMPONENTS = @MCA_ompi_hook_DSO_COMPONENTS@ +MCA_ompi_hook_DSO_SUBDIRS = @MCA_ompi_hook_DSO_SUBDIRS@ +MCA_ompi_hook_STATIC_COMPONENTS = @MCA_ompi_hook_STATIC_COMPONENTS@ +MCA_ompi_hook_STATIC_LTLIBS = @MCA_ompi_hook_STATIC_LTLIBS@ +MCA_ompi_hook_STATIC_SUBDIRS = @MCA_ompi_hook_STATIC_SUBDIRS@ +MCA_ompi_io_ALL_COMPONENTS = @MCA_ompi_io_ALL_COMPONENTS@ +MCA_ompi_io_ALL_SUBDIRS = @MCA_ompi_io_ALL_SUBDIRS@ +MCA_ompi_io_DSO_COMPONENTS = @MCA_ompi_io_DSO_COMPONENTS@ +MCA_ompi_io_DSO_SUBDIRS = @MCA_ompi_io_DSO_SUBDIRS@ +MCA_ompi_io_STATIC_COMPONENTS = @MCA_ompi_io_STATIC_COMPONENTS@ +MCA_ompi_io_STATIC_LTLIBS = @MCA_ompi_io_STATIC_LTLIBS@ +MCA_ompi_io_STATIC_SUBDIRS = @MCA_ompi_io_STATIC_SUBDIRS@ +MCA_ompi_mtl_ALL_COMPONENTS = @MCA_ompi_mtl_ALL_COMPONENTS@ +MCA_ompi_mtl_ALL_SUBDIRS = @MCA_ompi_mtl_ALL_SUBDIRS@ +MCA_ompi_mtl_DIRECT_CALL_HEADER = @MCA_ompi_mtl_DIRECT_CALL_HEADER@ +MCA_ompi_mtl_DSO_COMPONENTS = @MCA_ompi_mtl_DSO_COMPONENTS@ +MCA_ompi_mtl_DSO_SUBDIRS = @MCA_ompi_mtl_DSO_SUBDIRS@ +MCA_ompi_mtl_STATIC_COMPONENTS = @MCA_ompi_mtl_STATIC_COMPONENTS@ +MCA_ompi_mtl_STATIC_LTLIBS = @MCA_ompi_mtl_STATIC_LTLIBS@ +MCA_ompi_mtl_STATIC_SUBDIRS = @MCA_ompi_mtl_STATIC_SUBDIRS@ +MCA_ompi_op_ALL_COMPONENTS = @MCA_ompi_op_ALL_COMPONENTS@ +MCA_ompi_op_ALL_SUBDIRS = @MCA_ompi_op_ALL_SUBDIRS@ +MCA_ompi_op_DSO_COMPONENTS = @MCA_ompi_op_DSO_COMPONENTS@ +MCA_ompi_op_DSO_SUBDIRS = @MCA_ompi_op_DSO_SUBDIRS@ +MCA_ompi_op_STATIC_COMPONENTS = @MCA_ompi_op_STATIC_COMPONENTS@ +MCA_ompi_op_STATIC_LTLIBS = @MCA_ompi_op_STATIC_LTLIBS@ +MCA_ompi_op_STATIC_SUBDIRS = @MCA_ompi_op_STATIC_SUBDIRS@ +MCA_ompi_osc_ALL_COMPONENTS = @MCA_ompi_osc_ALL_COMPONENTS@ +MCA_ompi_osc_ALL_SUBDIRS = @MCA_ompi_osc_ALL_SUBDIRS@ +MCA_ompi_osc_DSO_COMPONENTS = @MCA_ompi_osc_DSO_COMPONENTS@ +MCA_ompi_osc_DSO_SUBDIRS = @MCA_ompi_osc_DSO_SUBDIRS@ +MCA_ompi_osc_STATIC_COMPONENTS = @MCA_ompi_osc_STATIC_COMPONENTS@ +MCA_ompi_osc_STATIC_LTLIBS = @MCA_ompi_osc_STATIC_LTLIBS@ +MCA_ompi_osc_STATIC_SUBDIRS = @MCA_ompi_osc_STATIC_SUBDIRS@ +MCA_ompi_pml_ALL_COMPONENTS = @MCA_ompi_pml_ALL_COMPONENTS@ +MCA_ompi_pml_ALL_SUBDIRS = @MCA_ompi_pml_ALL_SUBDIRS@ +MCA_ompi_pml_DIRECT_CALL_HEADER = @MCA_ompi_pml_DIRECT_CALL_HEADER@ +MCA_ompi_pml_DSO_COMPONENTS = @MCA_ompi_pml_DSO_COMPONENTS@ +MCA_ompi_pml_DSO_SUBDIRS = @MCA_ompi_pml_DSO_SUBDIRS@ +MCA_ompi_pml_STATIC_COMPONENTS = @MCA_ompi_pml_STATIC_COMPONENTS@ +MCA_ompi_pml_STATIC_LTLIBS = @MCA_ompi_pml_STATIC_LTLIBS@ +MCA_ompi_pml_STATIC_SUBDIRS = @MCA_ompi_pml_STATIC_SUBDIRS@ +MCA_ompi_rte_ALL_COMPONENTS = @MCA_ompi_rte_ALL_COMPONENTS@ +MCA_ompi_rte_ALL_SUBDIRS = @MCA_ompi_rte_ALL_SUBDIRS@ +MCA_ompi_rte_DSO_COMPONENTS = @MCA_ompi_rte_DSO_COMPONENTS@ +MCA_ompi_rte_DSO_SUBDIRS = @MCA_ompi_rte_DSO_SUBDIRS@ +MCA_ompi_rte_STATIC_COMPONENTS = @MCA_ompi_rte_STATIC_COMPONENTS@ +MCA_ompi_rte_STATIC_LTLIBS = @MCA_ompi_rte_STATIC_LTLIBS@ +MCA_ompi_rte_STATIC_SUBDIRS = @MCA_ompi_rte_STATIC_SUBDIRS@ +MCA_ompi_sharedfp_ALL_COMPONENTS = @MCA_ompi_sharedfp_ALL_COMPONENTS@ +MCA_ompi_sharedfp_ALL_SUBDIRS = @MCA_ompi_sharedfp_ALL_SUBDIRS@ +MCA_ompi_sharedfp_DSO_COMPONENTS = @MCA_ompi_sharedfp_DSO_COMPONENTS@ +MCA_ompi_sharedfp_DSO_SUBDIRS = @MCA_ompi_sharedfp_DSO_SUBDIRS@ +MCA_ompi_sharedfp_STATIC_COMPONENTS = @MCA_ompi_sharedfp_STATIC_COMPONENTS@ +MCA_ompi_sharedfp_STATIC_LTLIBS = @MCA_ompi_sharedfp_STATIC_LTLIBS@ +MCA_ompi_sharedfp_STATIC_SUBDIRS = @MCA_ompi_sharedfp_STATIC_SUBDIRS@ +MCA_ompi_topo_ALL_COMPONENTS = @MCA_ompi_topo_ALL_COMPONENTS@ +MCA_ompi_topo_ALL_SUBDIRS = @MCA_ompi_topo_ALL_SUBDIRS@ +MCA_ompi_topo_DSO_COMPONENTS = @MCA_ompi_topo_DSO_COMPONENTS@ +MCA_ompi_topo_DSO_SUBDIRS = @MCA_ompi_topo_DSO_SUBDIRS@ +MCA_ompi_topo_STATIC_COMPONENTS = @MCA_ompi_topo_STATIC_COMPONENTS@ +MCA_ompi_topo_STATIC_LTLIBS = @MCA_ompi_topo_STATIC_LTLIBS@ +MCA_ompi_topo_STATIC_SUBDIRS = @MCA_ompi_topo_STATIC_SUBDIRS@ +MCA_ompi_vprotocol_ALL_COMPONENTS = @MCA_ompi_vprotocol_ALL_COMPONENTS@ +MCA_ompi_vprotocol_ALL_SUBDIRS = @MCA_ompi_vprotocol_ALL_SUBDIRS@ +MCA_ompi_vprotocol_DSO_COMPONENTS = @MCA_ompi_vprotocol_DSO_COMPONENTS@ +MCA_ompi_vprotocol_DSO_SUBDIRS = @MCA_ompi_vprotocol_DSO_SUBDIRS@ +MCA_ompi_vprotocol_STATIC_COMPONENTS = @MCA_ompi_vprotocol_STATIC_COMPONENTS@ +MCA_ompi_vprotocol_STATIC_LTLIBS = @MCA_ompi_vprotocol_STATIC_LTLIBS@ +MCA_ompi_vprotocol_STATIC_SUBDIRS = @MCA_ompi_vprotocol_STATIC_SUBDIRS@ +MCA_opal_FRAMEWORKS = @MCA_opal_FRAMEWORKS@ +MCA_opal_FRAMEWORKS_SUBDIRS = @MCA_opal_FRAMEWORKS_SUBDIRS@ +MCA_opal_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_opal_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_opal_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_opal_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_opal_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_opal_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_opal_FRAMEWORK_LIBS = @MCA_opal_FRAMEWORK_LIBS@ +MCA_opal_allocator_ALL_COMPONENTS = @MCA_opal_allocator_ALL_COMPONENTS@ +MCA_opal_allocator_ALL_SUBDIRS = @MCA_opal_allocator_ALL_SUBDIRS@ +MCA_opal_allocator_DSO_COMPONENTS = @MCA_opal_allocator_DSO_COMPONENTS@ +MCA_opal_allocator_DSO_SUBDIRS = @MCA_opal_allocator_DSO_SUBDIRS@ +MCA_opal_allocator_STATIC_COMPONENTS = @MCA_opal_allocator_STATIC_COMPONENTS@ +MCA_opal_allocator_STATIC_LTLIBS = @MCA_opal_allocator_STATIC_LTLIBS@ +MCA_opal_allocator_STATIC_SUBDIRS = @MCA_opal_allocator_STATIC_SUBDIRS@ +MCA_opal_backtrace_ALL_COMPONENTS = @MCA_opal_backtrace_ALL_COMPONENTS@ +MCA_opal_backtrace_ALL_SUBDIRS = @MCA_opal_backtrace_ALL_SUBDIRS@ +MCA_opal_backtrace_DSO_COMPONENTS = @MCA_opal_backtrace_DSO_COMPONENTS@ +MCA_opal_backtrace_DSO_SUBDIRS = @MCA_opal_backtrace_DSO_SUBDIRS@ +MCA_opal_backtrace_STATIC_COMPONENTS = @MCA_opal_backtrace_STATIC_COMPONENTS@ +MCA_opal_backtrace_STATIC_LTLIBS = @MCA_opal_backtrace_STATIC_LTLIBS@ +MCA_opal_backtrace_STATIC_SUBDIRS = @MCA_opal_backtrace_STATIC_SUBDIRS@ +MCA_opal_btl_ALL_COMPONENTS = @MCA_opal_btl_ALL_COMPONENTS@ +MCA_opal_btl_ALL_SUBDIRS = @MCA_opal_btl_ALL_SUBDIRS@ +MCA_opal_btl_DSO_COMPONENTS = @MCA_opal_btl_DSO_COMPONENTS@ +MCA_opal_btl_DSO_SUBDIRS = @MCA_opal_btl_DSO_SUBDIRS@ +MCA_opal_btl_STATIC_COMPONENTS = @MCA_opal_btl_STATIC_COMPONENTS@ +MCA_opal_btl_STATIC_LTLIBS = @MCA_opal_btl_STATIC_LTLIBS@ +MCA_opal_btl_STATIC_SUBDIRS = @MCA_opal_btl_STATIC_SUBDIRS@ +MCA_opal_common_ALL_COMPONENTS = @MCA_opal_common_ALL_COMPONENTS@ +MCA_opal_common_ALL_SUBDIRS = @MCA_opal_common_ALL_SUBDIRS@ +MCA_opal_common_DSO_COMPONENTS = @MCA_opal_common_DSO_COMPONENTS@ +MCA_opal_common_DSO_SUBDIRS = @MCA_opal_common_DSO_SUBDIRS@ +MCA_opal_common_STATIC_COMPONENTS = @MCA_opal_common_STATIC_COMPONENTS@ +MCA_opal_common_STATIC_LTLIBS = @MCA_opal_common_STATIC_LTLIBS@ +MCA_opal_common_STATIC_SUBDIRS = @MCA_opal_common_STATIC_SUBDIRS@ +MCA_opal_compress_ALL_COMPONENTS = @MCA_opal_compress_ALL_COMPONENTS@ +MCA_opal_compress_ALL_SUBDIRS = @MCA_opal_compress_ALL_SUBDIRS@ +MCA_opal_compress_DSO_COMPONENTS = @MCA_opal_compress_DSO_COMPONENTS@ +MCA_opal_compress_DSO_SUBDIRS = @MCA_opal_compress_DSO_SUBDIRS@ +MCA_opal_compress_STATIC_COMPONENTS = @MCA_opal_compress_STATIC_COMPONENTS@ +MCA_opal_compress_STATIC_LTLIBS = @MCA_opal_compress_STATIC_LTLIBS@ +MCA_opal_compress_STATIC_SUBDIRS = @MCA_opal_compress_STATIC_SUBDIRS@ +MCA_opal_crs_ALL_COMPONENTS = @MCA_opal_crs_ALL_COMPONENTS@ +MCA_opal_crs_ALL_SUBDIRS = @MCA_opal_crs_ALL_SUBDIRS@ +MCA_opal_crs_DSO_COMPONENTS = @MCA_opal_crs_DSO_COMPONENTS@ +MCA_opal_crs_DSO_SUBDIRS = @MCA_opal_crs_DSO_SUBDIRS@ +MCA_opal_crs_STATIC_COMPONENTS = @MCA_opal_crs_STATIC_COMPONENTS@ +MCA_opal_crs_STATIC_LTLIBS = @MCA_opal_crs_STATIC_LTLIBS@ +MCA_opal_crs_STATIC_SUBDIRS = @MCA_opal_crs_STATIC_SUBDIRS@ +MCA_opal_dl_ALL_COMPONENTS = @MCA_opal_dl_ALL_COMPONENTS@ +MCA_opal_dl_ALL_SUBDIRS = @MCA_opal_dl_ALL_SUBDIRS@ +MCA_opal_dl_DSO_COMPONENTS = @MCA_opal_dl_DSO_COMPONENTS@ +MCA_opal_dl_DSO_SUBDIRS = @MCA_opal_dl_DSO_SUBDIRS@ +MCA_opal_dl_STATIC_COMPONENTS = @MCA_opal_dl_STATIC_COMPONENTS@ +MCA_opal_dl_STATIC_LTLIBS = @MCA_opal_dl_STATIC_LTLIBS@ +MCA_opal_dl_STATIC_SUBDIRS = @MCA_opal_dl_STATIC_SUBDIRS@ +MCA_opal_event_ALL_COMPONENTS = @MCA_opal_event_ALL_COMPONENTS@ +MCA_opal_event_ALL_SUBDIRS = @MCA_opal_event_ALL_SUBDIRS@ +MCA_opal_event_DSO_COMPONENTS = @MCA_opal_event_DSO_COMPONENTS@ +MCA_opal_event_DSO_SUBDIRS = @MCA_opal_event_DSO_SUBDIRS@ +MCA_opal_event_STATIC_COMPONENTS = @MCA_opal_event_STATIC_COMPONENTS@ +MCA_opal_event_STATIC_LTLIBS = @MCA_opal_event_STATIC_LTLIBS@ +MCA_opal_event_STATIC_SUBDIRS = @MCA_opal_event_STATIC_SUBDIRS@ +MCA_opal_hwloc_ALL_COMPONENTS = @MCA_opal_hwloc_ALL_COMPONENTS@ +MCA_opal_hwloc_ALL_SUBDIRS = @MCA_opal_hwloc_ALL_SUBDIRS@ +MCA_opal_hwloc_DSO_COMPONENTS = @MCA_opal_hwloc_DSO_COMPONENTS@ +MCA_opal_hwloc_DSO_SUBDIRS = @MCA_opal_hwloc_DSO_SUBDIRS@ +MCA_opal_hwloc_STATIC_COMPONENTS = @MCA_opal_hwloc_STATIC_COMPONENTS@ +MCA_opal_hwloc_STATIC_LTLIBS = @MCA_opal_hwloc_STATIC_LTLIBS@ +MCA_opal_hwloc_STATIC_SUBDIRS = @MCA_opal_hwloc_STATIC_SUBDIRS@ +MCA_opal_if_ALL_COMPONENTS = @MCA_opal_if_ALL_COMPONENTS@ +MCA_opal_if_ALL_SUBDIRS = @MCA_opal_if_ALL_SUBDIRS@ +MCA_opal_if_DSO_COMPONENTS = @MCA_opal_if_DSO_COMPONENTS@ +MCA_opal_if_DSO_SUBDIRS = @MCA_opal_if_DSO_SUBDIRS@ +MCA_opal_if_STATIC_COMPONENTS = @MCA_opal_if_STATIC_COMPONENTS@ +MCA_opal_if_STATIC_LTLIBS = @MCA_opal_if_STATIC_LTLIBS@ +MCA_opal_if_STATIC_SUBDIRS = @MCA_opal_if_STATIC_SUBDIRS@ +MCA_opal_installdirs_ALL_COMPONENTS = @MCA_opal_installdirs_ALL_COMPONENTS@ +MCA_opal_installdirs_ALL_SUBDIRS = @MCA_opal_installdirs_ALL_SUBDIRS@ +MCA_opal_installdirs_DSO_COMPONENTS = @MCA_opal_installdirs_DSO_COMPONENTS@ +MCA_opal_installdirs_DSO_SUBDIRS = @MCA_opal_installdirs_DSO_SUBDIRS@ +MCA_opal_installdirs_STATIC_COMPONENTS = @MCA_opal_installdirs_STATIC_COMPONENTS@ +MCA_opal_installdirs_STATIC_LTLIBS = @MCA_opal_installdirs_STATIC_LTLIBS@ +MCA_opal_installdirs_STATIC_SUBDIRS = @MCA_opal_installdirs_STATIC_SUBDIRS@ +MCA_opal_memchecker_ALL_COMPONENTS = @MCA_opal_memchecker_ALL_COMPONENTS@ +MCA_opal_memchecker_ALL_SUBDIRS = @MCA_opal_memchecker_ALL_SUBDIRS@ +MCA_opal_memchecker_DSO_COMPONENTS = @MCA_opal_memchecker_DSO_COMPONENTS@ +MCA_opal_memchecker_DSO_SUBDIRS = @MCA_opal_memchecker_DSO_SUBDIRS@ +MCA_opal_memchecker_STATIC_COMPONENTS = @MCA_opal_memchecker_STATIC_COMPONENTS@ +MCA_opal_memchecker_STATIC_LTLIBS = @MCA_opal_memchecker_STATIC_LTLIBS@ +MCA_opal_memchecker_STATIC_SUBDIRS = @MCA_opal_memchecker_STATIC_SUBDIRS@ +MCA_opal_memcpy_ALL_COMPONENTS = @MCA_opal_memcpy_ALL_COMPONENTS@ +MCA_opal_memcpy_ALL_SUBDIRS = @MCA_opal_memcpy_ALL_SUBDIRS@ +MCA_opal_memcpy_DSO_COMPONENTS = @MCA_opal_memcpy_DSO_COMPONENTS@ +MCA_opal_memcpy_DSO_SUBDIRS = @MCA_opal_memcpy_DSO_SUBDIRS@ +MCA_opal_memcpy_STATIC_COMPONENTS = @MCA_opal_memcpy_STATIC_COMPONENTS@ +MCA_opal_memcpy_STATIC_LTLIBS = @MCA_opal_memcpy_STATIC_LTLIBS@ +MCA_opal_memcpy_STATIC_SUBDIRS = @MCA_opal_memcpy_STATIC_SUBDIRS@ +MCA_opal_memory_ALL_COMPONENTS = @MCA_opal_memory_ALL_COMPONENTS@ +MCA_opal_memory_ALL_SUBDIRS = @MCA_opal_memory_ALL_SUBDIRS@ +MCA_opal_memory_DSO_COMPONENTS = @MCA_opal_memory_DSO_COMPONENTS@ +MCA_opal_memory_DSO_SUBDIRS = @MCA_opal_memory_DSO_SUBDIRS@ +MCA_opal_memory_STATIC_COMPONENTS = @MCA_opal_memory_STATIC_COMPONENTS@ +MCA_opal_memory_STATIC_LTLIBS = @MCA_opal_memory_STATIC_LTLIBS@ +MCA_opal_memory_STATIC_SUBDIRS = @MCA_opal_memory_STATIC_SUBDIRS@ +MCA_opal_mpool_ALL_COMPONENTS = @MCA_opal_mpool_ALL_COMPONENTS@ +MCA_opal_mpool_ALL_SUBDIRS = @MCA_opal_mpool_ALL_SUBDIRS@ +MCA_opal_mpool_DSO_COMPONENTS = @MCA_opal_mpool_DSO_COMPONENTS@ +MCA_opal_mpool_DSO_SUBDIRS = @MCA_opal_mpool_DSO_SUBDIRS@ +MCA_opal_mpool_STATIC_COMPONENTS = @MCA_opal_mpool_STATIC_COMPONENTS@ +MCA_opal_mpool_STATIC_LTLIBS = @MCA_opal_mpool_STATIC_LTLIBS@ +MCA_opal_mpool_STATIC_SUBDIRS = @MCA_opal_mpool_STATIC_SUBDIRS@ +MCA_opal_patcher_ALL_COMPONENTS = @MCA_opal_patcher_ALL_COMPONENTS@ +MCA_opal_patcher_ALL_SUBDIRS = @MCA_opal_patcher_ALL_SUBDIRS@ +MCA_opal_patcher_DSO_COMPONENTS = @MCA_opal_patcher_DSO_COMPONENTS@ +MCA_opal_patcher_DSO_SUBDIRS = @MCA_opal_patcher_DSO_SUBDIRS@ +MCA_opal_patcher_STATIC_COMPONENTS = @MCA_opal_patcher_STATIC_COMPONENTS@ +MCA_opal_patcher_STATIC_LTLIBS = @MCA_opal_patcher_STATIC_LTLIBS@ +MCA_opal_patcher_STATIC_SUBDIRS = @MCA_opal_patcher_STATIC_SUBDIRS@ +MCA_opal_pmix_ALL_COMPONENTS = @MCA_opal_pmix_ALL_COMPONENTS@ +MCA_opal_pmix_ALL_SUBDIRS = @MCA_opal_pmix_ALL_SUBDIRS@ +MCA_opal_pmix_DSO_COMPONENTS = @MCA_opal_pmix_DSO_COMPONENTS@ +MCA_opal_pmix_DSO_SUBDIRS = @MCA_opal_pmix_DSO_SUBDIRS@ +MCA_opal_pmix_STATIC_COMPONENTS = @MCA_opal_pmix_STATIC_COMPONENTS@ +MCA_opal_pmix_STATIC_LTLIBS = @MCA_opal_pmix_STATIC_LTLIBS@ +MCA_opal_pmix_STATIC_SUBDIRS = @MCA_opal_pmix_STATIC_SUBDIRS@ +MCA_opal_pstat_ALL_COMPONENTS = @MCA_opal_pstat_ALL_COMPONENTS@ +MCA_opal_pstat_ALL_SUBDIRS = @MCA_opal_pstat_ALL_SUBDIRS@ +MCA_opal_pstat_DSO_COMPONENTS = @MCA_opal_pstat_DSO_COMPONENTS@ +MCA_opal_pstat_DSO_SUBDIRS = @MCA_opal_pstat_DSO_SUBDIRS@ +MCA_opal_pstat_STATIC_COMPONENTS = @MCA_opal_pstat_STATIC_COMPONENTS@ +MCA_opal_pstat_STATIC_LTLIBS = @MCA_opal_pstat_STATIC_LTLIBS@ +MCA_opal_pstat_STATIC_SUBDIRS = @MCA_opal_pstat_STATIC_SUBDIRS@ +MCA_opal_rcache_ALL_COMPONENTS = @MCA_opal_rcache_ALL_COMPONENTS@ +MCA_opal_rcache_ALL_SUBDIRS = @MCA_opal_rcache_ALL_SUBDIRS@ +MCA_opal_rcache_DSO_COMPONENTS = @MCA_opal_rcache_DSO_COMPONENTS@ +MCA_opal_rcache_DSO_SUBDIRS = @MCA_opal_rcache_DSO_SUBDIRS@ +MCA_opal_rcache_STATIC_COMPONENTS = @MCA_opal_rcache_STATIC_COMPONENTS@ +MCA_opal_rcache_STATIC_LTLIBS = @MCA_opal_rcache_STATIC_LTLIBS@ +MCA_opal_rcache_STATIC_SUBDIRS = @MCA_opal_rcache_STATIC_SUBDIRS@ +MCA_opal_reachable_ALL_COMPONENTS = @MCA_opal_reachable_ALL_COMPONENTS@ +MCA_opal_reachable_ALL_SUBDIRS = @MCA_opal_reachable_ALL_SUBDIRS@ +MCA_opal_reachable_DSO_COMPONENTS = @MCA_opal_reachable_DSO_COMPONENTS@ +MCA_opal_reachable_DSO_SUBDIRS = @MCA_opal_reachable_DSO_SUBDIRS@ +MCA_opal_reachable_STATIC_COMPONENTS = @MCA_opal_reachable_STATIC_COMPONENTS@ +MCA_opal_reachable_STATIC_LTLIBS = @MCA_opal_reachable_STATIC_LTLIBS@ +MCA_opal_reachable_STATIC_SUBDIRS = @MCA_opal_reachable_STATIC_SUBDIRS@ +MCA_opal_shmem_ALL_COMPONENTS = @MCA_opal_shmem_ALL_COMPONENTS@ +MCA_opal_shmem_ALL_SUBDIRS = @MCA_opal_shmem_ALL_SUBDIRS@ +MCA_opal_shmem_DSO_COMPONENTS = @MCA_opal_shmem_DSO_COMPONENTS@ +MCA_opal_shmem_DSO_SUBDIRS = @MCA_opal_shmem_DSO_SUBDIRS@ +MCA_opal_shmem_STATIC_COMPONENTS = @MCA_opal_shmem_STATIC_COMPONENTS@ +MCA_opal_shmem_STATIC_LTLIBS = @MCA_opal_shmem_STATIC_LTLIBS@ +MCA_opal_shmem_STATIC_SUBDIRS = @MCA_opal_shmem_STATIC_SUBDIRS@ +MCA_opal_timer_ALL_COMPONENTS = @MCA_opal_timer_ALL_COMPONENTS@ +MCA_opal_timer_ALL_SUBDIRS = @MCA_opal_timer_ALL_SUBDIRS@ +MCA_opal_timer_DSO_COMPONENTS = @MCA_opal_timer_DSO_COMPONENTS@ +MCA_opal_timer_DSO_SUBDIRS = @MCA_opal_timer_DSO_SUBDIRS@ +MCA_opal_timer_STATIC_COMPONENTS = @MCA_opal_timer_STATIC_COMPONENTS@ +MCA_opal_timer_STATIC_LTLIBS = @MCA_opal_timer_STATIC_LTLIBS@ +MCA_opal_timer_STATIC_SUBDIRS = @MCA_opal_timer_STATIC_SUBDIRS@ +MCA_orte_FRAMEWORKS = @MCA_orte_FRAMEWORKS@ +MCA_orte_FRAMEWORKS_SUBDIRS = @MCA_orte_FRAMEWORKS_SUBDIRS@ +MCA_orte_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_orte_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_orte_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_orte_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_orte_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_orte_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_orte_FRAMEWORK_LIBS = @MCA_orte_FRAMEWORK_LIBS@ +MCA_orte_common_ALL_COMPONENTS = @MCA_orte_common_ALL_COMPONENTS@ +MCA_orte_common_ALL_SUBDIRS = @MCA_orte_common_ALL_SUBDIRS@ +MCA_orte_common_DSO_COMPONENTS = @MCA_orte_common_DSO_COMPONENTS@ +MCA_orte_common_DSO_SUBDIRS = @MCA_orte_common_DSO_SUBDIRS@ +MCA_orte_common_STATIC_COMPONENTS = @MCA_orte_common_STATIC_COMPONENTS@ +MCA_orte_common_STATIC_LTLIBS = @MCA_orte_common_STATIC_LTLIBS@ +MCA_orte_common_STATIC_SUBDIRS = @MCA_orte_common_STATIC_SUBDIRS@ +MCA_orte_errmgr_ALL_COMPONENTS = @MCA_orte_errmgr_ALL_COMPONENTS@ +MCA_orte_errmgr_ALL_SUBDIRS = @MCA_orte_errmgr_ALL_SUBDIRS@ +MCA_orte_errmgr_DSO_COMPONENTS = @MCA_orte_errmgr_DSO_COMPONENTS@ +MCA_orte_errmgr_DSO_SUBDIRS = @MCA_orte_errmgr_DSO_SUBDIRS@ +MCA_orte_errmgr_STATIC_COMPONENTS = @MCA_orte_errmgr_STATIC_COMPONENTS@ +MCA_orte_errmgr_STATIC_LTLIBS = @MCA_orte_errmgr_STATIC_LTLIBS@ +MCA_orte_errmgr_STATIC_SUBDIRS = @MCA_orte_errmgr_STATIC_SUBDIRS@ +MCA_orte_ess_ALL_COMPONENTS = @MCA_orte_ess_ALL_COMPONENTS@ +MCA_orte_ess_ALL_SUBDIRS = @MCA_orte_ess_ALL_SUBDIRS@ +MCA_orte_ess_DSO_COMPONENTS = @MCA_orte_ess_DSO_COMPONENTS@ +MCA_orte_ess_DSO_SUBDIRS = @MCA_orte_ess_DSO_SUBDIRS@ +MCA_orte_ess_STATIC_COMPONENTS = @MCA_orte_ess_STATIC_COMPONENTS@ +MCA_orte_ess_STATIC_LTLIBS = @MCA_orte_ess_STATIC_LTLIBS@ +MCA_orte_ess_STATIC_SUBDIRS = @MCA_orte_ess_STATIC_SUBDIRS@ +MCA_orte_filem_ALL_COMPONENTS = @MCA_orte_filem_ALL_COMPONENTS@ +MCA_orte_filem_ALL_SUBDIRS = @MCA_orte_filem_ALL_SUBDIRS@ +MCA_orte_filem_DSO_COMPONENTS = @MCA_orte_filem_DSO_COMPONENTS@ +MCA_orte_filem_DSO_SUBDIRS = @MCA_orte_filem_DSO_SUBDIRS@ +MCA_orte_filem_STATIC_COMPONENTS = @MCA_orte_filem_STATIC_COMPONENTS@ +MCA_orte_filem_STATIC_LTLIBS = @MCA_orte_filem_STATIC_LTLIBS@ +MCA_orte_filem_STATIC_SUBDIRS = @MCA_orte_filem_STATIC_SUBDIRS@ +MCA_orte_grpcomm_ALL_COMPONENTS = @MCA_orte_grpcomm_ALL_COMPONENTS@ +MCA_orte_grpcomm_ALL_SUBDIRS = @MCA_orte_grpcomm_ALL_SUBDIRS@ +MCA_orte_grpcomm_DSO_COMPONENTS = @MCA_orte_grpcomm_DSO_COMPONENTS@ +MCA_orte_grpcomm_DSO_SUBDIRS = @MCA_orte_grpcomm_DSO_SUBDIRS@ +MCA_orte_grpcomm_STATIC_COMPONENTS = @MCA_orte_grpcomm_STATIC_COMPONENTS@ +MCA_orte_grpcomm_STATIC_LTLIBS = @MCA_orte_grpcomm_STATIC_LTLIBS@ +MCA_orte_grpcomm_STATIC_SUBDIRS = @MCA_orte_grpcomm_STATIC_SUBDIRS@ +MCA_orte_iof_ALL_COMPONENTS = @MCA_orte_iof_ALL_COMPONENTS@ +MCA_orte_iof_ALL_SUBDIRS = @MCA_orte_iof_ALL_SUBDIRS@ +MCA_orte_iof_DSO_COMPONENTS = @MCA_orte_iof_DSO_COMPONENTS@ +MCA_orte_iof_DSO_SUBDIRS = @MCA_orte_iof_DSO_SUBDIRS@ +MCA_orte_iof_STATIC_COMPONENTS = @MCA_orte_iof_STATIC_COMPONENTS@ +MCA_orte_iof_STATIC_LTLIBS = @MCA_orte_iof_STATIC_LTLIBS@ +MCA_orte_iof_STATIC_SUBDIRS = @MCA_orte_iof_STATIC_SUBDIRS@ +MCA_orte_odls_ALL_COMPONENTS = @MCA_orte_odls_ALL_COMPONENTS@ +MCA_orte_odls_ALL_SUBDIRS = @MCA_orte_odls_ALL_SUBDIRS@ +MCA_orte_odls_DSO_COMPONENTS = @MCA_orte_odls_DSO_COMPONENTS@ +MCA_orte_odls_DSO_SUBDIRS = @MCA_orte_odls_DSO_SUBDIRS@ +MCA_orte_odls_STATIC_COMPONENTS = @MCA_orte_odls_STATIC_COMPONENTS@ +MCA_orte_odls_STATIC_LTLIBS = @MCA_orte_odls_STATIC_LTLIBS@ +MCA_orte_odls_STATIC_SUBDIRS = @MCA_orte_odls_STATIC_SUBDIRS@ +MCA_orte_oob_ALL_COMPONENTS = @MCA_orte_oob_ALL_COMPONENTS@ +MCA_orte_oob_ALL_SUBDIRS = @MCA_orte_oob_ALL_SUBDIRS@ +MCA_orte_oob_DSO_COMPONENTS = @MCA_orte_oob_DSO_COMPONENTS@ +MCA_orte_oob_DSO_SUBDIRS = @MCA_orte_oob_DSO_SUBDIRS@ +MCA_orte_oob_STATIC_COMPONENTS = @MCA_orte_oob_STATIC_COMPONENTS@ +MCA_orte_oob_STATIC_LTLIBS = @MCA_orte_oob_STATIC_LTLIBS@ +MCA_orte_oob_STATIC_SUBDIRS = @MCA_orte_oob_STATIC_SUBDIRS@ +MCA_orte_plm_ALL_COMPONENTS = @MCA_orte_plm_ALL_COMPONENTS@ +MCA_orte_plm_ALL_SUBDIRS = @MCA_orte_plm_ALL_SUBDIRS@ +MCA_orte_plm_DSO_COMPONENTS = @MCA_orte_plm_DSO_COMPONENTS@ +MCA_orte_plm_DSO_SUBDIRS = @MCA_orte_plm_DSO_SUBDIRS@ +MCA_orte_plm_STATIC_COMPONENTS = @MCA_orte_plm_STATIC_COMPONENTS@ +MCA_orte_plm_STATIC_LTLIBS = @MCA_orte_plm_STATIC_LTLIBS@ +MCA_orte_plm_STATIC_SUBDIRS = @MCA_orte_plm_STATIC_SUBDIRS@ +MCA_orte_ras_ALL_COMPONENTS = @MCA_orte_ras_ALL_COMPONENTS@ +MCA_orte_ras_ALL_SUBDIRS = @MCA_orte_ras_ALL_SUBDIRS@ +MCA_orte_ras_DSO_COMPONENTS = @MCA_orte_ras_DSO_COMPONENTS@ +MCA_orte_ras_DSO_SUBDIRS = @MCA_orte_ras_DSO_SUBDIRS@ +MCA_orte_ras_STATIC_COMPONENTS = @MCA_orte_ras_STATIC_COMPONENTS@ +MCA_orte_ras_STATIC_LTLIBS = @MCA_orte_ras_STATIC_LTLIBS@ +MCA_orte_ras_STATIC_SUBDIRS = @MCA_orte_ras_STATIC_SUBDIRS@ +MCA_orte_regx_ALL_COMPONENTS = @MCA_orte_regx_ALL_COMPONENTS@ +MCA_orte_regx_ALL_SUBDIRS = @MCA_orte_regx_ALL_SUBDIRS@ +MCA_orte_regx_DSO_COMPONENTS = @MCA_orte_regx_DSO_COMPONENTS@ +MCA_orte_regx_DSO_SUBDIRS = @MCA_orte_regx_DSO_SUBDIRS@ +MCA_orte_regx_STATIC_COMPONENTS = @MCA_orte_regx_STATIC_COMPONENTS@ +MCA_orte_regx_STATIC_LTLIBS = @MCA_orte_regx_STATIC_LTLIBS@ +MCA_orte_regx_STATIC_SUBDIRS = @MCA_orte_regx_STATIC_SUBDIRS@ +MCA_orte_rmaps_ALL_COMPONENTS = @MCA_orte_rmaps_ALL_COMPONENTS@ +MCA_orte_rmaps_ALL_SUBDIRS = @MCA_orte_rmaps_ALL_SUBDIRS@ +MCA_orte_rmaps_DSO_COMPONENTS = @MCA_orte_rmaps_DSO_COMPONENTS@ +MCA_orte_rmaps_DSO_SUBDIRS = @MCA_orte_rmaps_DSO_SUBDIRS@ +MCA_orte_rmaps_STATIC_COMPONENTS = @MCA_orte_rmaps_STATIC_COMPONENTS@ +MCA_orte_rmaps_STATIC_LTLIBS = @MCA_orte_rmaps_STATIC_LTLIBS@ +MCA_orte_rmaps_STATIC_SUBDIRS = @MCA_orte_rmaps_STATIC_SUBDIRS@ +MCA_orte_rml_ALL_COMPONENTS = @MCA_orte_rml_ALL_COMPONENTS@ +MCA_orte_rml_ALL_SUBDIRS = @MCA_orte_rml_ALL_SUBDIRS@ +MCA_orte_rml_DSO_COMPONENTS = @MCA_orte_rml_DSO_COMPONENTS@ +MCA_orte_rml_DSO_SUBDIRS = @MCA_orte_rml_DSO_SUBDIRS@ +MCA_orte_rml_STATIC_COMPONENTS = @MCA_orte_rml_STATIC_COMPONENTS@ +MCA_orte_rml_STATIC_LTLIBS = @MCA_orte_rml_STATIC_LTLIBS@ +MCA_orte_rml_STATIC_SUBDIRS = @MCA_orte_rml_STATIC_SUBDIRS@ +MCA_orte_routed_ALL_COMPONENTS = @MCA_orte_routed_ALL_COMPONENTS@ +MCA_orte_routed_ALL_SUBDIRS = @MCA_orte_routed_ALL_SUBDIRS@ +MCA_orte_routed_DSO_COMPONENTS = @MCA_orte_routed_DSO_COMPONENTS@ +MCA_orte_routed_DSO_SUBDIRS = @MCA_orte_routed_DSO_SUBDIRS@ +MCA_orte_routed_STATIC_COMPONENTS = @MCA_orte_routed_STATIC_COMPONENTS@ +MCA_orte_routed_STATIC_LTLIBS = @MCA_orte_routed_STATIC_LTLIBS@ +MCA_orte_routed_STATIC_SUBDIRS = @MCA_orte_routed_STATIC_SUBDIRS@ +MCA_orte_rtc_ALL_COMPONENTS = @MCA_orte_rtc_ALL_COMPONENTS@ +MCA_orte_rtc_ALL_SUBDIRS = @MCA_orte_rtc_ALL_SUBDIRS@ +MCA_orte_rtc_DSO_COMPONENTS = @MCA_orte_rtc_DSO_COMPONENTS@ +MCA_orte_rtc_DSO_SUBDIRS = @MCA_orte_rtc_DSO_SUBDIRS@ +MCA_orte_rtc_STATIC_COMPONENTS = @MCA_orte_rtc_STATIC_COMPONENTS@ +MCA_orte_rtc_STATIC_LTLIBS = @MCA_orte_rtc_STATIC_LTLIBS@ +MCA_orte_rtc_STATIC_SUBDIRS = @MCA_orte_rtc_STATIC_SUBDIRS@ +MCA_orte_schizo_ALL_COMPONENTS = @MCA_orte_schizo_ALL_COMPONENTS@ +MCA_orte_schizo_ALL_SUBDIRS = @MCA_orte_schizo_ALL_SUBDIRS@ +MCA_orte_schizo_DSO_COMPONENTS = @MCA_orte_schizo_DSO_COMPONENTS@ +MCA_orte_schizo_DSO_SUBDIRS = @MCA_orte_schizo_DSO_SUBDIRS@ +MCA_orte_schizo_STATIC_COMPONENTS = @MCA_orte_schizo_STATIC_COMPONENTS@ +MCA_orte_schizo_STATIC_LTLIBS = @MCA_orte_schizo_STATIC_LTLIBS@ +MCA_orte_schizo_STATIC_SUBDIRS = @MCA_orte_schizo_STATIC_SUBDIRS@ +MCA_orte_snapc_ALL_COMPONENTS = @MCA_orte_snapc_ALL_COMPONENTS@ +MCA_orte_snapc_ALL_SUBDIRS = @MCA_orte_snapc_ALL_SUBDIRS@ +MCA_orte_snapc_DSO_COMPONENTS = @MCA_orte_snapc_DSO_COMPONENTS@ +MCA_orte_snapc_DSO_SUBDIRS = @MCA_orte_snapc_DSO_SUBDIRS@ +MCA_orte_snapc_STATIC_COMPONENTS = @MCA_orte_snapc_STATIC_COMPONENTS@ +MCA_orte_snapc_STATIC_LTLIBS = @MCA_orte_snapc_STATIC_LTLIBS@ +MCA_orte_snapc_STATIC_SUBDIRS = @MCA_orte_snapc_STATIC_SUBDIRS@ +MCA_orte_sstore_ALL_COMPONENTS = @MCA_orte_sstore_ALL_COMPONENTS@ +MCA_orte_sstore_ALL_SUBDIRS = @MCA_orte_sstore_ALL_SUBDIRS@ +MCA_orte_sstore_DSO_COMPONENTS = @MCA_orte_sstore_DSO_COMPONENTS@ +MCA_orte_sstore_DSO_SUBDIRS = @MCA_orte_sstore_DSO_SUBDIRS@ +MCA_orte_sstore_STATIC_COMPONENTS = @MCA_orte_sstore_STATIC_COMPONENTS@ +MCA_orte_sstore_STATIC_LTLIBS = @MCA_orte_sstore_STATIC_LTLIBS@ +MCA_orte_sstore_STATIC_SUBDIRS = @MCA_orte_sstore_STATIC_SUBDIRS@ +MCA_orte_state_ALL_COMPONENTS = @MCA_orte_state_ALL_COMPONENTS@ +MCA_orte_state_ALL_SUBDIRS = @MCA_orte_state_ALL_SUBDIRS@ +MCA_orte_state_DSO_COMPONENTS = @MCA_orte_state_DSO_COMPONENTS@ +MCA_orte_state_DSO_SUBDIRS = @MCA_orte_state_DSO_SUBDIRS@ +MCA_orte_state_STATIC_COMPONENTS = @MCA_orte_state_STATIC_COMPONENTS@ +MCA_orte_state_STATIC_LTLIBS = @MCA_orte_state_STATIC_LTLIBS@ +MCA_orte_state_STATIC_SUBDIRS = @MCA_orte_state_STATIC_SUBDIRS@ +MCA_oshmem_FRAMEWORKS = @MCA_oshmem_FRAMEWORKS@ +MCA_oshmem_FRAMEWORKS_SUBDIRS = @MCA_oshmem_FRAMEWORKS_SUBDIRS@ +MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS = @MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS@ +MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS = @MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS@ +MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS = @MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS@ +MCA_oshmem_FRAMEWORK_LIBS = @MCA_oshmem_FRAMEWORK_LIBS@ +MCA_oshmem_atomic_ALL_COMPONENTS = @MCA_oshmem_atomic_ALL_COMPONENTS@ +MCA_oshmem_atomic_ALL_SUBDIRS = @MCA_oshmem_atomic_ALL_SUBDIRS@ +MCA_oshmem_atomic_DSO_COMPONENTS = @MCA_oshmem_atomic_DSO_COMPONENTS@ +MCA_oshmem_atomic_DSO_SUBDIRS = @MCA_oshmem_atomic_DSO_SUBDIRS@ +MCA_oshmem_atomic_STATIC_COMPONENTS = @MCA_oshmem_atomic_STATIC_COMPONENTS@ +MCA_oshmem_atomic_STATIC_LTLIBS = @MCA_oshmem_atomic_STATIC_LTLIBS@ +MCA_oshmem_atomic_STATIC_SUBDIRS = @MCA_oshmem_atomic_STATIC_SUBDIRS@ +MCA_oshmem_memheap_ALL_COMPONENTS = @MCA_oshmem_memheap_ALL_COMPONENTS@ +MCA_oshmem_memheap_ALL_SUBDIRS = @MCA_oshmem_memheap_ALL_SUBDIRS@ +MCA_oshmem_memheap_DIRECT_CALL_HEADER = @MCA_oshmem_memheap_DIRECT_CALL_HEADER@ +MCA_oshmem_memheap_DSO_COMPONENTS = @MCA_oshmem_memheap_DSO_COMPONENTS@ +MCA_oshmem_memheap_DSO_SUBDIRS = @MCA_oshmem_memheap_DSO_SUBDIRS@ +MCA_oshmem_memheap_STATIC_COMPONENTS = @MCA_oshmem_memheap_STATIC_COMPONENTS@ +MCA_oshmem_memheap_STATIC_LTLIBS = @MCA_oshmem_memheap_STATIC_LTLIBS@ +MCA_oshmem_memheap_STATIC_SUBDIRS = @MCA_oshmem_memheap_STATIC_SUBDIRS@ +MCA_oshmem_scoll_ALL_COMPONENTS = @MCA_oshmem_scoll_ALL_COMPONENTS@ +MCA_oshmem_scoll_ALL_SUBDIRS = @MCA_oshmem_scoll_ALL_SUBDIRS@ +MCA_oshmem_scoll_DSO_COMPONENTS = @MCA_oshmem_scoll_DSO_COMPONENTS@ +MCA_oshmem_scoll_DSO_SUBDIRS = @MCA_oshmem_scoll_DSO_SUBDIRS@ +MCA_oshmem_scoll_STATIC_COMPONENTS = @MCA_oshmem_scoll_STATIC_COMPONENTS@ +MCA_oshmem_scoll_STATIC_LTLIBS = @MCA_oshmem_scoll_STATIC_LTLIBS@ +MCA_oshmem_scoll_STATIC_SUBDIRS = @MCA_oshmem_scoll_STATIC_SUBDIRS@ +MCA_oshmem_spml_ALL_COMPONENTS = @MCA_oshmem_spml_ALL_COMPONENTS@ +MCA_oshmem_spml_ALL_SUBDIRS = @MCA_oshmem_spml_ALL_SUBDIRS@ +MCA_oshmem_spml_DIRECT_CALL_HEADER = @MCA_oshmem_spml_DIRECT_CALL_HEADER@ +MCA_oshmem_spml_DSO_COMPONENTS = @MCA_oshmem_spml_DSO_COMPONENTS@ +MCA_oshmem_spml_DSO_SUBDIRS = @MCA_oshmem_spml_DSO_SUBDIRS@ +MCA_oshmem_spml_STATIC_COMPONENTS = @MCA_oshmem_spml_STATIC_COMPONENTS@ +MCA_oshmem_spml_STATIC_LTLIBS = @MCA_oshmem_spml_STATIC_LTLIBS@ +MCA_oshmem_spml_STATIC_SUBDIRS = @MCA_oshmem_spml_STATIC_SUBDIRS@ +MCA_oshmem_sshmem_ALL_COMPONENTS = @MCA_oshmem_sshmem_ALL_COMPONENTS@ +MCA_oshmem_sshmem_ALL_SUBDIRS = @MCA_oshmem_sshmem_ALL_SUBDIRS@ +MCA_oshmem_sshmem_DSO_COMPONENTS = @MCA_oshmem_sshmem_DSO_COMPONENTS@ +MCA_oshmem_sshmem_DSO_SUBDIRS = @MCA_oshmem_sshmem_DSO_SUBDIRS@ +MCA_oshmem_sshmem_STATIC_COMPONENTS = @MCA_oshmem_sshmem_STATIC_COMPONENTS@ +MCA_oshmem_sshmem_STATIC_LTLIBS = @MCA_oshmem_sshmem_STATIC_LTLIBS@ +MCA_oshmem_sshmem_STATIC_SUBDIRS = @MCA_oshmem_sshmem_STATIC_SUBDIRS@ +MKDIR_P = @MKDIR_P@ +MPIR_UNWIND_CFLAGS = @MPIR_UNWIND_CFLAGS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMPI_ALIGNMENT_FORTRAN_CHARACTER = @OMPI_ALIGNMENT_FORTRAN_CHARACTER@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX = @OMPI_ALIGNMENT_FORTRAN_COMPLEX@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX16 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX16@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX32 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX32@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX4 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX4@ +OMPI_ALIGNMENT_FORTRAN_COMPLEX8 = @OMPI_ALIGNMENT_FORTRAN_COMPLEX8@ +OMPI_ALIGNMENT_FORTRAN_DOUBLE_COMPLEX = @OMPI_ALIGNMENT_FORTRAN_DOUBLE_COMPLEX@ +OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION = @OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION@ +OMPI_ALIGNMENT_FORTRAN_INTEGER = @OMPI_ALIGNMENT_FORTRAN_INTEGER@ +OMPI_ALIGNMENT_FORTRAN_INTEGER1 = @OMPI_ALIGNMENT_FORTRAN_INTEGER1@ +OMPI_ALIGNMENT_FORTRAN_INTEGER16 = @OMPI_ALIGNMENT_FORTRAN_INTEGER16@ +OMPI_ALIGNMENT_FORTRAN_INTEGER2 = @OMPI_ALIGNMENT_FORTRAN_INTEGER2@ +OMPI_ALIGNMENT_FORTRAN_INTEGER4 = @OMPI_ALIGNMENT_FORTRAN_INTEGER4@ +OMPI_ALIGNMENT_FORTRAN_INTEGER8 = @OMPI_ALIGNMENT_FORTRAN_INTEGER8@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL = @OMPI_ALIGNMENT_FORTRAN_LOGICAL@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL1 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL1@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL2 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL2@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL4 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL4@ +OMPI_ALIGNMENT_FORTRAN_LOGICAL8 = @OMPI_ALIGNMENT_FORTRAN_LOGICAL8@ +OMPI_ALIGNMENT_FORTRAN_REAL = @OMPI_ALIGNMENT_FORTRAN_REAL@ +OMPI_ALIGNMENT_FORTRAN_REAL16 = @OMPI_ALIGNMENT_FORTRAN_REAL16@ +OMPI_ALIGNMENT_FORTRAN_REAL2 = @OMPI_ALIGNMENT_FORTRAN_REAL2@ +OMPI_ALIGNMENT_FORTRAN_REAL4 = @OMPI_ALIGNMENT_FORTRAN_REAL4@ +OMPI_ALIGNMENT_FORTRAN_REAL8 = @OMPI_ALIGNMENT_FORTRAN_REAL8@ +OMPI_CONTRIB_DIST_SUBDIRS = @OMPI_CONTRIB_DIST_SUBDIRS@ +OMPI_CONTRIB_SUBDIRS = @OMPI_CONTRIB_SUBDIRS@ +OMPI_CXX_ABSOLUTE = @OMPI_CXX_ABSOLUTE@ +OMPI_ENABLE_GREQUEST_EXTENSIONS = @OMPI_ENABLE_GREQUEST_EXTENSIONS@ +OMPI_ENABLE_MPI1_COMPAT = @OMPI_ENABLE_MPI1_COMPAT@ +OMPI_F08_SUFFIX = @OMPI_F08_SUFFIX@ +OMPI_FC = @OMPI_FC@ +OMPI_FC_ABSOLUTE = @OMPI_FC_ABSOLUTE@ +OMPI_FC_MODULE_FLAG = @OMPI_FC_MODULE_FLAG@ +OMPI_FORTRAN_BUILD_SIZEOF = @OMPI_FORTRAN_BUILD_SIZEOF@ +OMPI_FORTRAN_CAPS = @OMPI_FORTRAN_CAPS@ +OMPI_FORTRAN_CKINDS = @OMPI_FORTRAN_CKINDS@ +OMPI_FORTRAN_DOUBLE_UNDERSCORE = @OMPI_FORTRAN_DOUBLE_UNDERSCORE@ +OMPI_FORTRAN_EXTRA_SHARED_LIBRARY_FLAGS = @OMPI_FORTRAN_EXTRA_SHARED_LIBRARY_FLAGS@ +OMPI_FORTRAN_F08_PREDECL = @OMPI_FORTRAN_F08_PREDECL@ +OMPI_FORTRAN_F08_TYPE = @OMPI_FORTRAN_F08_TYPE@ +OMPI_FORTRAN_HAVE_ABSTRACT = @OMPI_FORTRAN_HAVE_ABSTRACT@ +OMPI_FORTRAN_HAVE_ASYNCHRONOUS = @OMPI_FORTRAN_HAVE_ASYNCHRONOUS@ +OMPI_FORTRAN_HAVE_BIND_C = @OMPI_FORTRAN_HAVE_BIND_C@ +OMPI_FORTRAN_HAVE_C_FUNLOC = @OMPI_FORTRAN_HAVE_C_FUNLOC@ +OMPI_FORTRAN_HAVE_INTERFACE = @OMPI_FORTRAN_HAVE_INTERFACE@ +OMPI_FORTRAN_HAVE_ISO_C_BINDING = @OMPI_FORTRAN_HAVE_ISO_C_BINDING@ +OMPI_FORTRAN_HAVE_ISO_FORTRAN_ENV = @OMPI_FORTRAN_HAVE_ISO_FORTRAN_ENV@ +OMPI_FORTRAN_HAVE_PRIVATE = @OMPI_FORTRAN_HAVE_PRIVATE@ +OMPI_FORTRAN_HAVE_PROCEDURE = @OMPI_FORTRAN_HAVE_PROCEDURE@ +OMPI_FORTRAN_HAVE_STORAGE_SIZE = @OMPI_FORTRAN_HAVE_STORAGE_SIZE@ +OMPI_FORTRAN_HAVE_USE_ONLY = @OMPI_FORTRAN_HAVE_USE_ONLY@ +OMPI_FORTRAN_IGNORE_TKR_PREDECL = @OMPI_FORTRAN_IGNORE_TKR_PREDECL@ +OMPI_FORTRAN_IGNORE_TKR_TYPE = @OMPI_FORTRAN_IGNORE_TKR_TYPE@ +OMPI_FORTRAN_IKINDS = @OMPI_FORTRAN_IKINDS@ +OMPI_FORTRAN_MAX_ARRAY_RANK = @OMPI_FORTRAN_MAX_ARRAY_RANK@ +OMPI_FORTRAN_NEED_WRAPPER_ROUTINES = @OMPI_FORTRAN_NEED_WRAPPER_ROUTINES@ +OMPI_FORTRAN_PLAIN = @OMPI_FORTRAN_PLAIN@ +OMPI_FORTRAN_RKINDS = @OMPI_FORTRAN_RKINDS@ +OMPI_FORTRAN_SINGLE_UNDERSCORE = @OMPI_FORTRAN_SINGLE_UNDERSCORE@ +OMPI_FORTRAN_STATUS_SIZE = @OMPI_FORTRAN_STATUS_SIZE@ +OMPI_FORTRAN_USEMPIF08_LIB = @OMPI_FORTRAN_USEMPIF08_LIB@ +OMPI_FORTRAN_USEMPI_DIR = @OMPI_FORTRAN_USEMPI_DIR@ +OMPI_FORTRAN_USEMPI_LIB = @OMPI_FORTRAN_USEMPI_LIB@ +OMPI_F_SUFFIX = @OMPI_F_SUFFIX@ +OMPI_GREEK_VERSION = @OMPI_GREEK_VERSION@ +OMPI_HAVE_FORTRAN_CHARACTER = @OMPI_HAVE_FORTRAN_CHARACTER@ +OMPI_HAVE_FORTRAN_COMPLEX = @OMPI_HAVE_FORTRAN_COMPLEX@ +OMPI_HAVE_FORTRAN_COMPLEX16 = @OMPI_HAVE_FORTRAN_COMPLEX16@ +OMPI_HAVE_FORTRAN_COMPLEX32 = @OMPI_HAVE_FORTRAN_COMPLEX32@ +OMPI_HAVE_FORTRAN_COMPLEX4 = @OMPI_HAVE_FORTRAN_COMPLEX4@ +OMPI_HAVE_FORTRAN_COMPLEX8 = @OMPI_HAVE_FORTRAN_COMPLEX8@ +OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX = @OMPI_HAVE_FORTRAN_DOUBLE_COMPLEX@ +OMPI_HAVE_FORTRAN_DOUBLE_PRECISION = @OMPI_HAVE_FORTRAN_DOUBLE_PRECISION@ +OMPI_HAVE_FORTRAN_INTEGER = @OMPI_HAVE_FORTRAN_INTEGER@ +OMPI_HAVE_FORTRAN_INTEGER1 = @OMPI_HAVE_FORTRAN_INTEGER1@ +OMPI_HAVE_FORTRAN_INTEGER16 = @OMPI_HAVE_FORTRAN_INTEGER16@ +OMPI_HAVE_FORTRAN_INTEGER2 = @OMPI_HAVE_FORTRAN_INTEGER2@ +OMPI_HAVE_FORTRAN_INTEGER4 = @OMPI_HAVE_FORTRAN_INTEGER4@ +OMPI_HAVE_FORTRAN_INTEGER8 = @OMPI_HAVE_FORTRAN_INTEGER8@ +OMPI_HAVE_FORTRAN_LOGICAL = @OMPI_HAVE_FORTRAN_LOGICAL@ +OMPI_HAVE_FORTRAN_LOGICAL1 = @OMPI_HAVE_FORTRAN_LOGICAL1@ +OMPI_HAVE_FORTRAN_LOGICAL2 = @OMPI_HAVE_FORTRAN_LOGICAL2@ +OMPI_HAVE_FORTRAN_LOGICAL4 = @OMPI_HAVE_FORTRAN_LOGICAL4@ +OMPI_HAVE_FORTRAN_LOGICAL8 = @OMPI_HAVE_FORTRAN_LOGICAL8@ +OMPI_HAVE_FORTRAN_REAL = @OMPI_HAVE_FORTRAN_REAL@ +OMPI_HAVE_FORTRAN_REAL16 = @OMPI_HAVE_FORTRAN_REAL16@ +OMPI_HAVE_FORTRAN_REAL2 = @OMPI_HAVE_FORTRAN_REAL2@ +OMPI_HAVE_FORTRAN_REAL4 = @OMPI_HAVE_FORTRAN_REAL4@ +OMPI_HAVE_FORTRAN_REAL8 = @OMPI_HAVE_FORTRAN_REAL8@ +OMPI_JDK_CPPFLAGS = @OMPI_JDK_CPPFLAGS@ +OMPI_KIND_FORTRAN_CHARACTER = @OMPI_KIND_FORTRAN_CHARACTER@ +OMPI_KIND_FORTRAN_COMPLEX = @OMPI_KIND_FORTRAN_COMPLEX@ +OMPI_KIND_FORTRAN_COMPLEX16 = @OMPI_KIND_FORTRAN_COMPLEX16@ +OMPI_KIND_FORTRAN_COMPLEX32 = @OMPI_KIND_FORTRAN_COMPLEX32@ +OMPI_KIND_FORTRAN_COMPLEX4 = @OMPI_KIND_FORTRAN_COMPLEX4@ +OMPI_KIND_FORTRAN_COMPLEX8 = @OMPI_KIND_FORTRAN_COMPLEX8@ +OMPI_KIND_FORTRAN_DOUBLE_COMPLEX = @OMPI_KIND_FORTRAN_DOUBLE_COMPLEX@ +OMPI_KIND_FORTRAN_DOUBLE_PRECISION = @OMPI_KIND_FORTRAN_DOUBLE_PRECISION@ +OMPI_KIND_FORTRAN_INTEGER = @OMPI_KIND_FORTRAN_INTEGER@ +OMPI_KIND_FORTRAN_INTEGER1 = @OMPI_KIND_FORTRAN_INTEGER1@ +OMPI_KIND_FORTRAN_INTEGER16 = @OMPI_KIND_FORTRAN_INTEGER16@ +OMPI_KIND_FORTRAN_INTEGER2 = @OMPI_KIND_FORTRAN_INTEGER2@ +OMPI_KIND_FORTRAN_INTEGER4 = @OMPI_KIND_FORTRAN_INTEGER4@ +OMPI_KIND_FORTRAN_INTEGER8 = @OMPI_KIND_FORTRAN_INTEGER8@ +OMPI_KIND_FORTRAN_LOGICAL = @OMPI_KIND_FORTRAN_LOGICAL@ +OMPI_KIND_FORTRAN_LOGICAL1 = @OMPI_KIND_FORTRAN_LOGICAL1@ +OMPI_KIND_FORTRAN_LOGICAL2 = @OMPI_KIND_FORTRAN_LOGICAL2@ +OMPI_KIND_FORTRAN_LOGICAL4 = @OMPI_KIND_FORTRAN_LOGICAL4@ +OMPI_KIND_FORTRAN_LOGICAL8 = @OMPI_KIND_FORTRAN_LOGICAL8@ +OMPI_KIND_FORTRAN_REAL = @OMPI_KIND_FORTRAN_REAL@ +OMPI_KIND_FORTRAN_REAL16 = @OMPI_KIND_FORTRAN_REAL16@ +OMPI_KIND_FORTRAN_REAL2 = @OMPI_KIND_FORTRAN_REAL2@ +OMPI_KIND_FORTRAN_REAL4 = @OMPI_KIND_FORTRAN_REAL4@ +OMPI_KIND_FORTRAN_REAL8 = @OMPI_KIND_FORTRAN_REAL8@ +OMPI_LIBMPI_EXTRA_LDFLAGS = @OMPI_LIBMPI_EXTRA_LDFLAGS@ +OMPI_LIBMPI_EXTRA_LIBS = @OMPI_LIBMPI_EXTRA_LIBS@ +OMPI_LIBMPI_NAME = @OMPI_LIBMPI_NAME@ +OMPI_MAJOR_VERSION = @OMPI_MAJOR_VERSION@ +OMPI_MINOR_VERSION = @OMPI_MINOR_VERSION@ +OMPI_MPIEXT_ALL_SUBDIRS = @OMPI_MPIEXT_ALL_SUBDIRS@ +OMPI_MPIEXT_C_DIRS = @OMPI_MPIEXT_C_DIRS@ +OMPI_MPIEXT_C_LIBS = @OMPI_MPIEXT_C_LIBS@ +OMPI_MPIEXT_MPIFH_DIRS = @OMPI_MPIEXT_MPIFH_DIRS@ +OMPI_MPIEXT_MPIFH_LIBS = @OMPI_MPIEXT_MPIFH_LIBS@ +OMPI_MPIEXT_USEMPIF08_DIRS = @OMPI_MPIEXT_USEMPIF08_DIRS@ +OMPI_MPIEXT_USEMPIF08_LIBS = @OMPI_MPIEXT_USEMPIF08_LIBS@ +OMPI_MPIEXT_USEMPI_DIRS = @OMPI_MPIEXT_USEMPI_DIRS@ +OMPI_MPIEXT_USEMPI_LIBS = @OMPI_MPIEXT_USEMPI_LIBS@ +OMPI_MPI_ADDRESS_KIND = @OMPI_MPI_ADDRESS_KIND@ +OMPI_MPI_BIND_PREFIX = @OMPI_MPI_BIND_PREFIX@ +OMPI_MPI_COUNT_KIND = @OMPI_MPI_COUNT_KIND@ +OMPI_MPI_INTEGER_KIND = @OMPI_MPI_INTEGER_KIND@ +OMPI_MPI_OFFSET_KIND = @OMPI_MPI_OFFSET_KIND@ +OMPI_MPI_PREFIX = @OMPI_MPI_PREFIX@ +OMPI_PKG_CONFIG_LDFLAGS = @OMPI_PKG_CONFIG_LDFLAGS@ +OMPI_RELEASE_DATE = @OMPI_RELEASE_DATE@ +OMPI_RELEASE_VERSION = @OMPI_RELEASE_VERSION@ +OMPI_REPO_REV = @OMPI_REPO_REV@ +OMPI_SIZEOF_FORTRAN_CHARACTER = @OMPI_SIZEOF_FORTRAN_CHARACTER@ +OMPI_SIZEOF_FORTRAN_COMPLEX = @OMPI_SIZEOF_FORTRAN_COMPLEX@ +OMPI_SIZEOF_FORTRAN_COMPLEX16 = @OMPI_SIZEOF_FORTRAN_COMPLEX16@ +OMPI_SIZEOF_FORTRAN_COMPLEX32 = @OMPI_SIZEOF_FORTRAN_COMPLEX32@ +OMPI_SIZEOF_FORTRAN_COMPLEX4 = @OMPI_SIZEOF_FORTRAN_COMPLEX4@ +OMPI_SIZEOF_FORTRAN_COMPLEX8 = @OMPI_SIZEOF_FORTRAN_COMPLEX8@ +OMPI_SIZEOF_FORTRAN_DOUBLE_COMPLEX = @OMPI_SIZEOF_FORTRAN_DOUBLE_COMPLEX@ +OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION = @OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION@ +OMPI_SIZEOF_FORTRAN_INTEGER = @OMPI_SIZEOF_FORTRAN_INTEGER@ +OMPI_SIZEOF_FORTRAN_INTEGER1 = @OMPI_SIZEOF_FORTRAN_INTEGER1@ +OMPI_SIZEOF_FORTRAN_INTEGER16 = @OMPI_SIZEOF_FORTRAN_INTEGER16@ +OMPI_SIZEOF_FORTRAN_INTEGER2 = @OMPI_SIZEOF_FORTRAN_INTEGER2@ +OMPI_SIZEOF_FORTRAN_INTEGER4 = @OMPI_SIZEOF_FORTRAN_INTEGER4@ +OMPI_SIZEOF_FORTRAN_INTEGER8 = @OMPI_SIZEOF_FORTRAN_INTEGER8@ +OMPI_SIZEOF_FORTRAN_LOGICAL = @OMPI_SIZEOF_FORTRAN_LOGICAL@ +OMPI_SIZEOF_FORTRAN_LOGICAL1 = @OMPI_SIZEOF_FORTRAN_LOGICAL1@ +OMPI_SIZEOF_FORTRAN_LOGICAL2 = @OMPI_SIZEOF_FORTRAN_LOGICAL2@ +OMPI_SIZEOF_FORTRAN_LOGICAL4 = @OMPI_SIZEOF_FORTRAN_LOGICAL4@ +OMPI_SIZEOF_FORTRAN_LOGICAL8 = @OMPI_SIZEOF_FORTRAN_LOGICAL8@ +OMPI_SIZEOF_FORTRAN_REAL = @OMPI_SIZEOF_FORTRAN_REAL@ +OMPI_SIZEOF_FORTRAN_REAL16 = @OMPI_SIZEOF_FORTRAN_REAL16@ +OMPI_SIZEOF_FORTRAN_REAL2 = @OMPI_SIZEOF_FORTRAN_REAL2@ +OMPI_SIZEOF_FORTRAN_REAL4 = @OMPI_SIZEOF_FORTRAN_REAL4@ +OMPI_SIZEOF_FORTRAN_REAL8 = @OMPI_SIZEOF_FORTRAN_REAL8@ +OMPI_TARBALL_VERSION = @OMPI_TARBALL_VERSION@ +OMPI_TOP_BUILDDIR = @OMPI_TOP_BUILDDIR@ +OMPI_TOP_SRCDIR = @OMPI_TOP_SRCDIR@ +OMPI_VERSION = @OMPI_VERSION@ +OMPI_WRAPPER_CXX_LIB = @OMPI_WRAPPER_CXX_LIB@ +OMPI_WRAPPER_CXX_REQUIRED_FILE = @OMPI_WRAPPER_CXX_REQUIRED_FILE@ +OMPI_WRAPPER_EXTRA_CFLAGS = @OMPI_WRAPPER_EXTRA_CFLAGS@ +OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX = @OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX@ +OMPI_WRAPPER_EXTRA_CPPFLAGS = @OMPI_WRAPPER_EXTRA_CPPFLAGS@ +OMPI_WRAPPER_EXTRA_CXXFLAGS = @OMPI_WRAPPER_EXTRA_CXXFLAGS@ +OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX = @OMPI_WRAPPER_EXTRA_CXXFLAGS_PREFIX@ +OMPI_WRAPPER_EXTRA_FCFLAGS = @OMPI_WRAPPER_EXTRA_FCFLAGS@ +OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX = @OMPI_WRAPPER_EXTRA_FCFLAGS_PREFIX@ +OMPI_WRAPPER_EXTRA_FC_LDFLAGS = @OMPI_WRAPPER_EXTRA_FC_LDFLAGS@ +OMPI_WRAPPER_EXTRA_LDFLAGS = @OMPI_WRAPPER_EXTRA_LDFLAGS@ +OMPI_WRAPPER_EXTRA_LIBS = @OMPI_WRAPPER_EXTRA_LIBS@ +OMPI_WRAPPER_FORTRAN_REQUIRED_FILE = @OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@ +OMPI_WRAPPER_INCLUDEDIR = @OMPI_WRAPPER_INCLUDEDIR@ +OMPI_WRAPPER_LIBDIR = @OMPI_WRAPPER_LIBDIR@ +OPAL_ASM_GSYM = @OPAL_ASM_GSYM@ +OPAL_ASM_LSYM = @OPAL_ASM_LSYM@ +OPAL_ASM_SUPPORT_64BIT = @OPAL_ASM_SUPPORT_64BIT@ +OPAL_ASM_TEXT = @OPAL_ASM_TEXT@ +OPAL_ASM_TYPE = @OPAL_ASM_TYPE@ +OPAL_ASSEMBLY_ARCH = @OPAL_ASSEMBLY_ARCH@ +OPAL_ASSEMBLY_BUILTIN = @OPAL_ASSEMBLY_BUILTIN@ +OPAL_ASSEMBLY_FORMAT = @OPAL_ASSEMBLY_FORMAT@ +OPAL_AS_GLOBAL = @OPAL_AS_GLOBAL@ +OPAL_AS_LABEL_SUFFIX = @OPAL_AS_LABEL_SUFFIX@ +OPAL_CC_ABSOLUTE = @OPAL_CC_ABSOLUTE@ +OPAL_CONFIGURE_CLI = @OPAL_CONFIGURE_CLI@ +OPAL_CONFIGURE_DATE = @OPAL_CONFIGURE_DATE@ +OPAL_CONFIGURE_HOST = @OPAL_CONFIGURE_HOST@ +OPAL_CONFIGURE_USER = @OPAL_CONFIGURE_USER@ +OPAL_CXX_ABSOLUTE = @OPAL_CXX_ABSOLUTE@ +OPAL_DEFAULT_MCA_PARAM_CONF = @OPAL_DEFAULT_MCA_PARAM_CONF@ +OPAL_DYN_LIB_PREFIX = @OPAL_DYN_LIB_PREFIX@ +OPAL_DYN_LIB_SUFFIX = @OPAL_DYN_LIB_SUFFIX@ +OPAL_GREEK_VERSION = @OPAL_GREEK_VERSION@ +OPAL_LIB_PREFIX = @OPAL_LIB_PREFIX@ +OPAL_MAJOR_VERSION = @OPAL_MAJOR_VERSION@ +OPAL_MAX_DATAREP_STRING = @OPAL_MAX_DATAREP_STRING@ +OPAL_MAX_ERROR_STRING = @OPAL_MAX_ERROR_STRING@ +OPAL_MAX_INFO_KEY = @OPAL_MAX_INFO_KEY@ +OPAL_MAX_INFO_VAL = @OPAL_MAX_INFO_VAL@ +OPAL_MAX_OBJECT_NAME = @OPAL_MAX_OBJECT_NAME@ +OPAL_MAX_PORT_NAME = @OPAL_MAX_PORT_NAME@ +OPAL_MAX_PROCESSOR_NAME = @OPAL_MAX_PROCESSOR_NAME@ +OPAL_MINOR_VERSION = @OPAL_MINOR_VERSION@ +OPAL_PARAM_FROM_PLATFORM = @OPAL_PARAM_FROM_PLATFORM@ +OPAL_PKG_CONFIG_LDFLAGS = @OPAL_PKG_CONFIG_LDFLAGS@ +OPAL_RELEASE_DATE = @OPAL_RELEASE_DATE@ +OPAL_RELEASE_VERSION = @OPAL_RELEASE_VERSION@ +OPAL_REPO_REV = @OPAL_REPO_REV@ +OPAL_TARBALL_VERSION = @OPAL_TARBALL_VERSION@ +OPAL_TOP_BUILDDIR = @OPAL_TOP_BUILDDIR@ +OPAL_TOP_SRCDIR = @OPAL_TOP_SRCDIR@ +OPAL_VERSION = @OPAL_VERSION@ +OPAL_WRAPPER_EXTRA_CFLAGS = @OPAL_WRAPPER_EXTRA_CFLAGS@ +OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX = @OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX@ +OPAL_WRAPPER_EXTRA_CPPFLAGS = @OPAL_WRAPPER_EXTRA_CPPFLAGS@ +OPAL_WRAPPER_EXTRA_CXXFLAGS = @OPAL_WRAPPER_EXTRA_CXXFLAGS@ +OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX = @OPAL_WRAPPER_EXTRA_CXXFLAGS_PREFIX@ +OPAL_WRAPPER_EXTRA_LDFLAGS = @OPAL_WRAPPER_EXTRA_LDFLAGS@ +OPAL_WRAPPER_EXTRA_LIBS = @OPAL_WRAPPER_EXTRA_LIBS@ +ORTE_GREEK_VERSION = @ORTE_GREEK_VERSION@ +ORTE_LIB_PREFIX = @ORTE_LIB_PREFIX@ +ORTE_MAJOR_VERSION = @ORTE_MAJOR_VERSION@ +ORTE_MINOR_VERSION = @ORTE_MINOR_VERSION@ +ORTE_PKG_CONFIG_LDFLAGS = @ORTE_PKG_CONFIG_LDFLAGS@ +ORTE_RELEASE_DATE = @ORTE_RELEASE_DATE@ +ORTE_RELEASE_VERSION = @ORTE_RELEASE_VERSION@ +ORTE_REPO_REV = @ORTE_REPO_REV@ +ORTE_TARBALL_VERSION = @ORTE_TARBALL_VERSION@ +ORTE_TOP_BUILDDIR = @ORTE_TOP_BUILDDIR@ +ORTE_TOP_SRCDIR = @ORTE_TOP_SRCDIR@ +ORTE_VERSION = @ORTE_VERSION@ +ORTE_WRAPPER_EXTRA_CFLAGS = @ORTE_WRAPPER_EXTRA_CFLAGS@ +ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX = @ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX@ +ORTE_WRAPPER_EXTRA_CPPFLAGS = @ORTE_WRAPPER_EXTRA_CPPFLAGS@ +ORTE_WRAPPER_EXTRA_LDFLAGS = @ORTE_WRAPPER_EXTRA_LDFLAGS@ +ORTE_WRAPPER_EXTRA_LIBS = @ORTE_WRAPPER_EXTRA_LIBS@ +OSHMEM_GREEK_VERSION = @OSHMEM_GREEK_VERSION@ +OSHMEM_LIBSHMEM_EXTRA_LDFLAGS = @OSHMEM_LIBSHMEM_EXTRA_LDFLAGS@ +OSHMEM_LIBSHMEM_EXTRA_LIBS = @OSHMEM_LIBSHMEM_EXTRA_LIBS@ +OSHMEM_MAJOR_VERSION = @OSHMEM_MAJOR_VERSION@ +OSHMEM_MINOR_VERSION = @OSHMEM_MINOR_VERSION@ +OSHMEM_RELEASE_DATE = @OSHMEM_RELEASE_DATE@ +OSHMEM_RELEASE_VERSION = @OSHMEM_RELEASE_VERSION@ +OSHMEM_REPO_REV = @OSHMEM_REPO_REV@ +OSHMEM_TARBALL_VERSION = @OSHMEM_TARBALL_VERSION@ +OSHMEM_TOP_BUILDDIR = @OSHMEM_TOP_BUILDDIR@ +OSHMEM_TOP_SRCDIR = @OSHMEM_TOP_SRCDIR@ +OSHMEM_VERSION = @OSHMEM_VERSION@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +QRSH = @QRSH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SINGULARITY = @SINGULARITY@ +STRIP = @STRIP@ +VERSION = @VERSION@ +WRAPPER_CC = @WRAPPER_CC@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_FC = @ac_ct_FC@ +ac_prefix_program = @ac_prefix_program@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +atomic_mxm_CFLAGS = @atomic_mxm_CFLAGS@ +atomic_mxm_CPPFLAGS = @atomic_mxm_CPPFLAGS@ +atomic_mxm_LDFLAGS = @atomic_mxm_LDFLAGS@ +atomic_mxm_LIBS = @atomic_mxm_LIBS@ +atomic_ucx_CFLAGS = @atomic_ucx_CFLAGS@ +atomic_ucx_CPPFLAGS = @atomic_ucx_CPPFLAGS@ +atomic_ucx_LDFLAGS = @atomic_ucx_LDFLAGS@ +atomic_ucx_LIBS = @atomic_ucx_LIBS@ +bindir = @bindir@ +btl_openib_CFLAGS = @btl_openib_CFLAGS@ +btl_openib_CPPFLAGS = @btl_openib_CPPFLAGS@ +btl_openib_LDFLAGS = @btl_openib_LDFLAGS@ +btl_openib_LIBS = @btl_openib_LIBS@ +btl_portals4_CPPFLAGS = @btl_portals4_CPPFLAGS@ +btl_portals4_LDFLAGS = @btl_portals4_LDFLAGS@ +btl_portals4_LIBS = @btl_portals4_LIBS@ +btl_uct_CPPFLAGS = @btl_uct_CPPFLAGS@ +btl_uct_LDFLAGS = @btl_uct_LDFLAGS@ +btl_uct_LIBS = @btl_uct_LIBS@ +btl_ugni_CPPFLAGS = @btl_ugni_CPPFLAGS@ +btl_ugni_LDFLAGS = @btl_ugni_LDFLAGS@ +btl_ugni_LIBS = @btl_ugni_LIBS@ +btl_vader_CFLAGS = @btl_vader_CFLAGS@ +btl_vader_CPPFLAGS = @btl_vader_CPPFLAGS@ +btl_vader_LDFLAGS = @btl_vader_LDFLAGS@ +btl_vader_LIBS = @btl_vader_LIBS@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +coll_fca_CFLAGS = @coll_fca_CFLAGS@ +coll_fca_CPPFLAGS = @coll_fca_CPPFLAGS@ +coll_fca_HOME = @coll_fca_HOME@ +coll_fca_LDFLAGS = @coll_fca_LDFLAGS@ +coll_fca_LIBS = @coll_fca_LIBS@ +coll_hcoll_CFLAGS = @coll_hcoll_CFLAGS@ +coll_hcoll_CPPFLAGS = @coll_hcoll_CPPFLAGS@ +coll_hcoll_LDFLAGS = @coll_hcoll_LDFLAGS@ +coll_hcoll_LIBS = @coll_hcoll_LIBS@ +coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ +coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ +coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ +common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ +common_alps_LDFLAGS = @common_alps_LDFLAGS@ +common_alps_LIBS = @common_alps_LIBS@ +common_cuda_CPPFLAGS = @common_cuda_CPPFLAGS@ +common_ucx_CFLAGS = @common_ucx_CFLAGS@ +common_ucx_CPPFLAGS = @common_ucx_CPPFLAGS@ +common_ucx_LDFLAGS = @common_ucx_LDFLAGS@ +common_ucx_LIBS = @common_ucx_LIBS@ +common_verbs_CFLAGS = @common_verbs_CFLAGS@ +common_verbs_CPPFLAGS = @common_verbs_CPPFLAGS@ +common_verbs_LDFLAGS = @common_verbs_LDFLAGS@ +common_verbs_LIBS = @common_verbs_LIBS@ +common_verbs_usnic_CPPFLAGS = @common_verbs_usnic_CPPFLAGS@ +common_verbs_usnic_LDFLAGS = @common_verbs_usnic_LDFLAGS@ +common_verbs_usnic_LIBS = @common_verbs_usnic_LIBS@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +ess_alps_CPPFLAGS = @ess_alps_CPPFLAGS@ +ess_alps_LDFLAGS = @ess_alps_LDFLAGS@ +ess_alps_LIBS = @ess_alps_LIBS@ +ess_lsf_CPPFLAGS = @ess_lsf_CPPFLAGS@ +ess_lsf_LDFLAGS = @ess_lsf_LDFLAGS@ +ess_lsf_LIBS = @ess_lsf_LIBS@ +ess_slurm_CPPFLAGS = @ess_slurm_CPPFLAGS@ +ess_slurm_LDFLAGS = @ess_slurm_LDFLAGS@ +ess_slurm_LIBS = @ess_slurm_LIBS@ +ess_tm_CPPFLAGS = @ess_tm_CPPFLAGS@ +ess_tm_LDFLAGS = @ess_tm_LDFLAGS@ +ess_tm_LIBS = @ess_tm_LIBS@ +exec_prefix = @exec_prefix@ +fbtl_ime_CPPFLAGS = @fbtl_ime_CPPFLAGS@ +fbtl_ime_LDFLAGS = @fbtl_ime_LDFLAGS@ +fbtl_ime_LIBS = @fbtl_ime_LIBS@ +fbtl_pvfs2_CPPFLAGS = @fbtl_pvfs2_CPPFLAGS@ +fbtl_pvfs2_LDFLAGS = @fbtl_pvfs2_LDFLAGS@ +fbtl_pvfs2_LIBS = @fbtl_pvfs2_LIBS@ +fs_gpfs_CPPFLAGS = @fs_gpfs_CPPFLAGS@ +fs_gpfs_LDFLAGS = @fs_gpfs_LDFLAGS@ +fs_gpfs_LIBS = @fs_gpfs_LIBS@ +fs_ime_CPPFLAGS = @fs_ime_CPPFLAGS@ +fs_ime_LDFLAGS = @fs_ime_LDFLAGS@ +fs_ime_LIBS = @fs_ime_LIBS@ +fs_lustre_CPPFLAGS = @fs_lustre_CPPFLAGS@ +fs_lustre_LDFLAGS = @fs_lustre_LDFLAGS@ +fs_lustre_LIBS = @fs_lustre_LIBS@ +fs_pvfs2_CPPFLAGS = @fs_pvfs2_CPPFLAGS@ +fs_pvfs2_LDFLAGS = @fs_pvfs2_LDFLAGS@ +fs_pvfs2_LIBS = @fs_pvfs2_LIBS@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +libmca_ompi_common_monitoring_so_version = @libmca_ompi_common_monitoring_so_version@ +libmca_ompi_common_ompio_so_version = @libmca_ompi_common_ompio_so_version@ +libmca_opal_common_cuda_so_version = @libmca_opal_common_cuda_so_version@ +libmca_opal_common_ofi_so_version = @libmca_opal_common_ofi_so_version@ +libmca_opal_common_sm_so_version = @libmca_opal_common_sm_so_version@ +libmca_opal_common_ucx_so_version = @libmca_opal_common_ucx_so_version@ +libmca_opal_common_ugni_so_version = @libmca_opal_common_ugni_so_version@ +libmca_opal_common_verbs_so_version = @libmca_opal_common_verbs_so_version@ +libmca_orte_common_alps_so_version = @libmca_orte_common_alps_so_version@ +libmpi_cxx_so_version = @libmpi_cxx_so_version@ +libmpi_java_so_version = @libmpi_java_so_version@ +libmpi_mpifh_so_version = @libmpi_mpifh_so_version@ +libmpi_so_version = @libmpi_so_version@ +libmpi_usempi_ignore_tkr_so_version = @libmpi_usempi_ignore_tkr_so_version@ +libmpi_usempi_tkr_so_version = @libmpi_usempi_tkr_so_version@ +libmpi_usempif08_so_version = @libmpi_usempif08_so_version@ +libompitrace_so_version = @libompitrace_so_version@ +libopen_pal_so_version = @libopen_pal_so_version@ +libopen_rte_so_version = @libopen_rte_so_version@ +liboshmem_so_version = @liboshmem_so_version@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +memory_malloc_solaris_LIBS = @memory_malloc_solaris_LIBS@ +mkdir_p = @mkdir_p@ +mpool_memkind_CPPFLAGS = @mpool_memkind_CPPFLAGS@ +mpool_memkind_LDFLAGS = @mpool_memkind_LDFLAGS@ +mpool_memkind_LIBS = @mpool_memkind_LIBS@ +mtl_portals4_CPPFLAGS = @mtl_portals4_CPPFLAGS@ +mtl_portals4_LDFLAGS = @mtl_portals4_LDFLAGS@ +mtl_portals4_LIBS = @mtl_portals4_LIBS@ +mtl_psm2_CFLAGS = @mtl_psm2_CFLAGS@ +mtl_psm2_CPPFLAGS = @mtl_psm2_CPPFLAGS@ +mtl_psm2_LDFLAGS = @mtl_psm2_LDFLAGS@ +mtl_psm2_LIBS = @mtl_psm2_LIBS@ +mtl_psm_CFLAGS = @mtl_psm_CFLAGS@ +mtl_psm_CPPFLAGS = @mtl_psm_CPPFLAGS@ +mtl_psm_LDFLAGS = @mtl_psm_LDFLAGS@ +mtl_psm_LIBS = @mtl_psm_LIBS@ +odls_alps_CPPFLAGS = @odls_alps_CPPFLAGS@ +odls_alps_LDFLAGS = @odls_alps_LDFLAGS@ +odls_alps_LIBS = @odls_alps_LIBS@ +oldincludedir = @oldincludedir@ +ompidatadir = @ompidatadir@ +ompiincludedir = @ompiincludedir@ +ompilibdir = @ompilibdir@ +oob_alps_CPPFLAGS = @oob_alps_CPPFLAGS@ +oob_alps_LDFLAGS = @oob_alps_LDFLAGS@ +oob_alps_LIBS = @oob_alps_LIBS@ +opal_datatype_cuda_CPPFLAGS = @opal_datatype_cuda_CPPFLAGS@ +opal_dl_dlopen_LIBS = @opal_dl_dlopen_LIBS@ +opal_dl_libltdl_CPPFLAGS = @opal_dl_libltdl_CPPFLAGS@ +opal_dl_libltdl_LDFLAGS = @opal_dl_libltdl_LDFLAGS@ +opal_dl_libltdl_LIBS = @opal_dl_libltdl_LIBS@ +opal_event_external_CPPFLAGS = @opal_event_external_CPPFLAGS@ +opal_event_external_LDFLAGS = @opal_event_external_LDFLAGS@ +opal_event_external_LIBS = @opal_event_external_LIBS@ +opal_hwloc_external_LDFLAGS = @opal_hwloc_external_LDFLAGS@ +opal_hwloc_external_LIBS = @opal_hwloc_external_LIBS@ +opal_hwloc_hwloc201_CFLAGS = @opal_hwloc_hwloc201_CFLAGS@ +opal_hwloc_hwloc201_CPPFLAGS = @opal_hwloc_hwloc201_CPPFLAGS@ +opal_hwloc_hwloc201_LDFLAGS = @opal_hwloc_hwloc201_LDFLAGS@ +opal_hwloc_hwloc201_LIBS = @opal_hwloc_hwloc201_LIBS@ +opal_memchecker_valgrind_CPPFLAGS = @opal_memchecker_valgrind_CPPFLAGS@ +opal_ofi_CPPFLAGS = @opal_ofi_CPPFLAGS@ +opal_ofi_LDFLAGS = @opal_ofi_LDFLAGS@ +opal_ofi_LIBS = @opal_ofi_LIBS@ +opal_pmi1_CPPFLAGS = @opal_pmi1_CPPFLAGS@ +opal_pmi1_LDFLAGS = @opal_pmi1_LDFLAGS@ +opal_pmi1_LIBS = @opal_pmi1_LIBS@ +opal_pmi1_rpath = @opal_pmi1_rpath@ +opal_pmi2_CPPFLAGS = @opal_pmi2_CPPFLAGS@ +opal_pmi2_LDFLAGS = @opal_pmi2_LDFLAGS@ +opal_pmi2_LIBS = @opal_pmi2_LIBS@ +opal_pmi2_rpath = @opal_pmi2_rpath@ +opal_pmix_ext1x_CPPFLAGS = @opal_pmix_ext1x_CPPFLAGS@ +opal_pmix_ext1x_LDFLAGS = @opal_pmix_ext1x_LDFLAGS@ +opal_pmix_ext1x_LIBS = @opal_pmix_ext1x_LIBS@ +opal_pmix_ext2x_CPPFLAGS = @opal_pmix_ext2x_CPPFLAGS@ +opal_pmix_ext2x_LDFLAGS = @opal_pmix_ext2x_LDFLAGS@ +opal_pmix_ext2x_LIBS = @opal_pmix_ext2x_LIBS@ +opal_pmix_ext3x_CPPFLAGS = @opal_pmix_ext3x_CPPFLAGS@ +opal_pmix_ext3x_LDFLAGS = @opal_pmix_ext3x_LDFLAGS@ +opal_pmix_ext3x_LIBS = @opal_pmix_ext3x_LIBS@ +opal_pmix_pmix3x_CPPFLAGS = @opal_pmix_pmix3x_CPPFLAGS@ +opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ +opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ +opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ +opaldatadir = @opaldatadir@ +opalincludedir = @opalincludedir@ +opallibdir = @opallibdir@ +ortedatadir = @ortedatadir@ +orteincludedir = @orteincludedir@ +ortelibdir = @ortelibdir@ +osc_portals4_CPPFLAGS = @osc_portals4_CPPFLAGS@ +osc_portals4_LDFLAGS = @osc_portals4_LDFLAGS@ +osc_portals4_LIBS = @osc_portals4_LIBS@ +osc_ucx_CPPFLAGS = @osc_ucx_CPPFLAGS@ +osc_ucx_LDFLAGS = @osc_ucx_LDFLAGS@ +osc_ucx_LIBS = @osc_ucx_LIBS@ +oshmem_verbs_CFLAGS = @oshmem_verbs_CFLAGS@ +oshmem_verbs_CPPFLAGS = @oshmem_verbs_CPPFLAGS@ +oshmem_verbs_LDFLAGS = @oshmem_verbs_LDFLAGS@ +oshmem_verbs_LIBS = @oshmem_verbs_LIBS@ +oshmemdatadir = @oshmemdatadir@ +oshmemincludedir = @oshmemincludedir@ +oshmemlibdir = @oshmemlibdir@ +pdfdir = @pdfdir@ +plm_alps_CPPFLAGS = @plm_alps_CPPFLAGS@ +plm_alps_LDFLAGS = @plm_alps_LDFLAGS@ +plm_alps_LIBS = @plm_alps_LIBS@ +plm_lsf_CPPFLAGS = @plm_lsf_CPPFLAGS@ +plm_lsf_LDFLAGS = @plm_lsf_LDFLAGS@ +plm_lsf_LIBS = @plm_lsf_LIBS@ +plm_slurm_CPPFLAGS = @plm_slurm_CPPFLAGS@ +plm_slurm_LDFLAGS = @plm_slurm_LDFLAGS@ +plm_slurm_LIBS = @plm_slurm_LIBS@ +plm_tm_CPPFLAGS = @plm_tm_CPPFLAGS@ +plm_tm_LDFLAGS = @plm_tm_LDFLAGS@ +plm_tm_LIBS = @plm_tm_LIBS@ +pmix_alps_CPPFLAGS = @pmix_alps_CPPFLAGS@ +pmix_alps_LDFLAGS = @pmix_alps_LDFLAGS@ +pmix_alps_LIBS = @pmix_alps_LIBS@ +pmix_cray_CPPFLAGS = @pmix_cray_CPPFLAGS@ +pmix_cray_LDFLAGS = @pmix_cray_LDFLAGS@ +pmix_cray_LIBS = @pmix_cray_LIBS@ +pml_ucx_CPPFLAGS = @pml_ucx_CPPFLAGS@ +pml_ucx_LDFLAGS = @pml_ucx_LDFLAGS@ +pml_ucx_LIBS = @pml_ucx_LIBS@ +pml_yalla_CPPFLAGS = @pml_yalla_CPPFLAGS@ +pml_yalla_LDFLAGS = @pml_yalla_LDFLAGS@ +pml_yalla_LIBS = @pml_yalla_LIBS@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +ras_alps_CPPFLAGS = @ras_alps_CPPFLAGS@ +ras_lsf_CPPFLAGS = @ras_lsf_CPPFLAGS@ +ras_lsf_LDFLAGS = @ras_lsf_LDFLAGS@ +ras_lsf_LIBS = @ras_lsf_LIBS@ +ras_slurm_CPPFLAGS = @ras_slurm_CPPFLAGS@ +ras_slurm_LDFLAGS = @ras_slurm_LDFLAGS@ +ras_slurm_LIBS = @ras_slurm_LIBS@ +ras_tm_CPPFLAGS = @ras_tm_CPPFLAGS@ +ras_tm_LDFLAGS = @ras_tm_LDFLAGS@ +ras_tm_LIBS = @ras_tm_LIBS@ +rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ +rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ +rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ +sbindir = @sbindir@ +schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ +schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ +schizo_moab_LDFLAGS = @schizo_moab_LDFLAGS@ +schizo_moab_LIBS = @schizo_moab_LIBS@ +schizo_slurm_CPPFLAGS = @schizo_slurm_CPPFLAGS@ +schizo_slurm_LDFLAGS = @schizo_slurm_LDFLAGS@ +schizo_slurm_LIBS = @schizo_slurm_LIBS@ +scoll_fca_CFLAGS = @scoll_fca_CFLAGS@ +scoll_fca_CPPFLAGS = @scoll_fca_CPPFLAGS@ +scoll_fca_HOME = @scoll_fca_HOME@ +scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ +scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ +sharedstatedir = @sharedstatedir@ +spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ +spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ +spml_ikrit_LDFLAGS = @spml_ikrit_LDFLAGS@ +spml_ikrit_LIBS = @spml_ikrit_LIBS@ +spml_ucx_CFLAGS = @spml_ucx_CFLAGS@ +spml_ucx_CPPFLAGS = @spml_ucx_CPPFLAGS@ +spml_ucx_LDFLAGS = @spml_ucx_LDFLAGS@ +spml_ucx_LIBS = @spml_ucx_LIBS@ +srcdir = @srcdir@ +sshmem_ucx_CFLAGS = @sshmem_ucx_CFLAGS@ +sshmem_ucx_CPPFLAGS = @sshmem_ucx_CPPFLAGS@ +sshmem_ucx_LDFLAGS = @sshmem_ucx_LDFLAGS@ +sshmem_ucx_LIBS = @sshmem_ucx_LIBS@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +ucx_CFLAGS = @ucx_CFLAGS@ +ucx_LIBS = @ucx_LIBS@ +ucx_STATIC_LIBS = @ucx_STATIC_LIBS@ +dist_oshmemdata_DATA = \ + help-oshmem-scoll-ucc.txt + +AM_CPPFLAGS = $(scoll_ucc_CPPFLAGS) +scoll_ucc_sources = \ + scoll_ucc.h \ + scoll_ucc_debug.h \ + scoll_ucc_dtypes.h \ + scoll_ucc_common.h \ + scoll_ucc_module.c \ + scoll_ucc_component.c \ + scoll_ucc_barrier.c \ + scoll_ucc_broadcast.c \ + scoll_ucc_reduce.c \ + scoll_ucc_collect.c \ + scoll_ucc_alltoall.c + +@MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE@component_noinst = libmca_scoll_ucc.la +@MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE@component_noinst = +@MCA_BUILD_oshmem_scoll_ucc_DSO_FALSE@component_install = +@MCA_BUILD_oshmem_scoll_ucc_DSO_TRUE@component_install = mca_scoll_ucc.la +mcacomponentdir = $(pkglibdir) +mcacomponent_LTLIBRARIES = $(component_install) +mca_scoll_ucc_la_SOURCES = $(scoll_ucc_sources) +mca_scoll_ucc_la_LIBADD = $(top_builddir)/oshmem/liboshmem.la \ + $(scoll_ucc_LIBS) + +mca_scoll_ucc_la_LDFLAGS = -module -avoid-version $(scoll_ucc_LDFLAGS) +noinst_LTLIBRARIES = $(component_noinst) +libmca_scoll_ucc_la_SOURCES = $(scoll_ucc_sources) +libmca_scoll_ucc_la_LIBADD = $(scoll_ucc_LIBS) +libmca_scoll_ucc_la_LDFLAGS = -module -avoid-version $(scoll_ucc_LDFLAGS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign oshmem/mca/scoll/ucc/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign oshmem/mca/scoll/ucc/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +install-mcacomponentLTLIBRARIES: $(mcacomponent_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(mcacomponentdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(mcacomponentdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(mcacomponentdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(mcacomponentdir)"; \ + } + +uninstall-mcacomponentLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(mcacomponent_LTLIBRARIES)'; test -n "$(mcacomponentdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(mcacomponentdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(mcacomponentdir)/$$f"; \ + done + +clean-mcacomponentLTLIBRARIES: + -test -z "$(mcacomponent_LTLIBRARIES)" || rm -f $(mcacomponent_LTLIBRARIES) + @list='$(mcacomponent_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libmca_scoll_ucc.la: $(libmca_scoll_ucc_la_OBJECTS) $(libmca_scoll_ucc_la_DEPENDENCIES) $(EXTRA_libmca_scoll_ucc_la_DEPENDENCIES) + $(AM_V_CCLD)$(libmca_scoll_ucc_la_LINK) $(am_libmca_scoll_ucc_la_rpath) $(libmca_scoll_ucc_la_OBJECTS) $(libmca_scoll_ucc_la_LIBADD) $(LIBS) + +mca_scoll_ucc.la: $(mca_scoll_ucc_la_OBJECTS) $(mca_scoll_ucc_la_DEPENDENCIES) $(EXTRA_mca_scoll_ucc_la_DEPENDENCIES) + $(AM_V_CCLD)$(mca_scoll_ucc_la_LINK) $(am_mca_scoll_ucc_la_rpath) $(mca_scoll_ucc_la_OBJECTS) $(mca_scoll_ucc_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_alltoall.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_barrier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_broadcast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_collect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_component.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scoll_ucc_reduce.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-dist_oshmemdataDATA: $(dist_oshmemdata_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_oshmemdata_DATA)'; test -n "$(oshmemdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(oshmemdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(oshmemdatadir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(oshmemdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(oshmemdatadir)" || exit $$?; \ + done + +uninstall-dist_oshmemdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_oshmemdata_DATA)'; test -n "$(oshmemdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(oshmemdatadir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(mcacomponentdir)" "$(DESTDIR)$(oshmemdatadir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-mcacomponentLTLIBRARIES \ + clean-noinstLTLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_oshmemdataDATA \ + install-mcacomponentLTLIBRARIES + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_oshmemdataDATA \ + uninstall-mcacomponentLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-mcacomponentLTLIBRARIES \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_oshmemdataDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-mcacomponentLTLIBRARIES install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ + uninstall-dist_oshmemdataDATA \ + uninstall-mcacomponentLTLIBRARIES + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_alltoall.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_alltoall.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_alltoall.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_alltoall.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,94 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ +#include "scoll_ucc.h" +#include "scoll_ucc_dtypes.h" +#include "scoll_ucc_common.h" + +#include + +static inline ucc_status_t mca_scoll_ucc_alltoall_init(const void *sbuf, void *rbuf, + int count, size_t elem_size, + mca_scoll_ucc_module_t *ucc_module, + ucc_coll_req_h *req) +{ + ucc_datatype_t dt; + + if (elem_size == 8) { + dt = UCC_DT_INT64; + } else if (elem_size == 4) { + dt = UCC_DT_INT32; + } else { + dt = UCC_DT_INT8; + } + + ucc_coll_args_t coll = { + .mask = UCC_COLL_ARGS_FIELD_FLAGS | UCC_COLL_ARGS_FIELD_GLOBAL_WORK_BUFFER, + .coll_type = UCC_COLL_TYPE_ALLTOALL, + .src.info = { + .buffer = (void *)sbuf, + .count = count * ucc_module->group->proc_count, + .datatype = dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = rbuf, + .count = count * ucc_module->group->proc_count, + .datatype = dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .flags = UCC_COLL_ARGS_FLAG_MEM_MAPPED_BUFFERS, + .global_work_buffer = ucc_module->pSync, + }; + + if (NULL == ucc_module->ucc_team) { + if (OSHMEM_ERROR == mca_scoll_ucc_team_create(ucc_module, ucc_module->group)) { + return OSHMEM_ERROR; + } + } + SCOLL_UCC_REQ_INIT(req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + + +int mca_scoll_ucc_alltoall(struct oshmem_group_t *group, + void *target, + const void *source, + ptrdiff_t dst, ptrdiff_t sst, + size_t nelems, + size_t element_size, + long *pSync, + int alg) +{ + mca_scoll_ucc_module_t *ucc_module; + size_t count; + ucc_coll_req_h req; + int rc; + + UCC_VERBOSE(3, "running ucc alltoall"); + ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_alltoall_module; + count = nelems; + + /* Do nothing on zero-length request */ + if (OPAL_UNLIKELY(!nelems)) { + return OSHMEM_SUCCESS; + } + + SCOLL_UCC_CHECK(mca_scoll_ucc_alltoall_init(source, target, count, + element_size, ucc_module, &req)); + SCOLL_UCC_CHECK(ucc_collective_post(req)); + SCOLL_UCC_CHECK(scoll_ucc_req_wait(req)); + return OSHMEM_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback alltoall"); + PREVIOUS_SCOLL_FN(ucc_module, alltoall, group, target, source, + dst, sst, nelems, element_size, pSync, alg); + return rc; +} diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_barrier.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_barrier.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_barrier.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_barrier.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,52 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ +#include "scoll_ucc.h" +#include "scoll_ucc_dtypes.h" +#include "scoll_ucc_common.h" + +#include + +static inline ucc_status_t mca_scoll_ucc_barrier_init(mca_scoll_ucc_module_t * ucc_module, + ucc_coll_req_h * req) +{ + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_BARRIER + }; + if (NULL == ucc_module->ucc_team) { + if (OSHMEM_ERROR == mca_scoll_ucc_team_create(ucc_module, ucc_module->group)) { + return OSHMEM_ERROR; + } + } + SCOLL_UCC_REQ_INIT(req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_scoll_ucc_barrier(struct oshmem_group_t *group, long *pSync, int alg) +{ + mca_scoll_ucc_module_t *ucc_module; + ucc_coll_req_h req; + int rc; + + UCC_VERBOSE(3, "running ucc barrier"); + ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_barrier_module; + + SCOLL_UCC_CHECK(mca_scoll_ucc_barrier_init(ucc_module, &req)); + SCOLL_UCC_CHECK(ucc_collective_post(req)); + SCOLL_UCC_CHECK(scoll_ucc_req_wait(req)); + return OSHMEM_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback barrier"); + PREVIOUS_SCOLL_FN(ucc_module, barrier, group, + pSync, alg); + return rc; +} + diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_broadcast.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_broadcast.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_broadcast.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_broadcast.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,79 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ +#include "scoll_ucc.h" +#include "scoll_ucc_dtypes.h" +#include "scoll_ucc_common.h" + +#include + +static inline ucc_status_t mca_scoll_ucc_broadcast_init(void * buf, int count, + int root, + mca_scoll_ucc_module_t * ucc_module, + ucc_coll_req_h * req) +{ + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_BCAST, + .root = root, + .src.info = { + .buffer = buf, + .count = count, + .datatype = UCC_DT_INT8, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + } + }; + if (NULL == ucc_module->ucc_team) { + if (OSHMEM_ERROR == mca_scoll_ucc_team_create(ucc_module, ucc_module->group)) { + return OSHMEM_ERROR; + } + } + SCOLL_UCC_REQ_INIT(req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + + +int mca_scoll_ucc_broadcast(struct oshmem_group_t *group, + int PE_root, + void *target, + const void *source, + size_t nlong, + long *pSync, + bool nlong_type, + int alg) +{ + mca_scoll_ucc_module_t * ucc_module; + void * buf; + ucc_coll_req_h req; + int rc; + + UCC_VERBOSE(3, "running ucc bcast"); + ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_broadcast_module; + if (group->my_pe == PE_root) { + buf = (void *) source; + } else { + buf = target; + } + + /* Do nothing on zero-length request */ + if (OPAL_UNLIKELY(!nlong)) { + return OSHMEM_SUCCESS; + } + + SCOLL_UCC_CHECK(mca_scoll_ucc_broadcast_init(buf, nlong, PE_root, ucc_module, &req)); + SCOLL_UCC_CHECK(ucc_collective_post(req)); + SCOLL_UCC_CHECK(scoll_ucc_req_wait(req)); + return OSHMEM_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback bcast"); + PREVIOUS_SCOLL_FN(ucc_module, broadcast, group, PE_root, target, source, + nlong, pSync, nlong_type, alg); + return rc; +} diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_collect.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_collect.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_collect.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_collect.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,76 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ +#include "scoll_ucc.h" +#include "scoll_ucc_dtypes.h" +#include "scoll_ucc_common.h" + +#include + +static inline ucc_status_t mca_scoll_ucc_collect_init(const void * sbuf, void * rbuf, + int count, + mca_scoll_ucc_module_t * ucc_module, + ucc_coll_req_h * req) +{ + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLGATHER, + .src.info = { + .buffer = (void *) sbuf, + .count = count, + .datatype = UCC_DT_INT8, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = rbuf, + .count = count, + .datatype = UCC_DT_INT8, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + }; + + if (NULL == ucc_module->ucc_team) { + if (OSHMEM_ERROR == mca_scoll_ucc_team_create(ucc_module, ucc_module->group)) { + return OSHMEM_ERROR; + } + } + SCOLL_UCC_REQ_INIT(req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_scoll_ucc_collect(struct oshmem_group_t *group, + void *target, + const void *source, + size_t nlong, + long *pSync, + bool nlong_type, + int alg) +{ + mca_scoll_ucc_module_t *ucc_module; + ucc_coll_req_h req; + int rc; + + UCC_VERBOSE(3, "running ucc collect"); + ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_collect_module; + + if (OPAL_UNLIKELY(!nlong)) { + return OSHMEM_SUCCESS; + } + + SCOLL_UCC_CHECK(mca_scoll_ucc_collect_init(source, target, nlong, ucc_module, &req)); + SCOLL_UCC_CHECK(ucc_collective_post(req)); + SCOLL_UCC_CHECK(scoll_ucc_req_wait(req)); + return OSHMEM_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback collect"); + PREVIOUS_SCOLL_FN(ucc_module, collect, group, target, source, + nlong, pSync, nlong_type, alg); + return rc; +} diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_common.h openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_common.h --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_common.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_common.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#ifndef MCA_SCOLL_UCC_COMMON_H +#define MCA_SCOLL_UCC_COMMON_H + +#define SCOLL_UCC_CHECK(_call) do { \ + if (UCC_OK != (_call)) { \ + goto fallback; \ + } \ +} while(0) + +#define SCOLL_UCC_REQ_INIT(_req, _coll, _module) do { \ + SCOLL_UCC_CHECK(ucc_collective_init(&_coll, _req, \ + _module->ucc_team)); \ +} while(0) + +static inline ucc_status_t scoll_ucc_req_wait(ucc_coll_req_h req) +{ + ucc_status_t status; + while (UCC_OK != (status = ucc_collective_test(req))) { + if (0 > status) { + UCC_ERROR("ucc_collective_test failed: %s", + ucc_status_string(status)); + return status; + } + ucc_context_progress(mca_scoll_ucc_component.ucc_context); + opal_progress(); + } + return ucc_collective_finalize(req); +} + +#endif + diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_component.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_component.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_component.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_component.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,176 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include + +#include +#include + +#include "scoll_ucc.h" +#include "opal/util/argv.h" + +/* + * Public string showing the oshmem scoll_ucc component version number + */ +const char * mca_scoll_ucc_component_version_string = + "OpenSHMEM UCC collective MCA component version " OSHMEM_VERSION; + + +static int ucc_open(void); +static int ucc_close(void); +static int ucc_register(void); + +int mca_scoll_ucc_output = -1; + +mca_scoll_ucc_component_t mca_scoll_ucc_component = { + + /* First, the mca_component_t struct containing meta information + about the component */ + { + .scoll_version = { + MCA_SCOLL_BASE_VERSION_2_0_0, + + /* Component name and version */ + .mca_component_name = "ucc", + MCA_BASE_MAKE_VERSION(component, OSHMEM_MAJOR_VERSION, OSHMEM_MINOR_VERSION, + OSHMEM_RELEASE_VERSION), + + /* Component open and close functions */ + .mca_open_component = ucc_open, + .mca_close_component = ucc_close, + .mca_register_component_params = ucc_register, + .mca_query_component = NULL, + }, + .scoll_data = { + /* The component is not checkpoint ready */ + MCA_BASE_METADATA_PARAM_NONE + }, + + /* Initialization / querying functions */ + .scoll_init = mca_scoll_ucc_init_query, + .scoll_query = mca_scoll_ucc_comm_query, + }, + 75, /* priority */ + 0, /* verbose level */ + 0, /* ucc_enable */ + 2, /* ucc_np */ + "basic", /* cls */ + SCOLL_UCC_CTS_STR, /* cts */ + 0, /* nr_modules */ + false /* libucc_initialized */ +}; + +static int ucc_register(void) +{ + mca_scoll_ucc_component_t * cm = &mca_scoll_ucc_component; + mca_base_component_t * c = &cm->super.scoll_version; + + mca_base_component_var_register(c, "priority", + "Priority of the UCC scoll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, + &cm->ucc_priority); + + mca_base_component_var_register(c, "verbose", + "Verbose level of the UCC scoll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, + &cm->ucc_verbose); + + mca_base_component_var_register(c, "enable", + "[1|0|] Enable/Disable UCC scoll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, + &cm->ucc_enable); + + mca_base_component_var_register(c, "np", + "Minimal Active Set / Team size for UCC scoll component", + MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, + OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY, + &cm->ucc_np); + + mca_base_component_var_register(c, "cls", + "Comma separated list of UCC CLS to be used for team creation", + MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, + OPAL_INFO_LVL_6, MCA_BASE_VAR_SCOPE_READONLY, + &cm->cls); + + mca_base_component_var_register(c, "cts", + "Comma separated list of UCC coll types to be enabled", + MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0, + OPAL_INFO_LVL_6, MCA_BASE_VAR_SCOPE_READONLY, + &cm->cts); + return OSHMEM_SUCCESS; +} + +static ucc_coll_type_t mca_scoll_ucc_str_to_type(const char *str) +{ + if (0 == strcasecmp(str, "barrier")) { + return UCC_COLL_TYPE_BARRIER; + } else if (0 == strcasecmp(str, "broadcast")) { + return UCC_COLL_TYPE_BCAST; + } else if (0 == strcasecmp(str, "reduce")) { + return UCC_COLL_TYPE_ALLREDUCE; + } else if (0 == strcasecmp(str, "alltoall")) { + return UCC_COLL_TYPE_ALLTOALL; + } else if (0 == strcasecmp(str, "collect")) { + return UCC_COLL_TYPE_ALLGATHER; + } + UCC_ERROR("incorrect value for cts: %s, allowed: %s", + str, SCOLL_UCC_CTS_STR); + return UCC_COLL_TYPE_LAST; +} + +static void mca_scoll_ucc_init_default_cts(void) +{ + mca_scoll_ucc_component_t *cm = &mca_scoll_ucc_component; + bool disable; + char ** cts; + int n_cts, i; + char * str; + ucc_coll_type_t *ct, c; + + disable = (cm->cts[0] == '^') ? true : false; + cts = opal_argv_split(disable ? (cm->cts + 1) : cm->cts, ','); + n_cts = opal_argv_count(cts); + cm->cts_requested = disable ? SCOLL_UCC_CTS : 0; + for (i = 0; i < n_cts; i++) { + str = cts[i]; + ct = &cm->cts_requested; + + c = mca_scoll_ucc_str_to_type(str); + if (UCC_COLL_TYPE_LAST == c) { + *ct = SCOLL_UCC_CTS; + break; + } + if (disable) { + (*ct) &= ~c; + } else { + (*ct) |= c; + } + } + opal_argv_free(cts); +} + +static int ucc_open(void) +{ + mca_scoll_ucc_component_t *cm; + cm = &mca_scoll_ucc_component; + cm->libucc_initialized = false; + + mca_scoll_ucc_output = opal_output_open(NULL); + opal_output_set_verbosity(mca_scoll_ucc_output, cm->ucc_verbose); + mca_scoll_ucc_init_default_cts(); + return OSHMEM_SUCCESS; +} + +static int ucc_close(void) +{ + return OSHMEM_SUCCESS; +} diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_debug.h openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_debug.h --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_debug.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_debug.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,35 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ + +#ifndef SCOLL_UCC_DEBUG_H +#define SCOLL_UCC_DEBUG_H +#include "oshmem_config.h" +#pragma GCC system_header + +#ifdef __BASE_FILE__ +#define __UCC_FILE__ __BASE_FILE__ +#else +#define __UCC_FILE__ __FILE__ +#endif + +#ifdef OPAL_ENABLE_DEBUG +#define UCC_VERBOSE(level, ...) \ + oshmem_output_verbose(level, mca_scoll_ucc_output, "%s:%d - %s() ", \ + __UCC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) +#else +#define UCC_VERBOSE(level, ...) +#endif + +#define UCC_ERROR(...) \ + oshmem_output_verbose(0, mca_scoll_ucc_output, "Error: %s:%d - %s() ", \ + __UCC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__) + +extern int mca_scoll_ucc_output; + +#endif // SCOLL_UCC_DEBUG_H diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_dtypes.h openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_dtypes.h --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_dtypes.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_dtypes.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#ifndef SCOLL_UCC_DTYPES_H +#define SCOLL_UCC_DTYPES_H + +#include "oshmem/op/op.h" +#include "ompi/datatype/ompi_datatype.h" +#include "ompi/op/op.h" + +#include + +#define SCOLL_UCC_DT_UNSUPPORTED -1 +#define SCOLL_UCC_OP_UNSUPPORTED -1 + +static ucc_datatype_t shmem_datatype_to_ucc_dt[OSHMEM_OP_TYPE_NUMBER + 1] = { + UCC_DT_INT16, /* OSHMEM_OP_TYPE_SHORT 0 */ + UCC_DT_INT32, /* OSHMEM_OP_TYPE_INT 1 */ + UCC_DT_INT64, /* OSHMEM_OP_TYPE_LONG 2 */ + UCC_DT_INT64, /* OSHMEM_OP_TYPE_LLONG 3 */ + UCC_DT_INT16, /* OSHMEM_OP_TYPE_INT16_T 4 */ + UCC_DT_INT32, /* OSHMEM_OP_TYPE_INT32_T 5 */ + UCC_DT_INT64, /* OSHMEM_OP_TYPE_INT64_T 6 */ + UCC_DT_FLOAT32, /* OSHMEM_OP_TYPE_FLOAT 7 */ + UCC_DT_FLOAT64, /* OSHMEM_OP_TYPE_DOUBLE 8 */ + SCOLL_UCC_DT_UNSUPPORTED, /* OSHMEM_OP_TYPE_LDOUBLE 9 */ + SCOLL_UCC_DT_UNSUPPORTED, /* OSHMEM_OP_TYPE_FCOMPLEX 10 */ + SCOLL_UCC_DT_UNSUPPORTED, /* OSHMEM_OP_TYPE_DCOMPLEX 11 */ + UCC_DT_INT16, /* OSHMEM_OP_TYPE_FINT2 12 */ + UCC_DT_INT32, /* OSHMEM_OP_TYPE_FINT4 13 */ + UCC_DT_INT64, /* OSHMEM_OP_TYPE_FINT8 14 */ + UCC_DT_FLOAT32, /* OSHMEM_OP_TYPE_FREAL4 15 */ + UCC_DT_FLOAT64, /* OSHMEM_OP_TYPE_FREAL8 16 */ + SCOLL_UCC_DT_UNSUPPORTED, /* OSHMEM_OP_TYPE_FREAL16 17 */ + SCOLL_UCC_DT_UNSUPPORTED /* OSHMEM_OP_TYPE_NUMBER 18 */ +}; + +static inline ucc_datatype_t shmem_op_to_ucc_dtype(oshmem_op_t *op) +{ + ucc_datatype_t dtype; + + dtype = shmem_datatype_to_ucc_dt[op->dt]; + if (op->dt == OSHMEM_OP_TYPE_NUMBER) { + switch (op->dt_size) { + case 8: + return UCC_DT_INT64; + case 4: + return UCC_DT_INT32; + case 2: + return UCC_DT_INT16; + case 1: + return UCC_DT_INT8; + default: + return SCOLL_UCC_DT_UNSUPPORTED; + } + } + + return dtype; +} + +static ucc_reduction_op_t oshmem_op_to_ucc_op_map[OSHMEM_OP_NUMBER + 1] = { + UCC_OP_BAND, /* OSHMEM_OP_AND */ + UCC_OP_BOR, /* OSHMEM_OP_OR */ + UCC_OP_BXOR, /* OSHMEM_OP_XOR */ + UCC_OP_MAX, /* OSHMEM_OP_MAX */ + UCC_OP_MIN, /* OSHMEM_OP_MIN */ + UCC_OP_SUM, /* OSHMEM_OP_SUM */ + UCC_OP_PROD, /* OSHMEM_OP_PROD */ + SCOLL_UCC_OP_UNSUPPORTED, /* OSHMEM_OP_NUMBER */ +}; + +static inline ucc_reduction_op_t shmem_op_to_ucc_op(int op) +{ + return oshmem_op_to_ucc_op_map[op]; +} + +#endif /* SCOLL_UCC_DTYPES_H */ diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc.h openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc.h --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc.h 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc.h 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,129 @@ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#ifndef MCA_SCOLL_UCC_H +#define MCA_SCOLL_UCC_H + +#include "oshmem_config.h" + +#include "shmem.h" +#include "oshmem/mca/mca.h" +#include "oshmem/mca/scoll/scoll.h" +#include "oshmem/proc/proc.h" + +#include "scoll_ucc_debug.h" + +#include + +BEGIN_C_DECLS + +#define SCOLL_UCC_CTS (UCC_COLL_TYPE_BARRIER | UCC_COLL_TYPE_BCAST | \ + UCC_COLL_TYPE_ALLREDUCE | UCC_COLL_TYPE_ALLGATHER | \ + UCC_COLL_TYPE_ALLTOALL) + +#define SCOLL_UCC_CTS_STR "barrier,broadcast,reduce,collect,alltoall" + +int mca_scoll_ucc_progress(void); + +/** + * Globally exported structure + */ +struct mca_scoll_ucc_component_t { + mca_scoll_base_component_1_0_0_t super; + int ucc_priority; + int ucc_verbose; + int ucc_enable; + int ucc_np; + char * cls; + char * cts; + int nr_modules; + bool libucc_initialized; + ucc_lib_h ucc_lib; + ucc_lib_attr_t ucc_lib_attr; + ucc_coll_type_t cts_requested; + ucc_context_h ucc_context; +}; +typedef struct mca_scoll_ucc_component_t mca_scoll_ucc_component_t; + +OMPI_MODULE_DECLSPEC extern mca_scoll_ucc_component_t mca_scoll_ucc_component; + +/** + * UCC enabled team + */ +struct mca_scoll_ucc_module_t { + mca_scoll_base_module_t super; + + oshmem_group_t *group; + ucc_team_h ucc_team; + long *pSync; + + /* Saved handlers - for fallback */ + mca_scoll_base_module_reduce_fn_t previous_reduce; + mca_scoll_base_module_t *previous_reduce_module; + mca_scoll_base_module_broadcast_fn_t previous_broadcast; + mca_scoll_base_module_t *previous_broadcast_module; + mca_scoll_base_module_barrier_fn_t previous_barrier; + mca_scoll_base_module_t *previous_barrier_module; + mca_scoll_base_module_collect_fn_t previous_collect; + mca_scoll_base_module_t *previous_collect_module; + mca_scoll_base_module_alltoall_fn_t previous_alltoall; + mca_scoll_base_module_t *previous_alltoall_module; +}; +typedef struct mca_scoll_ucc_module_t mca_scoll_ucc_module_t; + +OBJ_CLASS_DECLARATION(mca_scoll_ucc_module_t); + +/* API functions */ +int mca_scoll_ucc_init_query(bool enable_progress_threads, bool enable_mpi_threads); + +int mca_scoll_ucc_team_create(mca_scoll_ucc_module_t *ucc_module, + oshmem_group_t *osh_group); + +mca_scoll_base_module_t* mca_scoll_ucc_comm_query(oshmem_group_t *osh_group, int *priority); + +int mca_scoll_ucc_barrier(struct oshmem_group_t *group, long *pSync, int alg); + +int mca_scoll_ucc_broadcast(struct oshmem_group_t *group, + int PE_root, + void *target, + const void *source, + size_t nlong, + long *pSync, + bool nlong_type, + int alg); + +int mca_scoll_ucc_collect(struct oshmem_group_t *group, + void *target, + const void *source, + size_t nlong, + long *pSync, + bool nlong_type, + int alg); + +int mca_scoll_ucc_reduce(struct oshmem_group_t *group, + struct oshmem_op_t *op, + void *target, + const void *source, + size_t nlong, + long *pSync, + void *pWrk, + int alg); + +int mca_scoll_ucc_alltoall(struct oshmem_group_t *group, + void *target, + const void *source, + ptrdiff_t dst, ptrdiff_t sst, + size_t nelems, + size_t element_size, + long *pSync, + int alg); + +END_C_DECLS + +#endif diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_module.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_module.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_module.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,482 @@ +/* + * Copyright (c) 2021 Mellanox Technologies. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "oshmem_config.h" + +#include "opal/util/show_help.h" +#include "opal/util/timings.h" +#include "oshmem/proc/proc.h" +#include "oshmem/runtime/runtime.h" +#include "oshmem/mca/memheap/base/base.h" +#include "ompi/mca/coll/base/coll_tags.h" +#include "ompi/mca/pml/pml.h" +#include "scoll_ucc.h" +#include "scoll_ucc_debug.h" + +#include + +#define OBJ_RELEASE_IF_NOT_NULL( obj ) if( NULL != (obj) ) OBJ_RELEASE( obj ); + +int mca_scoll_ucc_init_query(bool enable_progress_threads, bool enable_ucc_threads) +{ + return OSHMEM_SUCCESS; +} + +static void mca_scoll_ucc_module_clear(mca_scoll_ucc_module_t *ucc_module) +{ + ucc_module->previous_barrier = NULL; + ucc_module->previous_broadcast = NULL; + ucc_module->previous_reduce = NULL; + ucc_module->previous_collect = NULL; + ucc_module->previous_alltoall = NULL; +} + +static void mca_scoll_ucc_module_construct(mca_scoll_ucc_module_t *ucc_module) +{ + mca_scoll_ucc_module_clear(ucc_module); +} + +int mca_scoll_ucc_progress(void) +{ + ucc_context_progress(mca_scoll_ucc_component.ucc_context); + return OSHMEM_SUCCESS; +} + +static void mca_scoll_ucc_module_destruct(mca_scoll_ucc_module_t *ucc_module) +{ + if (ucc_module->ucc_team) { + ucc_team_destroy(ucc_module->ucc_team); + MCA_MEMHEAP_CALL(private_free(ucc_module->pSync)); + --mca_scoll_ucc_component.nr_modules; + } + + if (0 == mca_scoll_ucc_component.nr_modules) { + if (mca_scoll_ucc_component.libucc_initialized) { + UCC_VERBOSE(1, "finalizing ucc library"); + opal_progress_unregister(mca_scoll_ucc_progress); + ucc_context_destroy(mca_scoll_ucc_component.ucc_context); + ucc_finalize(mca_scoll_ucc_component.ucc_lib); + mca_scoll_ucc_component.libucc_initialized = false; + } + } + + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_alltoall_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_collect_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_reduce_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_broadcast_module); + OBJ_RELEASE_IF_NOT_NULL(ucc_module->previous_barrier_module); + + mca_scoll_ucc_module_clear(ucc_module); +} + +#define UCC_SAVE_PREV_SCOLL_API(__api) do {\ + ucc_module->previous_ ## __api = osh_group->g_scoll.scoll_ ## __api;\ + ucc_module->previous_ ## __api ## _module = osh_group->g_scoll.scoll_ ## __api ## _module;\ + if (!osh_group->g_scoll.scoll_ ## __api || !osh_group->g_scoll.scoll_ ## __api ## _module) {\ + UCC_VERBOSE(1, "no underlying " # __api"; disqualifying myself");\ + return OSHMEM_ERROR;\ + }\ + OBJ_RETAIN(ucc_module->previous_ ## __api ## _module);\ +} while(0) + +static int mca_scoll_ucc_save_coll_handlers(mca_scoll_base_module_t *module, + oshmem_group_t *osh_group) +{ + mca_scoll_ucc_module_t* ucc_module = (mca_scoll_ucc_module_t*) module; + UCC_SAVE_PREV_SCOLL_API(barrier); + UCC_SAVE_PREV_SCOLL_API(broadcast); + UCC_SAVE_PREV_SCOLL_API(reduce); + UCC_SAVE_PREV_SCOLL_API(collect); + UCC_SAVE_PREV_SCOLL_API(alltoall); + return OSHMEM_SUCCESS; +} + +typedef struct oob_allgather_req +{ + void *sbuf; + void *rbuf; + void *oob_coll_ctx; + size_t msglen; + int iter; + int index; + ompi_request_t *reqs[2]; +} oob_allgather_req_t; + +static ucc_status_t oob_allgather_free(void *req) +{ + free(req); + return UCC_OK; +} + +static ucc_status_t oob_allgather(void *sbuf, void *rbuf, size_t msglen, + void *oob_coll_ctx, void **req) +{ + oob_allgather_req_t *oob_req = malloc(sizeof(*oob_req)); + oob_req->sbuf = sbuf; + oob_req->rbuf = rbuf; + oob_req->msglen = msglen; + oob_req->oob_coll_ctx = oob_coll_ctx; + oob_req->iter = 0; + oob_req->index = -1; + *req = oob_req; + return UCC_OK; +} + +static inline ucc_status_t oob_probe_test(oob_allgather_req_t *oob_req) +{ + int probe = 0; + int probe_count = 5; + int completed; + + do { + ompi_request_test_all(2, oob_req->reqs, &completed, MPI_STATUS_IGNORE); + ++probe; + } while (!completed && probe < probe_count); + + if (!completed) { + return UCC_INPROGRESS; + } + return UCC_OK; +} + +static int index_cmpfunc(const void * a, const void * b) +{ + return (*(int *)a - *(int *)b); +} + +static ucc_status_t oob_allgather_test(void *req) +{ + oob_allgather_req_t *oob_req = (oob_allgather_req_t *)req; + oshmem_group_t *group = (oshmem_group_t *)oob_req->oob_coll_ctx; + char *tmpsend = NULL; + char *tmprecv = NULL; + int *index = &oob_req->index; + size_t msglen = oob_req->msglen; + int *tmp; + unsigned int rank; + int size, sendto, recvfrom, recvdatafrom, senddatafrom; + + rank = group->my_pe; + size = group->proc_count; + if (-1 == *index) { + tmp = + bsearch(&rank, group->proc_vpids, size, sizeof(int), index_cmpfunc); + *index = ((ptrdiff_t)tmp - (ptrdiff_t)group->proc_vpids) / + sizeof(group->proc_vpids[0]); + } + + if (0 == oob_req->iter) { + tmprecv = (char *)oob_req->rbuf + (ptrdiff_t)*index * (ptrdiff_t)msglen; + memcpy(tmprecv, oob_req->sbuf, msglen); + } + + sendto = (*index + 1) % size; + sendto = group->proc_vpids[sendto]; + recvfrom = (*index - 1 + size) % size; + recvfrom = group->proc_vpids[recvfrom]; + for (; oob_req->iter < size - 1; oob_req->iter++) { + if (oob_req->iter > 0) { + if (UCC_INPROGRESS == oob_probe_test(oob_req)) { + return UCC_INPROGRESS; + } + } + + recvdatafrom = (*index - oob_req->iter - 1 + size) % size; + senddatafrom = (*index - oob_req->iter + size) % size; + tmprecv = (char *) oob_req->rbuf + (ptrdiff_t) recvdatafrom * (ptrdiff_t) msglen; + tmpsend = (char *) oob_req->rbuf + (ptrdiff_t) senddatafrom * (ptrdiff_t) msglen; + MCA_PML_CALL(isend(tmpsend, msglen, MPI_BYTE, sendto, MCA_COLL_BASE_TAG_UCC, + MCA_PML_BASE_SEND_STANDARD, oshmem_comm_world, &oob_req->reqs[0])); + MCA_PML_CALL(irecv(tmprecv, msglen, MPI_BYTE, recvfrom, + MCA_COLL_BASE_TAG_UCC, oshmem_comm_world, &oob_req->reqs[1])); + } + return oob_probe_test(oob_req); +} + +static int mca_scoll_ucc_init_ctx(oshmem_group_t *osh_group) +{ + mca_scoll_ucc_component_t *cm = &mca_scoll_ucc_component; + ucc_mem_map_t *maps = NULL; + char str_buf[256]; + ucc_lib_config_h lib_config; + ucc_context_config_h ctx_config; + ucc_thread_mode_t tm_requested; + ucc_lib_params_t lib_params; + ucc_context_params_t ctx_params; + int segment; + + tm_requested = oshmem_mpi_thread_multiple ? UCC_THREAD_MULTIPLE : + UCC_THREAD_SINGLE; + lib_params.mask = UCC_LIB_PARAM_FIELD_THREAD_MODE; + lib_params.thread_mode = tm_requested; + + if (UCC_OK != ucc_lib_config_read("OSHMEM", NULL, &lib_config)) { + UCC_ERROR("UCC lib config read failed"); + return OSHMEM_ERROR; + } + + if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) { + ucc_lib_config_release(lib_config); + UCC_ERROR("failed to modify UCC lib config to set CLS"); + return OSHMEM_ERROR; + } + + if (UCC_OK != ucc_init(&lib_params, lib_config, &cm->ucc_lib)) { + UCC_ERROR("UCC lib init failed"); + ucc_lib_config_release(lib_config); + cm->ucc_enable = 0; + return OSHMEM_ERROR; + } + ucc_lib_config_release(lib_config); + + cm->ucc_lib_attr.mask = UCC_LIB_ATTR_FIELD_THREAD_MODE | + UCC_LIB_ATTR_FIELD_COLL_TYPES; + if (UCC_OK != ucc_lib_get_attr(cm->ucc_lib, &cm->ucc_lib_attr)) { + UCC_ERROR("UCC get lib attr failed"); + goto cleanup_lib; + } + + if (cm->ucc_lib_attr.thread_mode < tm_requested) { + UCC_ERROR("UCC library doesn't support SHMEM_THREAD_MULTIPLE"); + goto cleanup_lib; + } + + maps = (ucc_mem_map_t *)malloc(sizeof(ucc_mem_map_t) * + memheap_map->n_segments); + if (NULL == maps) { + UCC_ERROR("failed to allocate space for UCC memory params"); + } + for (segment = 0; segment < memheap_map->n_segments; segment++) { + maps[segment].address = memheap_map->mem_segs[segment].mkeys[0].va_base; + maps[segment].len = + (ptrdiff_t)memheap_map->mem_segs[segment].super.va_end - + (ptrdiff_t)memheap_map->mem_segs[segment].super.va_base; + } + ctx_params.mask = + UCC_CONTEXT_PARAM_FIELD_OOB | UCC_CONTEXT_PARAM_FIELD_MEM_PARAMS; + ctx_params.oob.allgather = oob_allgather; + ctx_params.oob.req_test = oob_allgather_test; + ctx_params.oob.req_free = oob_allgather_free; + ctx_params.oob.coll_info = (void *)oshmem_group_all; + ctx_params.oob.n_oob_eps = oshmem_group_all->proc_count; + ctx_params.oob.oob_ep = oshmem_group_all->my_pe; + ctx_params.mem_params.segments = maps; + ctx_params.mem_params.n_segments = memheap_map->n_segments; + + if (UCC_OK != ucc_context_config_read(cm->ucc_lib, NULL, &ctx_config)) { + UCC_ERROR("UCC context config read failed"); + goto cleanup_lib; + } + + sprintf(str_buf, "%u", osh_group->proc_count); + if (UCC_OK != ucc_context_config_modify(ctx_config, NULL, + "ESTIMATED_NUM_EPS", str_buf)) { + UCC_ERROR("UCC context config modify failed for estimated_num_eps"); + goto cleanup_lib; + } + + sprintf(str_buf, "%u", opal_process_info.num_local_peers + 1); + if (UCC_OK != ucc_context_config_modify(ctx_config, NULL, + "ESTIMATED_NUM_PPN", str_buf)) { + UCC_ERROR("UCC context config modify failed for estimated_num_eps"); + goto cleanup_lib; + } + + if (UCC_OK != ucc_context_create(cm->ucc_lib, &ctx_params, ctx_config, + &cm->ucc_context)) { + UCC_ERROR("UCC context create failed"); + ucc_context_config_release(ctx_config); + goto cleanup_lib; + } + ucc_context_config_release(ctx_config); + + free(maps); + opal_progress_register(mca_scoll_ucc_progress); + UCC_VERBOSE(1, "initialized ucc context"); + cm->libucc_initialized = true; + return OSHMEM_SUCCESS; + +cleanup_lib: + if (NULL != maps) { + free(maps); + } + ucc_finalize(cm->ucc_lib); + cm->ucc_enable = 0; + cm->libucc_initialized = false; + return OSHMEM_ERROR; +} + +int mca_scoll_ucc_team_create(mca_scoll_ucc_module_t *ucc_module, + oshmem_group_t *osh_group) +{ + mca_scoll_ucc_component_t *cm = &mca_scoll_ucc_component; + ucc_status_t status = UCC_OK; + long *pSync = NULL; + int *tmp; + ucc_ep_map_t map; + int index; + size_t size; + ucc_context_attr_t attr; + + attr.mask = UCC_CONTEXT_ATTR_FIELD_WORK_BUFFER_SIZE; + ucc_context_get_attr(cm->ucc_context, &attr); + size = attr.global_work_buffer_size; + if (size & 0x7) { + size += 8 - (size & 0x7); + } + MCA_MEMHEAP_CALL(private_alloc(size * sizeof(long), (void **)&pSync)); + memset(pSync, 0, size * sizeof(long)); + + map.type = UCC_EP_MAP_ARRAY; + map.ep_num = osh_group->proc_count; + map.array.elem_size = 4; + tmp = bsearch(&osh_group->my_pe, osh_group->proc_vpids, + osh_group->proc_count, sizeof(int), index_cmpfunc); + index = ((ptrdiff_t)tmp - (ptrdiff_t)osh_group->proc_vpids) / + sizeof(osh_group->proc_vpids[0]); + map.array.map = (void *)osh_group->proc_vpids; + ucc_team_params_t team_params = { + .mask = UCC_TEAM_PARAM_FIELD_EP | UCC_TEAM_PARAM_FIELD_EP_RANGE | + UCC_TEAM_PARAM_FIELD_OOB | UCC_TEAM_PARAM_FIELD_FLAGS, + .oob = + { + .allgather = oob_allgather, + .req_test = oob_allgather_test, + .req_free = oob_allgather_free, + .coll_info = (void *)osh_group, + .n_oob_eps = osh_group->proc_count, + .oob_ep = index, + }, + .ep = index, + .ep_map = map, + .flags = UCC_TEAM_FLAG_COLL_WORK_BUFFER, + }; + + if (UCC_OK != ucc_team_create_post(&cm->ucc_context, 1, &team_params, + &ucc_module->ucc_team)) { + UCC_ERROR("ucc_team_create_post failed"); + goto err; + } + + while (UCC_INPROGRESS == + (status = ucc_team_create_test(ucc_module->ucc_team))) { + opal_progress(); + } + if (UCC_OK != status) { + UCC_ERROR("ucc_team_create_test failed (%d)", status); + goto err; + } + ucc_module->pSync = pSync; + ++cm->nr_modules; + return OSHMEM_SUCCESS; +err: + ucc_module->ucc_team = NULL; + cm->ucc_enable = 0; + opal_progress_unregister(mca_scoll_ucc_progress); + return OSHMEM_ERROR; +} + +/* + * Initialize module on the communicator + */ +static int mca_scoll_ucc_module_enable(mca_scoll_base_module_t *module, + oshmem_group_t *osh_group) +{ + mca_scoll_ucc_component_t *cm = &mca_scoll_ucc_component; + mca_scoll_ucc_module_t *ucc_module = (mca_scoll_ucc_module_t *) module; + + ucc_module->ucc_team = NULL; + if (OSHMEM_SUCCESS != mca_scoll_ucc_save_coll_handlers(module, osh_group)) { + UCC_ERROR("UCC module enable failed"); + /* There are no modules available */ + opal_show_help("help-oshmem-scoll-ucc.txt", + "module_enable:fatal", true, + "UCC module enable failed - aborting to prevent inconsistent application state"); + + goto err; + } + UCC_VERBOSE(1, "ucc enabled"); + return OSHMEM_SUCCESS; +err: + cm->ucc_enable = 0; + opal_progress_unregister(mca_scoll_ucc_progress); + return OSHMEM_ERROR; +} + +#define SET_SCOLL_PTR(_module, _COLL, _coll) do { \ + _module->super.scoll_ ## _coll = NULL; \ + if ((mca_scoll_ucc_component.ucc_lib_attr.coll_types & \ + UCC_COLL_TYPE_ ## _COLL)) { \ + if (mca_scoll_ucc_component.cts_requested & \ + UCC_COLL_TYPE_ ## _COLL) { \ + _module->super.scoll_ ## _coll = mca_scoll_ucc_ ## _coll; \ + } \ + } \ +} while(0) + +/* + * Invoked when there's a new communicator/group that has been created. + * Look at the communicator and decide which set of functions and + * priority we want to return. + */ +mca_scoll_base_module_t * +mca_scoll_ucc_comm_query(oshmem_group_t *osh_group, int *priority) +{ + mca_scoll_base_module_t *module; + mca_scoll_ucc_module_t *ucc_module; + mca_scoll_ucc_component_t *cm; + + *priority = 0; + cm = &mca_scoll_ucc_component; + + if (!cm->ucc_enable) { + return NULL; + } + + if ((osh_group->proc_count < 2) || (osh_group->proc_count < cm->ucc_np)) { + return NULL; + } + OPAL_TIMING_ENV_INIT(comm_query); + + if (!cm->libucc_initialized) { + if (memheap_map && memheap_map->n_segments > 0) { + if (OSHMEM_SUCCESS != mca_scoll_ucc_init_ctx(osh_group)) { + cm->ucc_enable = 0; + return NULL; + } + } + } + + ucc_module = OBJ_NEW(mca_scoll_ucc_module_t); + if (!ucc_module) { + cm->ucc_enable = 0; + return NULL; + } + + ucc_module->group = osh_group; + ucc_module->super.scoll_module_enable = mca_scoll_ucc_module_enable; + *priority = cm->ucc_priority; + SET_SCOLL_PTR(ucc_module, BARRIER, barrier); + SET_SCOLL_PTR(ucc_module, BCAST, broadcast); + SET_SCOLL_PTR(ucc_module, ALLREDUCE, reduce); + SET_SCOLL_PTR(ucc_module, ALLGATHER, collect); + SET_SCOLL_PTR(ucc_module, ALLTOALL, alltoall); + + module = &ucc_module->super; + return module; +} + + +OBJ_CLASS_INSTANCE(mca_scoll_ucc_module_t, + mca_scoll_base_module_t, + mca_scoll_ucc_module_construct, + mca_scoll_ucc_module_destruct); + + + diff -Nru openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_reduce.c openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_reduce.c --- openmpi-4.1.2/oshmem/mca/scoll/ucc/scoll_ucc_reduce.c 1970-01-01 00:00:00.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/scoll/ucc/scoll_ucc_reduce.c 2022-05-29 09:51:40.000000000 +0000 @@ -0,0 +1,100 @@ +/** + Copyright (c) 2021 Mellanox Technologies. All rights reserved. + $COPYRIGHT$ + + Additional copyrights may follow + + $HEADER$ + */ +#include "scoll_ucc.h" +#include "scoll_ucc_dtypes.h" +#include "scoll_ucc_common.h" + +#include + +static inline ucc_status_t mca_scoll_ucc_reduce_init(const void *sbuf, void *rbuf, + int count, struct oshmem_op_t * op, + mca_scoll_ucc_module_t * ucc_module, + ucc_coll_req_h * req) +{ + ucc_datatype_t ucc_dt; + ucc_reduction_op_t ucc_op; + + ucc_dt = shmem_op_to_ucc_dtype(op); + ucc_op = shmem_op_to_ucc_op(op->op); + + if (OPAL_UNLIKELY((ucc_datatype_t) SCOLL_UCC_DT_UNSUPPORTED == ucc_dt)) { + UCC_VERBOSE(5, "shmem datatype is not supported: dtype # = %d", + op->dt); + } + if (OPAL_UNLIKELY((ucc_reduction_op_t) SCOLL_UCC_OP_UNSUPPORTED == ucc_op)) { + UCC_VERBOSE(5, "shmem reduction op is not supported: op # = %d", + op->op); + } + + ucc_coll_args_t coll = { + .mask = 0, + .coll_type = UCC_COLL_TYPE_ALLREDUCE, + .src.info = { + .buffer = (void *)sbuf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .dst.info = { + .buffer = rbuf, + .count = count, + .datatype = ucc_dt, + .mem_type = UCC_MEMORY_TYPE_UNKNOWN + }, + .op = ucc_op, + }; + + if (sbuf == rbuf) { + coll.mask |= UCC_COLL_ARGS_FIELD_FLAGS; + coll.flags = UCC_COLL_ARGS_FLAG_IN_PLACE; + } + if (NULL == ucc_module->ucc_team) { + if (OSHMEM_ERROR == mca_scoll_ucc_team_create(ucc_module, ucc_module->group)) { + return OSHMEM_ERROR; + } + } + SCOLL_UCC_REQ_INIT(req, coll, ucc_module); + return UCC_OK; +fallback: + return UCC_ERR_NOT_SUPPORTED; +} + +int mca_scoll_ucc_reduce(struct oshmem_group_t *group, + struct oshmem_op_t *op, + void *target, + const void *source, + size_t nlong, + long *pSync, + void *pWrk, + int alg) +{ + mca_scoll_ucc_module_t *ucc_module; + size_t count; + ucc_coll_req_h req; + int rc; + + UCC_VERBOSE(3, "running ucc reduce"); + ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_reduce_module; + count = nlong / op->dt_size; + + /* Do nothing on zero-length request */ + if (OPAL_UNLIKELY(!nlong)) { + return OSHMEM_SUCCESS; + } + + SCOLL_UCC_CHECK(mca_scoll_ucc_reduce_init(source, target, count, op, ucc_module, &req)); + SCOLL_UCC_CHECK(ucc_collective_post(req)); + SCOLL_UCC_CHECK(scoll_ucc_req_wait(req)); + return OSHMEM_SUCCESS; +fallback: + UCC_VERBOSE(3, "running fallback reduction"); + PREVIOUS_SCOLL_FN(ucc_module, reduce, group, op, target, + source, nlong, pSync, pWrk, alg); + return rc; +} diff -Nru openmpi-4.1.2/oshmem/mca/spml/ikrit/Makefile.in openmpi-4.1.4/oshmem/mca/spml/ikrit/Makefile.in --- openmpi-4.1.2/oshmem/mca/spml/ikrit/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/spml/ikrit/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/spml/Makefile.in openmpi-4.1.4/oshmem/mca/spml/Makefile.in --- openmpi-4.1.2/oshmem/mca/spml/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/spml/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/spml/ucx/Makefile.in openmpi-4.1.4/oshmem/mca/spml/ucx/Makefile.in --- openmpi-4.1.2/oshmem/mca/spml/ucx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/spml/ucx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -120,6 +120,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -358,6 +359,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -394,6 +396,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1488,6 +1491,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1637,9 +1644,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1700,6 +1704,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1713,6 +1720,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/spml/ucx/spml_ucx.c openmpi-4.1.4/oshmem/mca/spml/ucx/spml_ucx.c --- openmpi-4.1.2/oshmem/mca/spml/ucx/spml_ucx.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/spml/ucx/spml_ucx.c 2022-05-29 09:51:40.000000000 +0000 @@ -121,7 +121,7 @@ int mca_spml_ucx_peer_mkey_cache_add(ucp_peer_t *ucp_peer, int index) { /* Allocate an array to hold the pointers to the ucx_cached_mkey */ - if (index >= ucp_peer->mkeys_cnt){ + if (index >= (int)ucp_peer->mkeys_cnt) { int old_size = ucp_peer->mkeys_cnt; if (MCA_MEMHEAP_MAX_SEGMENTS <= (index + 1)) { SPML_UCX_ERROR("Failed to get new mkey for segment: max number (%d) of segment descriptor is exhausted", @@ -156,7 +156,7 @@ /* Release individual mkeys */ int mca_spml_ucx_peer_mkey_cache_del(ucp_peer_t *ucp_peer, int segno) { - if ((ucp_peer->mkeys_cnt <= segno) || (segno < 0)) { + if (((int)ucp_peer->mkeys_cnt <= segno) || (segno < 0)) { return OSHMEM_ERR_NOT_AVAILABLE; } if (NULL != ucp_peer->mkeys[segno]) { @@ -169,7 +169,7 @@ /* Release the memkey map from a ucp_peer if it has any element in memkey */ void mca_spml_ucx_peer_mkey_cache_release(ucp_peer_t *ucp_peer) { - int i; + size_t i; if (ucp_peer->mkeys_cnt) { for(i = 0; i < ucp_peer->mkeys_cnt; i++) { assert(NULL == ucp_peer->mkeys[i]); @@ -242,7 +242,6 @@ int mca_spml_ucx_ctx_mkey_del(mca_spml_ucx_ctx_t *ucx_ctx, int pe, uint32_t segno, spml_ucx_mkey_t *ucx_mkey) { ucp_peer_t *ucp_peer; - spml_ucx_cached_mkey_t *ucx_cached_mkey; int rc; ucp_peer = &(ucx_ctx->ucp_peers[pe]); ucp_rkey_destroy(ucx_mkey->rkey); @@ -260,7 +259,7 @@ opal_common_ucx_del_proc_t *del_procs; size_t i, w, n; int ret; - int ucp_workers = mca_spml_ucx.ucp_workers; + size_t ucp_workers = mca_spml_ucx.ucp_workers; oshmem_shmem_barrier(); @@ -401,8 +400,6 @@ } -static char spml_ucx_transport_ids[1] = { 0 }; - int mca_spml_ucx_init_put_op_mask(mca_spml_ucx_ctx_t *ctx, size_t nprocs) { int res; @@ -439,10 +436,10 @@ int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs) { - size_t i, j, k, w, n; + size_t i, w, n; int rc = OSHMEM_ERROR; int my_rank = oshmem_my_proc_id(); - int ucp_workers = mca_spml_ucx.ucp_workers; + size_t ucp_workers = mca_spml_ucx.ucp_workers; ucs_status_t err; ucp_address_t **wk_local_addr; unsigned int *wk_addr_len; @@ -925,8 +922,7 @@ { mca_spml_ucx_ctx_t *ucx_ctx = NULL; mca_spml_ucx_ctx_array_t *idle_array = &mca_spml_ucx.idle_array; - mca_spml_ucx_ctx_array_t *active_array = &mca_spml_ucx.active_array; - int i, rc; + int i, rc = OSHMEM_SUCCESS; /* Take a lock controlling context creation. AUX context may set specific * UCX parameters affecting worker creation, which are not needed for @@ -983,7 +979,7 @@ int mca_spml_ucx_get(shmem_ctx_t ctx, void *src_addr, size_t size, void *dst_addr, int src) { - void *rva; + void *rva = NULL; spml_ucx_mkey_t *ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, src, src_addr, &rva, &mca_spml_ucx); assert(NULL != ucx_mkey); mca_spml_ucx_ctx_t *ucx_ctx = (mca_spml_ucx_ctx_t *)ctx; @@ -1010,7 +1006,7 @@ int mca_spml_ucx_get_nb(shmem_ctx_t ctx, void *src_addr, size_t size, void *dst_addr, int src, void **handle) { - void *rva; + void *rva = NULL; ucs_status_t status; spml_ucx_mkey_t *ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, src, src_addr, &rva, &mca_spml_ucx); assert(NULL != ucx_mkey); @@ -1038,7 +1034,7 @@ int mca_spml_ucx_get_nb_wprogress(shmem_ctx_t ctx, void *src_addr, size_t size, void *dst_addr, int src, void **handle) { unsigned int i; - void *rva; + void *rva = NULL; ucs_status_t status; spml_ucx_mkey_t *ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, src, src_addr, &rva, &mca_spml_ucx); assert(NULL != ucx_mkey); @@ -1076,7 +1072,7 @@ int mca_spml_ucx_put(shmem_ctx_t ctx, void* dst_addr, size_t size, void* src_addr, int dst) { - void *rva; + void *rva = NULL; spml_ucx_mkey_t *ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, dst, dst_addr, &rva, &mca_spml_ucx); assert(NULL != ucx_mkey); mca_spml_ucx_ctx_t *ucx_ctx = (mca_spml_ucx_ctx_t *)ctx; @@ -1110,7 +1106,7 @@ int mca_spml_ucx_put_nb(shmem_ctx_t ctx, void* dst_addr, size_t size, void* src_addr, int dst, void **handle) { - void *rva; + void *rva = NULL; spml_ucx_mkey_t *ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, dst, dst_addr, &rva, &mca_spml_ucx); assert(NULL != ucx_mkey); mca_spml_ucx_ctx_t *ucx_ctx = (mca_spml_ucx_ctx_t *)ctx; @@ -1143,7 +1139,7 @@ int mca_spml_ucx_put_nb_wprogress(shmem_ctx_t ctx, void* dst_addr, size_t size, void* src_addr, int dst, void **handle) { unsigned int i; - void *rva; + void *rva = NULL; ucs_status_t status; spml_ucx_mkey_t *ucx_mkey = mca_spml_ucx_ctx_mkey_by_va(ctx, dst, dst_addr, &rva, &mca_spml_ucx); assert(NULL != ucx_mkey); diff -Nru openmpi-4.1.2/oshmem/mca/spml/ucx/spml_ucx.h openmpi-4.1.4/oshmem/mca/spml/ucx/spml_ucx.h --- openmpi-4.1.2/oshmem/mca/spml/ucx/spml_ucx.h 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/spml/ucx/spml_ucx.h 2022-05-29 09:51:40.000000000 +0000 @@ -221,8 +221,9 @@ mca_spml_ucx_peer_mkey_get(ucp_peer_t *ucp_peer, int index, spml_ucx_cached_mkey_t **out_rmkey) { *out_rmkey = NULL; - if (OPAL_UNLIKELY((index >= ucp_peer->mkeys_cnt) || (MCA_MEMHEAP_MAX_SEGMENTS <= index) || (0 > index))) { - SPML_UCX_ERROR("Failed to get mkey for segment: bad index = %d, MAX = %d, cached mkeys count: %d", + if (OPAL_UNLIKELY((index >= (int)ucp_peer->mkeys_cnt) || + (MCA_MEMHEAP_MAX_SEGMENTS <= index) || (0 > index))) { + SPML_UCX_ERROR("Failed to get mkey for segment: bad index = %d, MAX = %d, cached mkeys count: %zu", index, MCA_MEMHEAP_MAX_SEGMENTS, ucp_peer->mkeys_cnt); return OSHMEM_ERR_BAD_PARAM; } diff -Nru openmpi-4.1.2/oshmem/mca/sshmem/Makefile.in openmpi-4.1.4/oshmem/mca/sshmem/Makefile.in --- openmpi-4.1.2/oshmem/mca/sshmem/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/sshmem/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/sshmem/mmap/Makefile.in openmpi-4.1.4/oshmem/mca/sshmem/mmap/Makefile.in --- openmpi-4.1.2/oshmem/mca/sshmem/mmap/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/sshmem/mmap/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/sshmem/sysv/Makefile.in openmpi-4.1.4/oshmem/mca/sshmem/sysv/Makefile.in --- openmpi-4.1.2/oshmem/mca/sshmem/sysv/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/sshmem/sysv/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1486,6 +1489,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1635,9 +1642,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1698,6 +1702,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1711,6 +1718,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/sshmem/ucx/Makefile.in openmpi-4.1.4/oshmem/mca/sshmem/ucx/Makefile.in --- openmpi-4.1.2/oshmem/mca/sshmem/ucx/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/sshmem/ucx/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1485,6 +1488,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1634,9 +1641,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1697,6 +1701,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1710,6 +1717,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c openmpi-4.1.4/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c --- openmpi-4.1.2/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c 2022-05-29 09:51:40.000000000 +0000 @@ -223,7 +223,6 @@ { mca_spml_ucx_t *spml = (mca_spml_ucx_t*)mca_spml.self; unsigned flags; - int ret; #if HAVE_UCX_DEVICE_MEM int ret = OSHMEM_ERROR; diff -Nru openmpi-4.1.2/oshmem/mca/sshmem/verbs/Makefile.in openmpi-4.1.4/oshmem/mca/sshmem/verbs/Makefile.in --- openmpi-4.1.2/oshmem/mca/sshmem/verbs/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/mca/sshmem/verbs/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1484,6 +1487,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1633,9 +1640,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1696,6 +1700,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1709,6 +1716,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/shmem/c/Makefile.in openmpi-4.1.4/oshmem/shmem/c/Makefile.in --- openmpi-4.1.2/oshmem/shmem/c/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/shmem/c/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -122,6 +122,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -360,6 +361,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -396,6 +398,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1548,6 +1551,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1697,9 +1704,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1760,6 +1764,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1773,6 +1780,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/shmem/c/profile/Makefile.in openmpi-4.1.4/oshmem/shmem/c/profile/Makefile.in --- openmpi-4.1.2/oshmem/shmem/c/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/shmem/c/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -134,6 +134,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -372,6 +373,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -408,6 +410,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/shmem/c/shmem_alloc.c openmpi-4.1.4/oshmem/shmem/c/shmem_alloc.c --- openmpi-4.1.2/oshmem/shmem/c/shmem_alloc.c 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/shmem/c/shmem_alloc.c 2022-05-29 09:51:40.000000000 +0000 @@ -38,6 +38,7 @@ void* shmem_calloc(size_t count, size_t size) { size_t req_sz = count * size; + if (!req_sz) return NULL; void *ptr = _shmalloc(req_sz); if (ptr) { memset(ptr, 0, req_sz); diff -Nru openmpi-4.1.2/oshmem/shmem/fortran/Makefile.in openmpi-4.1.4/oshmem/shmem/fortran/Makefile.in --- openmpi-4.1.2/oshmem/shmem/fortran/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/shmem/fortran/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -225,6 +225,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -463,6 +464,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -499,6 +501,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1736,6 +1739,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1885,9 +1892,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1948,6 +1952,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1961,6 +1968,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/shmem/fortran/profile/Makefile.in openmpi-4.1.4/oshmem/shmem/fortran/profile/Makefile.in --- openmpi-4.1.2/oshmem/shmem/fortran/profile/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/shmem/fortran/profile/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1527,6 +1530,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1676,9 +1683,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1739,6 +1743,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1752,6 +1759,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/tools/oshmem_info/Makefile.in openmpi-4.1.4/oshmem/tools/oshmem_info/Makefile.in --- openmpi-4.1.2/oshmem/tools/oshmem_info/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/tools/oshmem_info/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -145,6 +145,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -383,6 +384,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -419,6 +421,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1503,6 +1506,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1652,9 +1659,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1715,6 +1719,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1728,6 +1735,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/oshmem/tools/wrappers/Makefile.in openmpi-4.1.4/oshmem/tools/wrappers/Makefile.in --- openmpi-4.1.2/oshmem/tools/wrappers/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/oshmem/tools/wrappers/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -133,6 +133,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -371,6 +372,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -407,6 +409,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1440,6 +1443,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1589,9 +1596,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1652,6 +1656,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1665,6 +1672,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/README openmpi-4.1.4/README --- openmpi-4.1.2/README 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/README 2022-05-29 09:51:40.000000000 +0000 @@ -8,7 +8,7 @@ University of Stuttgart. All rights reserved. Copyright (c) 2004-2007 The Regents of the University of California. All rights reserved. -Copyright (c) 2006-2020 Cisco Systems, Inc. All rights reserved. +Copyright (c) 2006-2022 Cisco Systems, Inc. All rights reserved. Copyright (c) 2006-2011 Mellanox Technologies. All rights reserved. Copyright (c) 2006-2012 Oracle and/or its affiliates. All rights reserved. Copyright (c) 2007 Myricom, Inc. All rights reserved. @@ -334,6 +334,22 @@ version of the Intel 12.1 Linux compiler suite, the problem will go away. +- Users have reported (see + https://github.com/open-mpi/ompi/issues/7615) that the Intel Fortran + compiler will fail to link Fortran-based MPI applications on macOS + with linker errors similar to this: + + Undefined symbols for architecture x86_64: + "_ompi_buffer_detach_f08", referenced from: + import-atom in libmpi_usempif08.dylib + ld: symbol(s) not found for architecture x86_64 + + It appears that setting the environment variable + lt_cx_ld_force_load=no before invoking Open MPI's configure script + works around the issue. For example: + + shell$ lt_cv_ld_force_load=no ./configure ... + - Early versions of the Portland Group 6.0 compiler have problems creating the C++ MPI bindings as a shared library (e.g., v6.0-1). Tests with later versions show that this has been fixed (e.g., @@ -682,6 +698,9 @@ collectives, copies the data to staging buffers if GPU buffers, then calls underlying collectives to do the work. +- The "ucc" coll component serves as integration layer for Unified + Collective Communication (UCC) library: https://github.com/openucx/ucc. + OpenSHMEM Collectives --------------------- @@ -1093,6 +1112,12 @@ hcoll is the support library for MPI collective operation offload on Mellanox ConnectX-3 HCAs (and later). +--with-ucc= + Specify the directory where the Unified Collective Communication + library and header files are located. This option is generally only + necessary if the ucc headers and libraries are not in default + compiler/linker search paths. + --with-knem= Specify the directory where the knem libraries and header files are located. This option is generally only necessary if the knem headers @@ -1513,15 +1538,31 @@ Enable the PERUSE MPI data analysis interface. --enable-heterogeneous - Enable support for running on heterogeneous clusters (e.g., machines - with different endian representations). Heterogeneous support is - disabled by default because it imposes a minor performance penalty. + Enable support for running on heterogeneous clusters where data + types are equivalent sizes across nodes, but may have differing + endian representations. Heterogeneous support is disabled by + default because it imposes a minor performance penalty. + + Note that the MPI standard does not guarantee that all + heterogeneous communication will function properly, especially + when the conversion between the different representations leads to + loss of accuracy or range. For example, if a message with a + 16-bit integer datatype is sent with value 0x10000 to a receiver + where the same integer datatype is only 8 bits, the value will be + truncated at the receiver. Similarly, problems can occur if a + floating point datatype in one MPI process uses X1 bits for its + mantissa and Y1 bits for its exponent, but the same floating point + datatype in another MPI process uses X2 and Y2 bits, respectively + (where X1 != X2 and/or Y1 != Y2). Type size differences like this + can lead to unexpected behavior. + + Open MPI's heterogeneous support correctly handles endian + differences between datatype representations that are otherwise + compatible. - --enable-spc +--enable-spc Enable software-based performance counters capability. - *** THIS FUNCTIONALITY IS CURRENTLY BROKEN - DO NOT USE *** - --with-wrapper-cflags= --with-wrapper-cxxflags= --with-wrapper-fflags= diff -Nru openmpi-4.1.2/test/asm/Makefile.in openmpi-4.1.4/test/asm/Makefile.in --- openmpi-4.1.2/test/asm/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/asm/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -129,6 +129,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -367,6 +368,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -403,6 +405,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1701,6 +1704,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1850,9 +1857,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1913,6 +1917,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1926,6 +1933,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/class/Makefile.in openmpi-4.1.4/test/class/Makefile.in --- openmpi-4.1.2/test/class/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/class/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -134,6 +134,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -372,6 +373,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -408,6 +410,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1682,6 +1685,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1831,9 +1838,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1894,6 +1898,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1907,6 +1914,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/datatype/Makefile.in openmpi-4.1.4/test/datatype/Makefile.in --- openmpi-4.1.2/test/datatype/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/datatype/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1778,6 +1781,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1927,9 +1934,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1990,6 +1994,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -2003,6 +2010,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/dss/Makefile.in openmpi-4.1.4/test/dss/Makefile.in --- openmpi-4.1.2/test/dss/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/dss/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -118,6 +118,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -356,6 +357,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -392,6 +394,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1659,6 +1662,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1808,9 +1815,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1871,6 +1875,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1884,6 +1891,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/event/Makefile.in openmpi-4.1.4/test/event/Makefile.in --- openmpi-4.1.2/test/event/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/event/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -127,6 +127,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -365,6 +366,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -401,6 +403,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1663,6 +1666,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1812,9 +1819,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1875,6 +1879,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1888,6 +1895,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/Makefile.in openmpi-4.1.4/test/Makefile.in --- openmpi-4.1.2/test/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -130,6 +130,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -368,6 +369,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -404,6 +406,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1459,6 +1462,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1608,9 +1615,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1671,6 +1675,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1684,6 +1691,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/monitoring/Makefile.in openmpi-4.1.4/test/monitoring/Makefile.in --- openmpi-4.1.2/test/monitoring/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/monitoring/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1497,6 +1500,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1646,9 +1653,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1709,6 +1713,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1722,6 +1729,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/mpool/Makefile.in openmpi-4.1.4/test/mpool/Makefile.in --- openmpi-4.1.2/test/mpool/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/mpool/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -117,6 +117,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -355,6 +356,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -391,6 +393,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1645,6 +1648,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1794,9 +1801,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1857,6 +1861,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1870,6 +1877,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/spc/Makefile.in openmpi-4.1.4/test/spc/Makefile.in --- openmpi-4.1.2/test/spc/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/spc/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -119,6 +119,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -357,6 +358,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -393,6 +395,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1442,6 +1445,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1591,9 +1598,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1654,6 +1658,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1667,6 +1674,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/support/Makefile.in openmpi-4.1.4/test/support/Makefile.in --- openmpi-4.1.2/test/support/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/support/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -125,6 +125,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -363,6 +364,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -399,6 +401,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1448,6 +1451,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1597,9 +1604,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1660,6 +1664,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1673,6 +1680,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/threads/Makefile.in openmpi-4.1.4/test/threads/Makefile.in --- openmpi-4.1.2/test/threads/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/threads/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -128,6 +128,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -366,6 +367,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -402,6 +404,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1649,6 +1652,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1798,9 +1805,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1861,6 +1865,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1874,6 +1881,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/test/util/Makefile.in openmpi-4.1.4/test/util/Makefile.in --- openmpi-4.1.2/test/util/Makefile.in 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/test/util/Makefile.in 2022-05-29 09:51:40.000000000 +0000 @@ -132,6 +132,7 @@ $(top_srcdir)/config/ompi_check_psm.m4 \ $(top_srcdir)/config/ompi_check_psm2.m4 \ $(top_srcdir)/config/ompi_check_pvfs2.m4 \ + $(top_srcdir)/config/ompi_check_ucc.m4 \ $(top_srcdir)/config/ompi_check_ucx.m4 \ $(top_srcdir)/config/ompi_config_files.m4 \ $(top_srcdir)/config/ompi_configure_options.m4 \ @@ -370,6 +371,7 @@ $(top_srcdir)/ompi/mca/coll/hcoll/configure.m4 \ $(top_srcdir)/ompi/mca/coll/monitoring/configure.m4 \ $(top_srcdir)/ompi/mca/coll/portals4/configure.m4 \ + $(top_srcdir)/ompi/mca/coll/ucc/configure.m4 \ $(top_srcdir)/ompi/mca/crcp/bkmrk/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/ime/configure.m4 \ $(top_srcdir)/ompi/mca/fbtl/posix/configure.m4 \ @@ -406,6 +408,7 @@ $(top_srcdir)/oshmem/mca/atomic/mxm/configure.m4 \ $(top_srcdir)/oshmem/mca/atomic/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/scoll/fca/configure.m4 \ + $(top_srcdir)/oshmem/mca/scoll/ucc/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ikrit/configure.m4 \ $(top_srcdir)/oshmem/mca/spml/ucx/configure.m4 \ $(top_srcdir)/oshmem/mca/sshmem/mmap/configure.m4 \ @@ -1659,6 +1662,10 @@ coll_portals4_CPPFLAGS = @coll_portals4_CPPFLAGS@ coll_portals4_LDFLAGS = @coll_portals4_LDFLAGS@ coll_portals4_LIBS = @coll_portals4_LIBS@ +coll_ucc_CFLAGS = @coll_ucc_CFLAGS@ +coll_ucc_CPPFLAGS = @coll_ucc_CPPFLAGS@ +coll_ucc_LDFLAGS = @coll_ucc_LDFLAGS@ +coll_ucc_LIBS = @coll_ucc_LIBS@ common_alps_CPPFLAGS = @common_alps_CPPFLAGS@ common_alps_LDFLAGS = @common_alps_LDFLAGS@ common_alps_LIBS = @common_alps_LIBS@ @@ -1808,9 +1815,6 @@ opal_pmix_pmix3x_DEPENDENCIES = @opal_pmix_pmix3x_DEPENDENCIES@ opal_pmix_pmix3x_LDFLAGS = @opal_pmix_pmix3x_LDFLAGS@ opal_pmix_pmix3x_LIBS = @opal_pmix_pmix3x_LIBS@ -opal_reachable_netlink_CPPFLAGS = @opal_reachable_netlink_CPPFLAGS@ -opal_reachable_netlink_LDFLAGS = @opal_reachable_netlink_LDFLAGS@ -opal_reachable_netlink_LIBS = @opal_reachable_netlink_LIBS@ opaldatadir = @opaldatadir@ opalincludedir = @opalincludedir@ opallibdir = @opallibdir@ @@ -1871,6 +1875,9 @@ rcache_udreg_CPPFLAGS = @rcache_udreg_CPPFLAGS@ rcache_udreg_LDFLAGS = @rcache_udreg_LDFLAGS@ rcache_udreg_LIBS = @rcache_udreg_LIBS@ +reachable_netlink_CPPFLAGS = @reachable_netlink_CPPFLAGS@ +reachable_netlink_LDFLAGS = @reachable_netlink_LDFLAGS@ +reachable_netlink_LIBS = @reachable_netlink_LIBS@ sbindir = @sbindir@ schizo_alps_CPPFLAGS = @schizo_alps_CPPFLAGS@ schizo_moab_CPPFLAGS = @schizo_moab_CPPFLAGS@ @@ -1884,6 +1891,10 @@ scoll_fca_HOME = @scoll_fca_HOME@ scoll_fca_LDFLAGS = @scoll_fca_LDFLAGS@ scoll_fca_LIBS = @scoll_fca_LIBS@ +scoll_ucc_CFLAGS = @scoll_ucc_CFLAGS@ +scoll_ucc_CPPFLAGS = @scoll_ucc_CPPFLAGS@ +scoll_ucc_LDFLAGS = @scoll_ucc_LDFLAGS@ +scoll_ucc_LIBS = @scoll_ucc_LIBS@ sharedstatedir = @sharedstatedir@ spml_ikrit_CFLAGS = @spml_ikrit_CFLAGS@ spml_ikrit_CPPFLAGS = @spml_ikrit_CPPFLAGS@ diff -Nru openmpi-4.1.2/VERSION openmpi-4.1.4/VERSION --- openmpi-4.1.2/VERSION 2021-11-28 08:20:39.000000000 +0000 +++ openmpi-4.1.4/VERSION 2022-05-29 09:51:40.000000000 +0000 @@ -61,7 +61,7 @@ major=4 minor=1 -release=2 +release=4 # greek is generally used for alpha or beta release tags. If it is # non-empty, it will be appended to the version number. It does not @@ -77,7 +77,7 @@ # command, or with the date (if "git describe" fails) in the form of # "date". -repo_rev=v4.1.2 +repo_rev=v4.1.4 # If tarball_version is not empty, it is used as the version string in # the tarball filename, regardless of all other versions listed in @@ -91,7 +91,7 @@ # The date when this release was created -date="Nov 24, 2021" +date="May 26, 2022" # The shared library version of each of Open MPI's public libraries. # These versions are maintained in accordance with the "Library @@ -102,7 +102,7 @@ # release managers (not individual developers). Notes: # 1. Since these version numbers are associated with *releases*, the -# version numbers maintained on the Open MPI GIT master (and developer +# version numbers maintained on the Open MPI GIT main (and developer # branches) is always 0:0:0 for all libraries. # 2. The version number of libmpi refers to the public MPI interfaces. @@ -128,7 +128,7 @@ # Version numbers are described in the Libtool current:revision:age # format. -libmpi_so_version=70:2:30 +libmpi_so_version=70:4:30 libmpi_cxx_so_version=70:1:30 libmpi_mpifh_so_version=70:0:30 libmpi_usempi_tkr_so_version=70:0:30 @@ -137,8 +137,8 @@ libopen_rte_so_version=70:2:30 libopen_pal_so_version=70:2:30 libmpi_java_so_version=70:0:30 -liboshmem_so_version=70:1:30 -libompitrace_so_version=70:0:30 +liboshmem_so_version=70:2:30 +libompitrace_so_version=70:1:30 # "Common" components install standalone libraries that are run-time # linked by one or more components. So they need to be versioned as @@ -146,7 +146,7 @@ # components-don't-affect-the-build-system abstraction. # OMPI layer -libmca_ompi_common_ompio_so_version=70:2:29 +libmca_ompi_common_ompio_so_version=70:4:29 libmca_ompi_common_monitoring_so_version=70:0:20 # ORTE layer @@ -156,7 +156,7 @@ libmca_opal_common_cuda_so_version=70:0:30 libmca_opal_common_ofi_so_version=10:2:0 libmca_opal_common_sm_so_version=70:0:30 -libmca_opal_common_ucx_so_version=70:1:30 +libmca_opal_common_ucx_so_version=70:2:30 libmca_opal_common_ugni_so_version=70:0:30 libmca_opal_common_verbs_so_version=70:0:30