impi-devel 2021.16.0__py2.py3-none-manylinux_2_28_x86_64.whl → 2021.17.0__py2.py3-none-manylinux_2_28_x86_64.whl

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpif77

@@ -126,7 +126,7 @@ fi
 F77="gfortran"
 F77CPP=""
 MPICH_VERSION="3.4a2"
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 FFLAGS=""
 MPILIBNAME="mpi"
 

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpif90

@@ -96,7 +96,7 @@
 # Directory locations: Fixed for any MPI implementation.
 # Set from the directory arguments to configure (e.g., --prefix=/usr/local)
 prefix=I_MPI_SUBSTITUTE_INSTALLDIR
-# The environment variable I_MPI_ROOT may be used to override installation folder path  
+# The environment variable I_MPI_ROOT may be used to override installation folder path
 if [ -n "${I_MPI_ROOT}" ] ; then
     prefix="${I_MPI_ROOT}";
 fi
@@ -140,7 +140,7 @@ FCMODINCSPEC=""
 FCEXT="f90"
 MPICH_VERSION="3.4a2"
 FCFLAGS=""
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 MPILIBNAME="mpi"
 enable_wrapper_rpath="@enable_wrapper_rpath@"
 
@@ -221,7 +221,7 @@ if [ -n "$I_MPI_FCFLAGS" ] ; then
     FCFLAGS=" "$I_MPI_FCFLAGS
 fi
 if [ -n "$I_MPI_LDFLAGS" ] ; then
-    LDFLAGS=" -ldl "$I_MPI_LDFLAGS 
+    LDFLAGS=" -ldl "$I_MPI_LDFLAGS
 fi
 if [ -n "$I_MPI_F90" ] ; then
     FC="$I_MPI_F90"
@@ -235,7 +235,7 @@ else
         FC="$MPICH_FC"
         FCname=`echo $FC | sed 's/ /-/g'`
         if [ -s $sysconfdir/mpifort-$FCname.conf ] ; then
-            . $sysconfdir/mpifort-$FCname.conf    
+            . $sysconfdir/mpifort-$FCname.conf
         fi
     fi
 fi
@@ -301,7 +301,7 @@ for arg in "$@" ; do
     executable=$arg
     handle_executable=
     fi
-    case "$arg" in 
+    case "$arg" in
     # ----------------------------------------------------------------
     # Compiler options that affect whether we are linking or no
     -c|-S|-E|-M|-MM)
@@ -391,13 +391,13 @@ for arg in "$@" ; do
     # Print mini-help if started without parameters
     echo "Simple script to compile and/or link MPI programs."
     echo "Usage: `basename $0` [options] <files>"
-    echo "----------------------------------------------------------------------------" 
+    echo "----------------------------------------------------------------------------"
     echo "The following options are supported:"
     echo "   -fc=<name> | -f90=<name>"
     echo "                   specify a FORTRAN compiler name: i.e. -fc=gfortran"
     echo "   -echo           print the scripts during their execution"
     echo "   -show           show command lines without real calling"
-    echo "   -config=<name>  specify a configuration file: i.e. -config=gfortran for mpif90-gfortran.conf file" 
+    echo "   -config=<name>  specify a configuration file: i.e. -config=gfortran for mpif90-gfortran.conf file"
     echo "   -v              print version info of $(basename $0) and its native compiler"
     echo "   -profile=<name> specify a profile configuration file (an MPI profiling"
     echo "                   library): i.e. -profile=myprofile for the myprofile.cfg file."
@@ -422,14 +422,14 @@ for arg in "$@" ; do
     echo "                   i.e -link_mpi=opt|opt_mt|dbg|dbg_mt"
     echo "   -norpath        disable rpath for compiler wrapper of the Intel(R) MPI Library"
     echo "All other options will be passed to the compiler without changing."
-    echo "----------------------------------------------------------------------------" 
+    echo "----------------------------------------------------------------------------"
     echo "The following environment variables are used:"
-    echo "   I_MPI_ROOT      the Intel(R) MPI Library installation directory path" 
-    echo "   I_MPI_F90 or MPICH_F90"  
+    echo "   I_MPI_ROOT      the Intel(R) MPI Library installation directory path"
+    echo "   I_MPI_F90 or MPICH_F90"
     echo "                   the path/name of the underlying compiler to be used"
