impi-devel 2021.10.0__py2.py3-none-manylinux1_x86_64.whl → 2021.12.0__py2.py3-none-manylinux1_x86_64.whl

impi_devel-2021.10.0.data/data/bin/mpiicx → impi_devel-2021.12.0.data/data/bin/mpiicc

@@ -13,8 +13,9 @@
 # License.
 #
 
-COMPILER="icx"
-TARGET_WRAPPER="mpiicc"
+COMPILER="icc"
+TARGET_WRAPPER="mpiicx"
+user_set_compiler=0
 
 if [ -z "$1" ] ; then
     ${TARGET_WRAPPER} -help
@@ -24,13 +25,18 @@ fi
 for arg in "$@" ; do
     case $arg in 
         -cc=*)
-            compiler_name=$(echo $arg | sed -e 's/-cc=//g')
-            echo "Error: can not overwrite predefined compiler - ${COMPILER}!"
-            echo "You should use ${TARGET_WRAPPER}"
-            echo "ex. ${TARGET_WRAPPER} -cc=${compiler_name}"
-            exit 1
+            COMPILER=$(echo $arg | sed -e 's/-cc=//g')
+            user_set_compiler=1
         ;;
     esac
 done
 
-mpiicc -cc="${COMPILER} $@"
+if [ -n "$I_MPI_CC" ] || [ -n "$MPICH_CC" ]; then
+    user_set_compiler=1
+fi
+
+if [ $user_set_compiler -eq 1 ] ; then 
+    ${TARGET_WRAPPER} "$@"
+else
+    ${TARGET_WRAPPER} -cc="${COMPILER}" "$@"
+fi

impi_devel-2021.10.0.data/data/bin/mpiicpx → impi_devel-2021.12.0.data/data/bin/mpiicpc

@@ -13,8 +13,9 @@
 # License.
 #
 
-COMPILER="icpx"
-TARGET_WRAPPER="mpiicpc"
+COMPILER="icpc"
+TARGET_WRAPPER="mpiicpx"
+user_set_compiler=0
 
 if [ -z "$1" ] ; then
     ${TARGET_WRAPPER} -help
@@ -24,13 +25,18 @@ fi
 for arg in "$@" ; do
     case $arg in 
         -cxx=*)
-            compiler_name=$(echo $arg | sed -e 's/-cxx=//g')
-            echo "Error: can not overwrite predefined compiler - ${COMPILER}!"
-            echo "You should use ${TARGET_WRAPPER}"
-            echo "ex. ${TARGET_WRAPPER} -cxx=${compiler_name}"
-            exit 1
+            COMPILER=$(echo $arg | sed -e 's/-cxx=//g')
+            user_set_compiler=1
         ;;
     esac
 done
 
-${TARGET_WRAPPER} -cxx="${COMPILER} $@"
+if [ -n "$I_MPI_CXX" ] || [ -n "$MPICH_CXX" ]; then
+    user_set_compiler=1
+fi
+
+if [ $user_set_compiler -eq 1 ] ; then
+    ${TARGET_WRAPPER} "$@"
+else
+    ${TARGET_WRAPPER} -cxx="${COMPILER}" "$@"
+fi

impi_devel-2021.10.0.data/data/bin/mpiicpc → impi_devel-2021.12.0.data/data/bin/mpiicpx

@@ -102,8 +102,18 @@ if [ -n "${I_MPI_ROOT}" ] ; then
     prefix="${I_MPI_ROOT}";
 fi
 
-PLATFORM=""
 sysconfdir=${prefix}/etc
+includedir=${prefix}/include
+libdir=${prefix}/lib
+if [ ! -f "${I_MPI_ROOT}/lib/mpi/debug/libmpi.so" ]; then
+    release_lib_dir="/release"
+    debug_lib_dir="/debug"
+else
+    sysconfdir=${prefix}/opt/mpi/etc
+    release_lib_dir=""
+    debug_lib_dir="/mpi/debug"
+fi
+MPILIBDIR=${release_lib_dir}
 
 # The environment variable I_MPI_COMPILER_CONFIG_DIR may be used to override
 # folder where *.conf files are placed
@@ -111,18 +121,15 @@ if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
     sysconfdir=$I_MPI_COMPILER_CONFIG_DIR;
 fi
 
-includedir=${prefix}/include
-libdir=${prefix}/lib
-
 # Default settings for compiler, flags, and libraries
-CXX="icpc"
+CXX="icpx"
 CXXFLAGS=""
 LDFLAGS="-ldl"
 MPILIBNAME="mpi"
 MPICXXLIBNAME="mpicxx"
 
 # MPIVERSION is the version of the Intel(R) MPI Library that mpiicpc is intended for
-MPIVERSION="2021.10"
+MPIVERSION="@IMPI_OFFICIALVERSION@"
 
 # Internal variables
 # Show is set to echo to cause the compilation command to be echoed instead
