Merge pull request #78 from philipmarshall21/release/ccl_2021.7

Intel(R) oneAPI Collective Communications Library (oneCCL) 2021.7

CMakeLists.txt

@@ -46,7 +46,6 @@ endif()
 
 option(BUILD_EXAMPLES "Build examples" TRUE)
 option(BUILD_FT "Build functional tests" TRUE)
-option(BUILD_REG_TESTS "Build regression tests" TRUE)
 option(BUILD_CONFIG "Build cmake configs" TRUE)
 option(ENABLE_MPI "Enable MPI support" TRUE)
 option(ENABLE_MPI_TESTS "Enable MPI tests support" TRUE)
@@ -55,7 +54,6 @@ option(ENABLE_OFI_HMEM "Enable support OFI HMEM support" FALSE)
 option(ENABLE_OFI_OOT_PROV "Enable OFI out-of-tree providers support" FALSE)
 option(ENABLE_ITT "Enable ITT profiling support" TRUE)
 option(ENABLE_STUB_BACKEND "Enable stub backend" TRUE)
-option(ENABLE_LINKER_RUNPATH "Enable linker runpath flags" FALSE)
 
 option(USE_CODECOV_FLAGS "Calculate code coverage" FALSE)
 option(WITH_ASAN "Use address sanitizer, can only be used in Debug build" FALSE)
@@ -81,8 +79,7 @@ message(STATUS "Enable SYCL interop event support: ${ENABLE_SYCL_INTEROP_EVENT}"
 message(STATUS "Enable OFI HMEM support: ${ENABLE_OFI_HMEM}")
 message(STATUS "Enable OFI out-of-tree providers support: ${ENABLE_OFI_OOT_PROV}")
 message(STATUS "Enable ITT profiling support: ${ENABLE_ITT}")
-message(STATUS "Enable stub backend: ${ENABLE_STUB_BACKEND}")
-message(STATUS "Enable linker rpath flags: ${ENABLE_LINKER_RUNPATH}")
+message(STATUS "Enable stub backend" ${ENABLE_STUB_BACKEND})
 
 add_definitions(-DCCL_C_COMPILER="${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}")
 add_definitions(-DCCL_CXX_COMPILER="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
@@ -228,8 +225,8 @@ enable_testing()
 
 set(EXTERNAL_LIBS "")
 
-set(EXAMPLES_INC_DIRS ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/examples/include ${MPI_INCLUDE_DIR})
-set(EXAMPLES_LIB_DIRS ${MPI_LIB_DIR})
+set(EXAMPLES_INC_DIRS ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/examples/include ${MPI_INCLUDE_DIR} ${LEVEL_ZERO_INCLUDE_DIR})
+set(EXAMPLES_LIB_DIRS ${MPI_LIB_DIR} ${LIBFABRIC_LIB_DIR})
 
 # allow `deprecated`
 set(CMAKE_CLANG_FLAGS "${CMAKE_CLANG_FLAGS}")
@@ -256,7 +253,7 @@ file(GLOB spv_kernels "${PROJECT_SOURCE_DIR}/src/kernels/kernels.spv")
 endif()
 
 set(CCL_MAJOR_VERSION     "2021")
-set(CCL_MINOR_VERSION     "6")
+set(CCL_MINOR_VERSION     "7")
 set(CCL_UPDATE_VERSION    "0")
 set(CCL_PRODUCT_STATUS    "Gold")
 string(TIMESTAMP CCL_PRODUCT_BUILD_DATE "%Y-%m-%dT %H:%M:%SZ")

deps/mpi/bin/mpicxx

@@ -49,7 +49,7 @@ fi
 
 if [ x"$opt_args" == x"" ]; then
     case "${compiler_short_name}" in
-    icc|icpc|dpcpp)   "$dir"/mpiicpc -cxx=$compiler_name "$@" ;;
+    icc|icpc|icpx|dpcpp)   "$dir"/mpiicpc -cxx=$compiler_name "$@" ;;
     *g++*)        "$dir"/mpigxx -cxx=$compiler_name "$@" ;;
     mpicxx)     "$dir"/mpigxx "$@" ;;
     *)  