-    echo "   I_MPI_FC_PROFILE or I_MPI_F90_PROFILE or MPIF90_PROFILE" 
-    echo "                   the name of profile file (without extension)" 
-    echo "   I_MPI_COMPILER_CONFIG_DIR" 
+    echo "   I_MPI_FC_PROFILE or I_MPI_F90_PROFILE or MPIF90_PROFILE"
+    echo "                   the name of profile file (without extension)"
+    echo "   I_MPI_COMPILER_CONFIG_DIR"
     echo "                   the folder which contains configuration files *.conf"
     echo "   I_MPI_TRACE_PROFILE"
     echo "                   specify a default profile for the -trace option"
@@ -441,8 +441,8 @@ for arg in "$@" ; do
     echo "   I_MPI_FCFLAGS"
     echo "                   special flags needed for compilation"
     echo "   I_MPI_LDFLAGS "
-    echo "                   special flags needed for linking" 
-    echo "----------------------------------------------------------------------------" 
+    echo "                   special flags needed for linking"
+    echo "----------------------------------------------------------------------------"
     exit 0
     ;;
     -nolinkage)
@@ -491,39 +491,39 @@ for arg in "$@" ; do
     ;;
     -check_mpi)
     if [ -z "$profConf" ]; then
-        if [ -z "$I_MPI_CHECK_PROFILE" ]; then  
-            profConf="vtmc"  
-        else  
-            profConf="$I_MPI_CHECK_PROFILE"  
+        if [ -z "$I_MPI_CHECK_PROFILE" ]; then
+            profConf="vtmc"
+        else
+            profConf="$I_MPI_CHECK_PROFILE"
         fi
     else
         echo "Warning: the -check_mpi option will be ignored because the profile was set."
-    fi  
-    addarg=no  
-    ;;  
+    fi
+    addarg=no
+    ;;
     -nativelinking)
     # Internal option to use native compiler for linking without MPI libraries
     nativelinking=yes
     addarg=no
     ;;
-    -trace-imbalance)                                                 
+    -trace-imbalance)
     if [ -z "$profConf" ]; then
-        profConf="vtim"                                                                 
+        profConf="vtim"
     else
-        echo "Warning: the -trace-imbalance option will be ignored because the profile was set."                                                            
-    fi  
-    addarg=no  
+        echo "Warning: the -trace-imbalance option will be ignored because the profile was set."
+    fi
+    addarg=no
     ;;
-    -t | -trace | -t=* | -trace=* )  
+    -t | -trace | -t=* | -trace=* )
     if [ -z "$profConf" ]; then
-        if [ -z "$I_MPI_TRACE_PROFILE" ]; then  
-            profConf="vt"  
-        else  
-            profConf="$I_MPI_TRACE_PROFILE"  
-        fi  
+        if [ -z "$I_MPI_TRACE_PROFILE" ]; then
+            profConf="vt"
+        else
+            profConf="$I_MPI_TRACE_PROFILE"
+        fi
     else
         echo "Warning: the -trace option will be ignored because the profile was set."
-    fi  
+    fi
     addarg=no
     ;;
     -fc=*)
@@ -547,20 +547,20 @@ for arg in "$@" ; do
     no_rpath=yes
     addarg=no
     ;;
-    # Other arguments.  We are careful to handle arguments with 
-    # quotes (we try to quote all arguments in case they include 
+    # Other arguments.  We are careful to handle arguments with
+    # quotes (we try to quote all arguments in case they include
     # any spaces)
-    *\"*) 
+    *\"*)
     qarg="'"$arg"'"
-    case $arg in 
+    case $arg in
        -D*)
        cppflags="$cppflags $qarg"
        ;;
     esac
     ;;
-    *\'*) 
+    *\'*)
     qarg=`echo \"$arg\"`
-    case $arg in 
+    case $arg in
        -D*)
        cppflags="$cppflags $qarg"
        ;;
@@ -578,14 +578,14 @@ for arg in "$@" ; do
     ;;
     *.F|*.F90|.fpp|.FPP)
 # If FCCPP is not empty, then we need to do the following:
-#    If any input files have the .F or .F90 extension, then    
+#    If any input files have the .F or .F90 extension, then
 #        If FCCPP = false, then
 #            generate an error message and exit