@@ -225,11 +232,21 @@ for arg in "$@" ; do
         ;;
     -cxx=*)
         CXX=$(echo A$arg | sed -e 's/A-cxx=//g')
+        if [ "$#" -eq "1" ] ; then
+            echo "Error: extra arguments required"
+            echo "usage: $(basename $0) -cxx=<name> -v"
+            exit 1
+        fi
         addarg=no
         ;;
     # Backwards compatibility for MPICH1 - scripts
     -CC=*)
         CXX=$(echo A$arg | sed -e 's/A-CC=//g')
+        if [ "$#" -eq "1" ] ; then
+            echo "Error: extra arguments required"
+            echo "usage: $(basename $0) -CC=<name> -v"
+            exit 1
+        fi
         addarg=no
         ;;
     -show)
@@ -262,16 +279,11 @@ for arg in "$@" ; do
         # Pass this argument to the compiler as well.
         echo "$(basename $0) for the Intel(R) MPI Library $MPIVERSION for Linux*"
         echo "Copyright Intel Corporation."
-        # if there is only 1 argument, it must be -v.
-        if [ "$#" -eq "1" ] ; then
-            linking=no
-        fi
+        linking=no
         ;;
     -V)
         # Pass this argument to the compiler to query the compiler version.
-        if [ "$#" -eq "1" ] ; then
-            linking=no
-        fi
+        linking=no
         ;;
     -profile=*)
         # Pass the name of a profiling configuration.  As
@@ -341,7 +353,7 @@ for arg in "$@" ; do
         addarg=no
         ;;
     -g)
-        MPILIBDIR="/release"
+        MPILIBDIR=${release_lib_dir}
         ;;
     -static_mpi)
         static_mpi=yes
@@ -437,35 +449,24 @@ fi
 
 if [ -n "$mpilib_override" ] ; then
     case "$mpilib_override" in
-       opt )
-           MPILIBDIR="/release"
-           ;;
-       opt_mt )
-           MPILIBDIR="/release"
-           MPILIBDIR_MT="mt"
-           ;;
-       dbg )
-           MPILIBDIR="/debug"
-           ;;
-       dbg_mt )
-           MPILIBDIR="/debug"
-           MPILIBDIR_MT="mt"
-           ;;
-       * )
-           echo "Warning: incorrect library version specified. Automatically selected library will be used."
-           ;;
+    opt ) 
+        MPILIBDIR=${release_lib_dir}
+        ;;
+    opt_mt )
+        MPILIBDIR=${release_lib_dir}
+        ;;
+    dbg )
+        MPILIBDIR=${debug_lib_dir}
+        ;;
+    dbg_mt )
+        MPILIBDIR=${debug_lib_dir}
+        ;;
+    * )
+        echo "Warning: incorrect library version specified. Automatically selected library will be used."
+        ;;
     esac
 fi
 
-# -----------------------------------------------------------------------
-case "$MPILIBDIR" in
-    release | /release | debug | /debug)
-        if [ -n "$MPILIBDIR_MT" ]; then
-            MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
-        fi
-        ;;
-    "" ) MPILIBDIR="/release" ;;
-esac
 if [ "$static_mpi" = yes ] ; then
     mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
     I_MPI_OTHERLIBS=""

impi_devel-2021.10.0.data/data/bin/mpiicc → impi_devel-2021.12.0.data/data/bin/mpiicx

@@ -102,26 +102,36 @@ if [ -n "${I_MPI_ROOT}" ] ; then
     prefix="${I_MPI_ROOT}";
 fi
 
-PLATFORM=""
 sysconfdir=${prefix}/etc
+includedir=${prefix}/include
+libdir=${prefix}/lib
+if [ ! -f "${I_MPI_ROOT}/lib/mpi/debug/libmpi.so" ]; then
+    release_lib_dir="/release"
+    debug_lib_dir="/debug"
+else
+    sysconfdir=${prefix}/opt/mpi/etc
+    release_lib_dir=""
+    debug_lib_dir="/mpi/debug"
+fi
+MPILIBDIR=${release_lib_dir}
+
 # The environment variable I_MPI_COMPILER_CONFIG_DIR may be used to override
 # folder where *.conf files are placed
 if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
     sysconfdir=$I_MPI_COMPILER_CONFIG_DIR;
 fi
-includedir=${prefix}/include
-libdir=${prefix}/lib
+
 #
 # Default settings for compiler, flags, and libraries.
 # Determined by a combination of environment variables and tests within
 # configure (e.g., determining whehter -lsocket is needee)
-CC="icc"
+CC="icx"
 CFLAGS=""
 LDFLAGS="-ldl"
 MPILIBNAME="mpi"
 
 # MPIVERSION is the version of the MPICH2 library that mpicc is intended for