@@ -59,7 +59,7 @@ if [ x"$opt_args" == x"" ]; then
     esac
 else
     case "${compiler_short_name}" in
-    icc|icpc|dpcpp)   "$dir"/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
+    icc|icpc|icpx|dpcpp)   "$dir"/mpiicpc -cxx=$compiler_name "$@" $opt_args ;;
     *g++*)        "$dir"/mpigxx -cxx=$compiler_name "$@" $opt_args ;;
     mpicxx)     "$dir"/mpigxx "$@" $opt_args ;;
     *)  

deps/mpi/bin/mpigcc

@@ -11,8 +11,8 @@
 # This software and the related documents are provided as is, with no express
 # or implied warranties, other than those that are expressly stated in the
 # License.
-# 
-# (C) 2006 by Argonne National Laboratory.
+##
+## Copyright (C) by Argonne National Laboratory
 # 
 # 				  COPYRIGHT
 # 
@@ -21,7 +21,7 @@
 # of the code.
 # 
 # Copyright Notice
-#  + 2002 University of Chicago
+# 1998--2020, Argonne National Laboratory
 # 
 # Permission is hereby granted to use, reproduce, prepare derivative works, and
 # to redistribute to others.  This software was authored by:
@@ -52,10 +52,25 @@
 # for the accuracy, completeness, or usefulness of any information, apparatus,
 # product, or process disclosed, or represents that its use would not infringe
 # privately owned rights.
+# 
+# 			   EXTERNAL CONTRIBUTIONS
+# 
+# Portions of this code have been contributed under the above license by:
+# 
+#  * Intel Corporation
+#  * Cray
+#  * IBM Corporation
+#  * Microsoft Corporation
+#  * Mellanox Technologies Ltd.
+#  * DataDirect Networks.
+#  * Oak Ridge National Laboratory
+#  * Sun Microsystems, Lustre group
+#  * Dolphin Interconnect Solutions Inc.
+#  * Institut Polytechnique de Bordeaux
 #
-#     
-#
-# mpicc
+##     
+##
+
 # Simple script to compile and/or link MPI programs.
 # This script knows the default flags and libraries, and can handle
 # alternative C compilers and the associated flags and libraries.
@@ -79,7 +94,7 @@
 #
 # Directory locations: Fixed for any MPI implementation.
 # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=../_install
+prefix=.
 # The environment variable I_MPI_ROOT may be used to override installation folder path
 if [ -n "$I_MPI_ROOT" ] ; then
     prefix=$I_MPI_ROOT;
@@ -99,12 +114,8 @@ fi
 # Determined by a combination of environment variables and tests within
 # configure (e.g., determining whehter -lsocket is needee)
 CC="gcc"
-MPICH_VERSION="3.3"
-CFLAGS=""
-CPPFLAGS=""
-LDFLAGS=" -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl "
-LIBS="-lm   -lpthread  -lfabric -lrt "
-MPIVERSION="2021.5"
+MPICH_VERSION="3.4a2"
+MPIVERSION="2021.7"
 MPILIBNAME="mpi"                           
 
 
@@ -592,12 +603,8 @@ else
     final_cflags=" "
 fi
 final_cppflags=" "
-final_ldflags="  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl "
+final_ldflags="  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl  "
 final_libs="-lpthread -lrt "
-if test "no" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags}  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl"
-    final_libs="${final_libs}  -lm   -lpthread  -lfabric -lrt "
-fi
 
 # -----------------------------------------------------------------------
 #
@@ -622,7 +629,7 @@ if [ "$linking" = yes ] ; then
         $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} $allargs -I\"${includedir}\"
         rc=$?
     else
-        $Show $CC $CPPFLAGS $CFLAGS $allargs -I\"${includedir}\" -L\"${libdir}${MPILIBDIR}\" -L\"${libdir}\" $rpath_opt $mpilibs $I_MPI_OTHERLIBS $LDFLAGS
+        $Show $CC $CPPFLAGS $CFLAGS $allargs -I\"${includedir}\" -L\"${libdir}${MPILIBDIR}\" -L\"${libdir}\" $rpath_opt $mpilibs $I_MPI_OTHERLIBS ${final_ldflags}
         rc=$?
 
         if [ $rc -eq 0 -a "x$strip_debug_info" = "xyes" ] ; then