-#        Use FCCPP to convert the file from .F to .f, using 
+#        Use FCCPP to convert the file from .F to .f, using
 #            $TMPDIR/f$$-$count.f as the output file name
 #            Replace the input file with this name in the args
 # This is needed only for very broken systems
-#     
+#
     if [ -n "$FCCPP" ] ; then
         if [ "$FCCPP" = "false" ] ; then
             echo "This Fortran compiler does not accept .F or .F90 files"
@@ -595,7 +595,7 @@ for arg in "$@" ; do
     # Remove and directory names and extension
     $ext=`expr "$arg" : '.*\(\..*\)'`
         bfile=`basename $arg $ext`
-    # 
+    #
     TMPDIR=${TMPDIR:-/tmp}
     # Make sure that we use a valid extension for the temp file.
         tmpfile=$TMPDIR/f$$-$bfile.$FCEXT
@@ -632,7 +632,7 @@ fi
 
 if [ -n "$mpilib_override" ] ; then
     case "$mpilib_override" in
-    opt ) 
+    opt )
         MPILIBDIR=${release_lib_dir}
         ;;
     opt_mt )
@@ -656,49 +656,9 @@ gfort_ver=`$FC --version | head -n 1 | cut -d '(' -f1,2 | sed -e 's/\[.*//' | se
 if [ -n "$gfort_ver" ]; then
     #gfort_ver=`echo $gfort_ver | sed -e 's/gcc version //' | awk '{print $1}'`
     major=`echo $gfort_ver | awk -F. '{print $1}'`
-    mid=`echo $gfort_ver | awk -F. '{print $2}'` 
-    low=`echo $gfort_ver | awk -F. '{print $3}'` 
+    mid=`echo $gfort_ver | awk -F. '{print $2}'`
+    low=`echo $gfort_ver | awk -F. '{print $3}'`
     case "$major" in
-    4 )
-        case "$mid" in
-        0 )
-            if [ $low -eq 0 -o $low -eq 1 ]; then
-            gver="/4.0.0"
-            else
-            gver="/4.0.2"
-            fi
-            ;;
-        8 )
-                gver="/4.8.0"
-            ;;
-        9 )
-                gver="/4.9.0"
-            ;;
-        * )
-                gver="/4.9.0"
-            ;;
-        esac
-        ;;
-    5 )
-        case "$mid" in
-        1 )
-                gver="/5.1.0"
-            ;;
-        * )
-                gver="/5.1.0"
-            ;;
-        esac
-        ;;
-    6 )
-        case "$mid" in
-        1 )
-                gver="/6.1.0"
-            ;;
-        * )
-                gver="/6.1.0"
-            ;;
-        esac
-        ;;
     7 )
         case "$mid" in
         1 )
@@ -748,16 +708,19 @@ if [ -n "$gfort_ver" ]; then
                 gver="/11.1.0"
             ;;
         esac
-        ;;  
+        ;;
     12 )
         gver="/12.4.0"
-        ;;  
+        ;;
     13 )
         gver="/13.3.0"
-        ;;  
+        ;;
     14 )
         gver="/14.2.0"
-        ;;  
+        ;;
+    15 )
+        gver="/15.1.0"
+        ;;
     * )
         gver=""
         ;;
@@ -807,7 +770,7 @@ if [ -n "$profConf" ] ; then
     profConffile=
     if [ -s "$libdir/lib$profConf.a" -o -s "$libdir/lib$profConf.so" ] ; then
     PROFILE_FOO="-l$profConf"
-        mpilibs="-l$profConf $mpilibs"             
+        mpilibs="-l$profConf $mpilibs"
     elif [ -s "$sysconfdir/$profConf.conf" ] ; then
     profConffile="$sysconfdir/$profConf.conf"
     elif [ -s "$profConf.conf" ] ; then
@@ -817,11 +780,11 @@ if [ -n "$profConf" ] ; then
     fi
     if [ -n "$profConffile" -a -s "$profConffile" ] ; then
     . $profConffile
-        if [ -n "$PROFILE_INCPATHS" ] ; then                                                                            
-           CFLAGS="$PROFILE_INCPATHS $CFLAGS"                                                                          
-        fi                                                                                                             
-        if [ -n "$PROFILE_PRELIB" ] ; then                                                                             
-           mpilibs="$PROFILE_PRELIB $mpilibs"                                                                          
+        if [ -n "$PROFILE_INCPATHS" ] ; then
+           CFLAGS="$PROFILE_INCPATHS $CFLAGS"
+        fi
+        if [ -n "$PROFILE_PRELIB" ] ; then
+           mpilibs="$PROFILE_PRELIB $mpilibs"
         fi
         if [ -n "$PROFILE_POSTLIB" ] ; then
            mpilibs="$mpilibs $PROFILE_POSTLIB"
@@ -910,7 +873,7 @@ if [ -n "$rmfiles" ] ; then
     for file in $rmfiles ; do
         objfile=`basename $file .f`
     if [ -s "${objfile}.o" ] ; then
-        # Rename 
+        # Rename
         destfile=`echo $objfile | sed -e "s/.*$$-//"`
         mv -f ${objfile}.o ${destfile}.o
     fi

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpigcc

@@ -126,7 +126,7 @@ CC="gcc"
 MPICH_VERSION="3.4a2"
 CFLAGS=""
 CPPFLAGS=""
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 MPILIBNAME="mpi"                           
 
 
@@ -173,6 +173,7 @@ static_log=yes
 ilp64=no
 trace_opt=no
 no_rpath=no
+mpi_abi=no
 # Attempt to construct dynamic loading info, based on the user
 # preference of rpath, runpath or none and on the detected libdir
 # flags.
@@ -355,6 +356,10 @@ for arg in "$@" ; do
     addarg=no
     # Loading the profConf file is handled below
     ;;
+    -mpi-abi|-mpi_abi)
+    mpi_abi=yes
+    addarg=no
+    ;;
     -help)
     # Print mini-help if started without parameters
     echo "Simple script to compile and/or link MPI programs."
@@ -389,6 +394,7 @@ for arg in "$@" ; do
     echo "                   link against the specified version of the Intel(R) MPI Library"
     echo "                   i.e -link_mpi=opt|opt_mt|dbg|dbg_mt"
     echo "   -norpath        disable rpath for compiler wrapper of the Intel(R) MPI Library"
+    echo "   -mpi-abi        Compile and link using the standard MPI-5.0 ABI."
     echo "All other options will be passed to the compiler without changing."
     echo "----------------------------------------------------------------------------"
     echo "The following environment variables are used:"
@@ -538,6 +544,22 @@ if [ -n "$mpilib_override" ] ; then
 fi
 # -----------------------------------------------------------------------
 
+abi_cflags=
+if [ "$mpi_abi" = yes ] ; then
+    abi_cflags="-DMPI_ABI"
+    MPILIBNAME=mpi_abi
+    fortran_binding=no
+
+    if [ "$static_mpi" = yes ] ; then
+        echo "Error: the -mpi_abi option is not supported for static build."
+        exit 1
+    fi
+    if [ "$ilp64" = yes ]; then
+        echo "Error: the -mpi_abi option is not supported for ILP64 build."
+        exit 1
+    fi
+fi
+
 if [ "$static_mpi" = yes ] ; then
     if [ "x$fortran_binding" = "x" ]; then
         mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
@@ -546,10 +568,10 @@ if [ "$static_mpi" = yes ] ; then
     fi
     I_MPI_OTHERLIBS=" -lrt -lpthread "
     if [ "$ilp64" = yes ]; then
-    mpilibs="$libdir/libmpi_ilp64.a $mpilibs"
+        mpilibs="$libdir/libmpi_ilp64.a $mpilibs"
     fi
     if [ "x$strip_debug_info" = "x" ] ; then
-    strip_debug_info=yes
+        strip_debug_info=yes
     fi
 else
     if [ "x$fortran_binding" = "x" ]; then
@@ -559,7 +581,7 @@ else
     fi
     I_MPI_OTHERLIBS=" -lrt -lpthread "
     if [ "$ilp64" = yes ]; then
-    mpilibs="-lmpi_ilp64 $mpilibs"
+        mpilibs="-lmpi_ilp64 $mpilibs"
     fi
 fi
 
@@ -599,7 +621,7 @@ final_cflags=" "
 if [ "${static_mpi}" = "yes" ] ; then
     final_cflags="  -Xlinker --export-dynamic "
 else
-    final_cflags=" "
+    final_cflags="  ${abi_cflags}"
 fi
 final_cppflags=" "
 final_ldflags="  -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -Xlinker --enable-new-dtags -ldl  "
@@ -628,7 +650,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 ${final_ldflags}
+        $Show $CC $CPPFLAGS $CFLAGS ${abi_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
@@ -649,7 +671,7 @@ if [ "$linking" = yes ] ; then
 #        fi
     fi
 else
-    cmd_line="$CC $CPPFLAGS $CFLAGS $allargs -I\"${includedir}\""
+    cmd_line="$CC $CPPFLAGS $CFLAGS ${abi_cflags}  $allargs -I\"${includedir}\""
     if [ "$Show" = echo ] ; then
         echo $cmd_line
     else

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpigxx

@@ -123,7 +123,7 @@ fi
 CXX="g++"
 MPICH_VERSION="3.4a2"
 CXXFLAGS=""
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 MPILIBNAME="mpi"
 MPICXXLIBNAME="mpicxx"
 
@@ -171,6 +171,7 @@ static_log=yes
 ilp64=no
 trace_opt=no
 no_rpath=no
+mpi_abi=no
 # Attempt to construct dynamic loading info, based on the user
 # preference of rpath, runpath or none and on the detected libdir
 # flags.
@@ -357,6 +358,10 @@ for arg in "$@" ; do
     addarg=no
     # Loading the profConf file is handled below
     ;;
+    -mpi-abi|-mpi_abi)
+    mpi_abi=yes
+    addarg=no
+    ;;
     -help)
     # Print mini-help if started without parameters
     echo "Simple script to compile and/or link MPI programs."
@@ -391,6 +396,7 @@ for arg in "$@" ; do
     echo "                   link against the specified version of the Intel(R) MPI Library"
     echo "                   i.e -link_mpi=opt|opt_mt|dbg|dbg_mt"
     echo "   -norpath        disable rpath for compiler wrapper of the Intel(R) MPI Library"
+    echo "   -mpi-abi        Compile and link using the standard MPI-5.0 ABI."
     echo "All other options will be passed to the compiler without changing."
     echo "----------------------------------------------------------------------------"
     echo "The following environment variables are used:"
@@ -539,6 +545,22 @@ if [ -n "$mpilib_override" ] ; then
     esac
 fi
 # -----------------------------------------------------------------------
+abi_cflags=
+if [ "$mpi_abi" = yes ] ; then
+    abi_cflags="-DMPI_ABI"
+    MPILIBNAME=mpi_abi
+    fortran_binding=no
+
+    if [ "$static_mpi" = yes ] ; then
+        echo "Error: the -mpi_abi option is not supported for static build."
+        exit 1
+    fi
+    if [ "$ilp64" = yes ]; then
+        echo "Error: the -mpi_abi option is not supported for ILP64 build."
+        exit 1
+    fi
+fi
+
 if [ "$static_mpi" = yes ] ; then
     if [ "x$fortran_binding" = "x" ]; then
         mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
@@ -561,9 +583,12 @@ else
     fi
     I_MPI_OTHERLIBS=" -lrt -lpthread "
     if [ "$ilp64" = yes ]; then
-    mpilibs="-lmpi_ilp64 $mpilibs"
+        mpilibs="-lmpi_ilp64 $mpilibs"
     fi
-    CXX_BIND_LIB="-lmpicxx"
+    # MPI-2.0 CXX bindings are not supported with MPI-5.0 ABI
+    if [ "$mpi_abi" = no ] ; then
+        CXX_BIND_LIB="-lmpicxx"
+    fi 
 fi
 # Derived variables.  These are assembled from variables set from the
 # default, environment, configuration file (if any) and command-line
@@ -608,7 +633,7 @@ fi
 if [ "${static_mpi}" = "yes" ] ; then
     final_cxxflags="  -Xlinker --export-dynamic "
 else
-    final_cxxflags=" "
+    final_cxxflags="  ${abi_cflags}"
 fi
 
 final_cppflags=" "
@@ -629,7 +654,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 ${final_ldflags}
+        $Show $CXX $CXXFLAGS ${abi_cflags} $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
@@ -650,7 +675,7 @@ if [ "$linking" = yes ] ; then
 #        fi
 #    fi
 else
-    cmd_line="$CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} $allargs -I\"${includedir}\""
+    cmd_line="$CXX $CXXFLAGS ${abi_cflags} $PROFILE_INCPATHS ${final_cxxflags} $allargs -I\"${includedir}\""
     if [ "$Show" = echo ] ; then
         echo $cmd_line
     else

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpiicpx

@@ -129,7 +129,7 @@ MPILIBNAME="mpi"
 MPICXXLIBNAME="mpicxx"
 
 # MPIVERSION is the version of the Intel(R) MPI Library that mpiicpc is intended for
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 
 # Internal variables
 # Show is set to echo to cause the compilation command to be echoed instead

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpiicx

@@ -131,7 +131,7 @@ LDFLAGS="-ldl"
 MPILIBNAME="mpi"
 
 # MPIVERSION is the version of the MPICH2 library that mpicc is intended for
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 #
 # Internal variables
 # Show is set to echo to cause the compilation command to be echoed instead
@@ -144,6 +144,7 @@ executable=a.out
 ilp64=no
 no_rpath=no
 verbose=no
+use_mpi_abi=no
 #
 # End of initialization of variables
 #---------------------------------------------------------------------
@@ -319,6 +320,7 @@ for arg in "$@" ; do
         echo "                   link against the specified version of the Intel(R) MPI Library"
         echo "                   i.e -link_mpi=opt|opt_mt|dbg|dbg_mt"
         echo "   -norpath        disable rpath for compiler wrapper of the Intel(R) MPI Library"
+        echo "   -mpi-abi        Compile and link using the standard MPI ABI."
         echo "All other options will be passed to the compiler without changing."
         echo "----------------------------------------------------------------------------"
         echo "The following environment variables are used:"
@@ -415,6 +417,10 @@ for arg in "$@" ; do
         no_rpath=yes
         addarg=no
         ;;
+    -mpi-abi|-mpi_abi)
+        use_mpi_abi=yes
+        addarg=no
+        ;;
     # Other arguments.  We are careful to handle arguments with
     # quotes (we try to quote all arguments in case they include
     # any spaces)
@@ -461,6 +467,10 @@ fi
 # -----------------------------------------------------------------------
 
 if [ "$static_mpi" = yes ] ; then
+    if [ "$ilp64" = yes ]; then
+        echo "Error: the -mpi-abi option is not supported for static builds."
+        exit 1
+    fi
     mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
     I_MPI_OTHERLIBS=""
     MPI_OTHERLIBS=" -lrt -lpthread "
@@ -471,12 +481,23 @@ if [ "$static_mpi" = yes ] ; then
         strip_debug_info=yes
     fi
 else
-    mpilibs="-lmpifort -l$MPILIBNAME"
+    if [ "$use_mpi_abi" = yes ]; then
+        mpilibs="-lmpi_abi"
+        CFLAGS="-DMPI_ABI $CFLAGS"
+        if [ "$ilp64" = yes ]; then
+            echo "Error: the -mpi-abi option is not supported for ILP64 builds."
+            exit 1
+        fi
+    else
+        mpilibs="-lmpifort -l$MPILIBNAME"
+        if [ "$ilp64" = yes ]; then
+            mpilibs="-lmpi_ilp64 $mpilibs"
+        fi
+    fi
+    
     I_MPI_OTHERLIBS=""
     MPI_OTHERLIBS=" -lrt -lpthread "
-    if [ "$ilp64" = yes ]; then
-        mpilibs="-lmpi_ilp64 $mpilibs"
-    fi
+    
 fi
 # Derived variables.  These are assembled from variables set from the
 # default, environment, configuration file (if any) and command-line

{impi_devel-2021.16.0.data → impi_devel-2021.17.0.data}/data/bin/mpiifx

@@ -147,7 +147,7 @@ LDFLAGS="-ldl"
 MPILIBNAME="mpi"
 
 # MPIVERSION is the version of the Intel(R) MPI Library for which mpiifort is intended
-MPIVERSION="2021.16"
+MPIVERSION="2021.17"
 #
 #
 # Internal variables