-MPIVERSION="2021.10"
+MPIVERSION="@IMPI_OFFICIALVERSION@"
 #
 # Internal variables
 # Show is set to echo to cause the compilation command to be echoed instead
@@ -223,6 +233,11 @@ for arg in "$@" ; do
         ;;
     -cc=*)
         CC=$(echo A$arg | sed -e 's/A-cc=//g')
+        if [ "$#" -eq "1" ] ; then
+            echo "Error: extra arguments required"
+            echo "usage: $(basename $0) -cc=<name> -v"
+            exit 1
+        fi
         addarg=no
         ;;
     -show)
@@ -255,16 +270,11 @@ for arg in "$@" ; do
         # Pass this argument to the compiler as well.
         echo "$(basename $0) for the Intel(R) MPI Library $MPIVERSION for Linux*"
         echo "Copyright Intel Corporation."
-        # if there is only 1 argument, it must be -v.
-        if [ "$#" -eq "1" ] ; then
-            linking=no
-        fi
+        linking=no
         ;;
     -V)
         # Pass this argument to the compiler to query the compiler version.
-        if [ "$#" -eq "1" ] ; then
-            linking=no
-        fi
+        linking=no
         ;;
     -profile=*)
         # Pass the name of a profiling configuration.  As
@@ -334,7 +344,7 @@ for arg in "$@" ; do
         addarg=no
         ;;
     -g)
-        MPILIBDIR="/release"
+        MPILIBDIR=${release_lib_dir}
         ;;
     -static_mpi)
         static_mpi=yes
@@ -431,36 +441,24 @@ fi
 if [ -n "$mpilib_override" ] ; then
     case "$mpilib_override" in
     opt ) 
-        MPILIBDIR="/release"
+        MPILIBDIR=${release_lib_dir}
         ;;
     opt_mt )
-        MPILIBDIR="/release"
-        MPILIBDIR_MT="mt"
+        MPILIBDIR=${release_lib_dir}
         ;;
     dbg )
-        MPILIBDIR="/debug"
+        MPILIBDIR=${debug_lib_dir}
         ;;
     dbg_mt )
-        MPILIBDIR="/debug"
-        MPILIBDIR_MT="mt"
+        MPILIBDIR=${debug_lib_dir}
         ;;
     * )
         echo "Warning: incorrect library version specified. Automatically selected library will be used."
         ;;
     esac
 fi
-
 # -----------------------------------------------------------------------
-case "$MPILIBDIR" in
-    release | /release | debug | /debug)
-        if [ -n "$MPILIBDIR_MT" ]; then
-            MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
-        fi
-        ;;
-    "" )
-        MPILIBDIR="/release"
-        ;;
-esac
+
 if [ "$static_mpi" = yes ] ; then
     mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
     I_MPI_OTHERLIBS=""

impi_devel-2021.10.0.data/data/bin/mpiifx → impi_devel-2021.12.0.data/data/bin/mpiifort

@@ -13,8 +13,9 @@
 # License.
 #
 
-COMPILER="ifx"
-TARGET_WRAPPER="mpiifort"
+COMPILER="ifort"
+TARGET_WRAPPER="mpiifx"
+user_set_compiler=0
 
 if [ -z "$1" ] ; then
     ${TARGET_WRAPPER} -help
@@ -24,13 +25,22 @@ fi
 for arg in "$@" ; do
     case $arg in 
         -fc=*)
-            compiler_name=$(echo $arg | sed -e 's/-fc=//g')
-            echo "Error: can not overwrite predefined compiler - ${COMPILER}!"
-            echo "You should use ${TARGET_WRAPPER}"
-            echo "ex. ${TARGET_WRAPPER} -fc=${compiler_name}"
-            exit 1
+            COMPILER=$(echo $arg | sed -e 's/-fc=//g')
+            user_set_compiler=1
+        ;;
+        -f90=*)
+            COMPILER=$(echo $arg | sed -e 's/-f90=//g')
+            user_set_compiler=1
         ;;
     esac
 done
 
-${TARGET_WRAPPER} -fc="${COMPILER} $@"
+if [ -n "$I_MPI_F90" ] || [ -n "$MPICH_F90" ]; then
+    user_set_compiler=1
+fi
+
+if [ $user_set_compiler -eq 1 ] ; then
+    ${TARGET_WRAPPER} "$@"
+else
+    ${TARGET_WRAPPER} -fc="${COMPILER}" "$@"
+fi

impi_devel-2021.10.0.data/data/bin/mpiifort → impi_devel-2021.12.0.data/data/bin/mpiifx

@@ -103,21 +103,31 @@ if [ -n "${I_MPI_ROOT}" ] ; then
     prefix="${I_MPI_ROOT}";
 fi
 
-PLATFORM=""
 sysconfdir=${prefix}/etc