deps/mpi/bin/mpigxx

@@ -11,8 +11,8 @@
 # This software and the related documents are provided as is, with no express
 # or implied warranties, other than those that are expressly stated in the
 # License.
-# 
-# (C) 2006 by Argonne National Laboratory.
+##
+## Copyright (C) by Argonne National Laboratory
 # 
 # 				  COPYRIGHT
 # 
@@ -21,7 +21,7 @@
 # of the code.
 # 
 # Copyright Notice
-#  + 2002 University of Chicago
+# 1998--2020, Argonne National Laboratory
 # 
 # Permission is hereby granted to use, reproduce, prepare derivative works, and
 # to redistribute to others.  This software was authored by:
@@ -52,10 +52,25 @@
 # for the accuracy, completeness, or usefulness of any information, apparatus,
 # product, or process disclosed, or represents that its use would not infringe
 # privately owned rights.
+# 
+# 			   EXTERNAL CONTRIBUTIONS
+# 
+# Portions of this code have been contributed under the above license by:
+# 
+#  * Intel Corporation
+#  * Cray
+#  * IBM Corporation
+#  * Microsoft Corporation
+#  * Mellanox Technologies Ltd.
+#  * DataDirect Networks.
+#  * Oak Ridge National Laboratory
+#  * Sun Microsystems, Lustre group
+#  * Dolphin Interconnect Solutions Inc.
+#  * Institut Polytechnique de Bordeaux
 #
-#     
-#
-# mpicxx
+##     
+##
+
 # Simple script to compile and/or link MPI programs.
 # This script knows the default flags and libraries, and can handle
 # alternative C++ compilers and the associated flags and libraries.
@@ -78,7 +93,7 @@
 # Set the default values of all variables.
 #
 # Directory locations: Fixed for any MPI implementation
-prefix=../_install
+prefix=.
 # The environment variable I_MPI_ROOT may be used to override installation folder path
 if [ -n "$I_MPI_ROOT" ] ; then
     prefix=$I_MPI_ROOT;
@@ -97,11 +112,8 @@ fi
 
 # Default settings for compiler, flags, and libraries
 CXX="g++"
-MPICH_VERSION="3.3"
-CXXFLAGS=""
-LDFLAGS=" -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl "
-LIBS="-lm   -lpthread  -lfabric -lrt "
-MPIVERSION="2021.5"
+MPICH_VERSION="3.4a2"
+MPIVERSION="2021.7"
 MPILIBNAME="mpi"
 MPICXXLIBNAME="mpicxx"
 
@@ -604,12 +616,8 @@ else
 fi
 
 final_cppflags=" "
-final_ldflags="  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl "
+final_ldflags="  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl  "
 final_libs="-lpthread -lrt "
-if test "no" = "no" -o "${interlib_deps}" = "no" ; then
-    final_ldflags="${final_ldflags}  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl"
-    final_libs="${final_libs}  -lm   -lpthread  -lfabric -lrt "
-fi
 
 # A temporary statement to invoke the compiler
 # Place the -L before any args incase there are any mpi libraries in there.
@@ -625,7 +633,7 @@ if [ "$linking" = yes ] ; then
         $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} $allargs -I\"${includedir}\"
         rc=$?
     else
-        $Show $CXX $CXXFLAGS $allargs -I\"${includedir}\" -L\"${libdir}${MPILIBDIR}\" -L\"${libdir}\" $rpath_opt $shllibpath $cxxlibs $mpilibs $I_MPI_OTHERLIBS $LDFLAGS
+        $Show $CXX $CXXFLAGS $allargs -I\"${includedir}\" -L\"${libdir}${MPILIBDIR}\" -L\"${libdir}\" $rpath_opt $shllibpath $cxxlibs $mpilibs $I_MPI_OTHERLIBS ${final_ldflags}
         rc=$?
         if [ $rc -eq 0 -a "x$strip_debug_info" = "xyes" ] ; then
             $Show objcopy --only-keep-debug ${executable} ${executable}.dbg