+includedir=${prefix}/include
+libdir=${prefix}/lib
+if [ ! -f "${I_MPI_ROOT}/lib/mpi/debug/libmpi.so" ]; then
+    release_lib_dir="/release"
+    debug_lib_dir="/debug"
+    modincdir="${prefix}/include"
+else
+    release_lib_dir=""
+    debug_lib_dir="/mpi/debug"
+    sysconfdir=${prefix}/opt/mpi/etc
+    modincdir="${prefix}/include/mpi"
+fi
+MPILIBDIR=${release_lib_dir}
+
 # The environment variable I_MPI_COMPILER_CONFIG_DIR may be used to override
 # folder where *.conf files are place
 if [ -n "$I_MPI_COMPILER_CONFIG_DIR" ] ; then
     sysconfdir=$I_MPI_COMPILER_CONFIG_DIR;
 fi
-includedir=${prefix}/include
-modincdir=${prefix}/${PLATFORM}/include
-libdir=${prefix}/lib
 #
 # Default settings for compiler, flags, and libraries
 # Determined by a combination of environment variables and tests within
 # configure (e.g., determining whehter -lsocket is needee)
-FC="ifort"
+FC="ifx"
 FCCPP=""
 #
 # Fortran 90 Compiler characteristics
@@ -137,7 +147,7 @@ LDFLAGS="-ldl"
 MPILIBNAME="mpi"
 
 # MPIVERSION is the version of the Intel(R) MPI Library for which mpiifort is intended
-MPIVERSION="2021.10"
+MPIVERSION="@IMPI_OFFICIALVERSION@"
 #
 #
 # Internal variables
@@ -252,7 +262,7 @@ for arg in "$@" ; do
         FC=$(echo A$arg | sed -e 's/A-f90=//g')
         if [ "$#" -eq "1" ] ; then
             echo "Error: extra arguments required"
-            echo "usage: mpiifort -f90=<name> -v"
+            echo "usage: $(basename $0) -f90=<name> -v"
             exit 1
         fi
         addarg=no
@@ -363,7 +373,7 @@ for arg in "$@" ; do
         addarg=no
         ;;
     -g)
-        MPILIBDIR="/release"
+        MPILIBDIR=${release_lib_dir}
         ;;
     -static_mpi)
         static_mpi=yes
@@ -449,7 +459,7 @@ for arg in "$@" ; do
         FC=$(echo A$arg | sed -e 's/A-fc=//g')
         if [ "$#" -eq "1" ] ; then
             echo "Error: extra arguments required"
-            echo "usage: mpiifort -fc=<name> -v"
+            echo "usage: $(basename $0) -fc=<name> -v"
             exit 1
         fi
         addarg=no
@@ -557,35 +567,25 @@ fi
 
 if [ -n "$mpilib_override" ] ; then
     case "$mpilib_override" in
-       opt )
-           MPILIBDIR="/release"
-           ;;
-       opt_mt )
-           MPILIBDIR="/release"
-           MPILIBDIR_MT="mt"
-           ;;
-       dbg )
-           MPILIBDIR="/debug"
-           ;;
-       dbg_mt )
-           MPILIBDIR="/debug"
-           MPILIBDIR_MT="mt"
-           ;;
-       * )
-           echo "Warning: incorrect library version specified. Automatically selected library will be used."
-           ;;
+    opt ) 
+        MPILIBDIR=${release_lib_dir}
+        ;;
+    opt_mt )
+        MPILIBDIR=${release_lib_dir}
+        ;;
+    dbg )
+        MPILIBDIR=${debug_lib_dir}
+        ;;
+    dbg_mt )
+        MPILIBDIR=${debug_lib_dir}
+        ;;
+    * )
+        echo "Warning: incorrect library version specified. Automatically selected library will be used."
+        ;;
     esac
 fi
-
 # -----------------------------------------------------------------------
-case "$MPILIBDIR" in
-    release | /release | debug | /debug)
-        if [ -n "$MPILIBDIR_MT" ]; then
-            MPILIBDIR=${MPILIBDIR}_${MPILIBDIR_MT}
-        fi
-        ;;
-    "" ) MPILIBDIR="/release" ;;
-esac
+
 if [ "$static_mpi" = yes ] ; then
     mpilibs="${libdir}/libmpifort.a ${libdir}${MPILIBDIR}/lib${MPILIBNAME}.a"
     I_MPI_OTHERLIBS=""
@@ -657,7 +657,7 @@ if [ -z "${FCINC}" ] ; then
 else
     # Normally, FCINC is just -I, but some compilers have used different
     # command line arguments
-    FCINCDIRS=${FCINC}\"${includedir}\"
+    FCINCDIRS="${FCINC}\"${includedir}\" ${FCINC}\"${modincdir}\""
 fi
 
 # Handle the specification of the directory containing the modules