deps/mpi/bin/mpiicc

@@ -21,7 +21,7 @@
 # of the code.
 # 
 # Copyright Notice
-#  + 2002 University of Chicago
+# 1998--2020, Argonne National Laboratory
 # 
 # Permission is hereby granted to use, reproduce, prepare derivative works, and
 # to redistribute to others.  This software was authored by:
@@ -52,8 +52,23 @@
 # for the accuracy, completeness, or usefulness of any information, apparatus,
 # product, or process disclosed, or represents that its use would not infringe
 # privately owned rights.
+# 
+# 			   EXTERNAL CONTRIBUTIONS
+# 
+# Portions of this code have been contributed under the above license by:
+# 
+#  * Intel Corporation
+#  * Cray
+#  * IBM Corporation
+#  * Microsoft Corporation
+#  * Mellanox Technologies Ltd.
+#  * DataDirect Networks.
+#  * Oak Ridge National Laboratory
+#  * Sun Microsystems, Lustre group
+#  * Dolphin Interconnect Solutions Inc.
+#  * Institut Polytechnique de Bordeaux
 #
-#     
+#     .
 #
 # mpicc
 # Simple script to compile and/or link MPI programs.
@@ -81,7 +96,7 @@
 #
 # Directory locations: Fixed for any MPI implementation.
 # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
-prefix=../_install
+prefix=.
 # The environment variable I_MPI_ROOT may be used to override installation folder path
 if [ -n "${I_MPI_ROOT}" ] ; then
     prefix="${I_MPI_ROOT}";
@@ -106,7 +121,7 @@ LDFLAGS="-ldl"
 MPILIBNAME="mpi"
 
 # MPIVERSION is the version of the MPICH2 library that mpicc is intended for
-MPIVERSION="2021.5"
+MPIVERSION="2021.7"
 #
 # Internal variables
 # Show is set to echo to cause the compilation command to be echoed instead

deps/mpi/bin/mpiicpc

@@ -21,7 +21,7 @@
 # of the code.
 # 
 # Copyright Notice
-#  + 2002 University of Chicago
+# 1998--2020, Argonne National Laboratory
 # 
 # Permission is hereby granted to use, reproduce, prepare derivative works, and
 # to redistribute to others.  This software was authored by:
@@ -52,8 +52,23 @@
 # for the accuracy, completeness, or usefulness of any information, apparatus,
 # product, or process disclosed, or represents that its use would not infringe
 # privately owned rights.
+# 
+# 			   EXTERNAL CONTRIBUTIONS
+# 
+# Portions of this code have been contributed under the above license by:
+# 
+#  * Intel Corporation
+#  * Cray
+#  * IBM Corporation
+#  * Microsoft Corporation
+#  * Mellanox Technologies Ltd.
+#  * DataDirect Networks.
+#  * Oak Ridge National Laboratory
+#  * Sun Microsystems, Lustre group
+#  * Dolphin Interconnect Solutions Inc.
+#  * Institut Polytechnique de Bordeaux
 #
-#     
+#     .
 #
 # mpicxx
 # Simple script to compile and/or link MPI programs.
@@ -81,7 +96,7 @@
 # Set the default values of all variables.
 #
 # Directory locations: Fixed for any MPI implementation
-prefix=../_install
+prefix=.
 # The environment variable I_MPI_ROOT may be used to override installation folder path
 if [ -n "${I_MPI_ROOT}" ] ; then
     prefix="${I_MPI_ROOT}";
@@ -107,7 +122,7 @@ MPILIBNAME="mpi"
 MPICXXLIBNAME="mpicxx"
 
 # MPIVERSION is the version of the Intel(R) MPI Library that mpiicpc is intended for
-MPIVERSION="2021.5"
+MPIVERSION="2021.7"
 
 # Internal variables
 # Show is set to echo to cause the compilation command to be echoed instead