impi-devel 2021.4.0__py2.py3-none-win_amd64.whl → 2021.14.1__py2.py3-none-win_amd64.whl

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpicc.bat

@@ -27,11 +27,11 @@ rem Keep the self name (as "filename.ext") in the variable before cycle. We will
 set selfname=%~nx0
 
 rem MPIVERSION is the version of the Intel^(R^) MPI Library that mpicc is intended for
-set MPIVERSION=2021.4
+set MPIVERSION=2021.14
 
 echo %selfname% for the Intel^(R^) MPI Library %MPIVERSION% for Windows*
 echo Copyright Intel Corporation.
-echo.
+echo\
 
 set fisrst_arg=x%1
 set "fisrst_arg=%fisrst_arg:"=%"
@@ -76,30 +76,67 @@ if "%fisrst_arg%" == "x" (
 
 rem The I_MPI_ROOT should be defined by a installer 
 if "%I_MPI_ROOT%" == "" (
-    echo You have to source ^<Intel MPI^>\bin\mpivars.bat
+    echo You have to source ^<Intel MPI^>\etc\mpi\vars.bat
     exit /B 1
 )
-set I_MPI_INCDIR="%I_MPI_ROOT%\include"
-set I_MPI_LIBDIR="%I_MPI_ROOT%\lib"
-set I_MPI_CFGDIR="%I_MPI_ROOT%\etc"
+set "I_MPI_INCDIR=%I_MPI_ROOT%\include"
+set "I_MPI_LIBDIR=%I_MPI_ROOT%\lib"
+set "I_MPI_CFGDIR=%I_MPI_ROOT%\etc"
+if exist "%I_MPI_ROOT%\lib\mpi\debug" (
+    set "I_MPI_DBG_LIB_DIR=\lib\mpi\debug"
+    set "I_MPI_RELEASE_LIB_DIR=\lib"
+) else (
+    set "I_MPI_DBG_LIB_DIR=\lib\debug"
+    set "I_MPI_RELEASE_LIB_DIR=\lib\release"
+)
 :: The environment variables I_MPI_COMPILER_CONFIG_DIR may be used
 :: to override directory where *.conf files are placed.
 if NOT "%I_MPI_COMPILER_CONFIG_DIR%" == "" (
     set I_MPI_CFGDIR=%I_MPI_COMPILER_CONFIG_DIR%
 )
 
-:: The environment variables I_MPI_{CC,CXX} and MPICH_{CC,CXX} may 
+:: The default compiler is cl.exe. Here we get the full path to cl.exe
+:: to avoid a binary hijacking vulnerability. To do that we use vswhere
+:: if available, otherwise the VcToolsInstallDir env var.
+set CC=
+set CCname="cl.exe"
+set InstallDir=
+set Version=
+set VsWhere="C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
+if exist "%VsWhere%" (
+    setlocal EnableDelayedExpansion
+    for /f "usebackq tokens=*" %%i in (`%VsWhere% -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
+        set InstallDir=%%i
+    )
+    if NOT "%I_MPI_MSVC_VERSION%" == "" (
+        set Version=%I_MPI_MSVC_VERSION%
+    ) else if exist "%InstallDir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt" (
+        set /p Version=<"%InstallDir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt"
+        set Version=!Version: =!
+    )
+    set CC="%InstallDir%\VC\Tools\MSVC\%Version%\bin\HostX64\x64\cl.exe"
+    set CCname="cl.exe"
+    setlocal DisableDelayedExpansion
+) else (
+    set CC="%VCToolsInstallDir%\bin\Hostx64\x64\cl.exe"
+    set CCname="cl.exe"
+)
+
+:: The environment variables I_MPI_{CC,CXX} and MPICH_{CC,CXX} may
 :: be used to override the default choice (the CC has highest priority).
-set CC=cl.exe
 if NOT "%I_MPI_CC%" == "" (
     set CC=%I_MPI_CC%
+    set CCname=%CC%
 ) else if NOT "%MPICH_CC%" == "" (
     set CC=%MPICH_CC%
+    set CCname=%CC%
 )
 if NOT "%I_MPI_CXX%" == "" (
     set CC=%I_MPI_CXX%
+    set CCname=%CC%
 ) else if NOT "%MPICH_CXX%" == "" (
     set CC=%MPICH_CXX%
+    set CCname=%CC%
 )
 
 :: The environment variables I_MPI_{CC,CXX}_PROFILE and MPI{CC,CXX}_RPOFILE
@@ -127,7 +164,7 @@ set I_MPI_CFLAGS=
 set I_MPI_LDFLAGS=
 set I_MPI_LIBNAME=impi
 set I_MPI_OTHERLIBS=
-set I_MPI_TRACE_PATH=""
+set I_MPI_TRACE_PATH=
 set OTHER_INCLUDE=
 set OTHER_LIBPATH=
 set VTTRACE_LIBS_START=
@@ -147,6 +184,10 @@ set param_was_processed=
 set PROFILE_INCPATHS=""
 set PROFILE_PRELIB=""
 set PROFILE_POSTLIB=""
+rem icxp specific variables
+set USE_ICPX=no
+set LIB_PREFIX=
+set LINKER_OPTION=/link
 
 rem ------------------------------------------------------------------------
 rem Argument processing.
@@ -273,17 +314,17 @@ set "args_for_processing=%args_for_processing:"=%"
 
 :: Override mpi library in regards to -link_mpi
     if "%mpilib_override%" == "opt" (
-	set MPILIBDIR=\release
+	    set MPILIBDIR=%I_MPI_RELEASE_LIB_DIR%
         set I_MPI_LIBNAME=impi
     ) else if "%mpilib_override%" == "dbg" (
-	set MPILIBDIR=\debug
+	    set MPILIBDIR=%I_MPI_DBG_LIB_DIR%
         set I_MPI_LIBNAME=impi
     ) else if NOT "%mpilib_override%" == "" (
         echo Warning: incorrect library version specified. Automatically selected library will be used
     )
 
     if "%MPILIBDIR%" == "" (
-        set MPILIBDIR=\release
+        set MPILIBDIR=%I_MPI_RELEASE_LIB_DIR%
     )
 
 rem If there is a file $I_MPI_CFGDIR/mpicc-$CCname.conf, 
@@ -291,51 +332,52 @@ rem where CCname is the name of the compiler with all spaces replaced by hyphens
 rem (e.g., "cc -64" becomes "cc--64", that file is sources, allowing other
 rem changes to the compilation environment.  See the variables used by the 
 rem script (defined above)
-set CCname=%CC%
 rem echo CCname=%CCname%
-if EXIST %I_MPI_CFGDIR%\mpicc-%CCname%.conf (
-    call :CALL_CONF_FILE %I_MPI_CFGDIR%\mpicc-%CCname%.conf
+if EXIST "%I_MPI_CFGDIR%\mpicc-%CCname%.conf" (
+    call :CALL_CONF_FILE "%I_MPI_CFGDIR%\mpicc-%CCname%.conf"
 )
 
 if "%trace_opt%" == "yes" (
-    if %I_MPI_TRACE_PATH% == "" (
+    if "%I_MPI_TRACE_PATH%" == "" (
         if "%static_log%" == "yes" (
-            set I_MPI_TRACE_PATH="%VT_LIB_DIR%"
+            set "I_MPI_TRACE_PATH=%VT_LIB_DIR%"
         ) else (
-            set I_MPI_TRACE_PATH="%VT_SLIB_DIR%"
+            set "I_MPI_TRACE_PATH=%VT_SLIB_DIR%"
         )
     )
-    set VTTRACE_LIBS_START=%I_MPI_TRACE_PATH% %I_MPI_TRACE_LIB% %I_MPI_TRACE_EXTRA_LIB%
+    set "VTTRACE_LIBS_START=%I_MPI_TRACE_PATH% %I_MPI_TRACE_LIB% %I_MPI_TRACE_EXTRA_LIB%"
 )
 
 rem Derived variables.  These are assembled from variables set from the
 rem default, environment, configuration file (if any) and command-line
 rem options (if any)
-set mpilibs=%I_MPI_LIBNAME%.lib 
+
+set "mpilibs=%LIB_PREFIX%%I_MPI_LIBNAME%.lib"
 if "%need_cxx_lib%" == "yes" (
-    set mpilibs=%mpilibs% %I_MPI_LIBNAME%cxx.lib
+    set "mpilibs=%mpilibs% %LIB_PREFIX%%I_MPI_LIBNAME%cxx.lib"
 )
+
 rem if "%NEEDSPLIB%" == "yes" (
 rem     set mpilibs=%PI_MPI_LIBNAME%.lib %mpilibs%
 rem )
 
 rem Handle the case of a profile switch
 if NOT "%profConf%" == "" (
-    if EXIST %I_MPI_LIBDIR%\%profConf%.lib (
+    if EXIST "%I_MPI_LIBDIR%\%profConf%.lib" (
         set profConfLibExists=yes
-    ) 
-    if EXIST %I_MPI_CFGDIR%\%profConf%.conf (
+    )
+    if EXIST "%I_MPI_CFGDIR%\%profConf%.conf" (
         set profConfFileExists=yes
-    ) 
+    )
 )
 if "%profConfLibExists%" == "yes" (
-   set mpilibs=%profConf%.lib %mpilibs%
+   set "mpilibs=%profConf%.lib %mpilibs%"
 ) else if NOT "%profConf%" == "" (
     if "%profConfFileExists%" == "yes" (
-        call :CALL_CONF_FILE %I_MPI_CFGDIR%\%profConf%.conf
+        call :CALL_CONF_FILE "%I_MPI_CFGDIR%\%profConf%.conf"
     ) else (
-        echo The configuration file %I_MPI_CFGDIR%\%profConf%.conf is not found!
-    ) 
+        echo "The configuration file %I_MPI_CFGDIR%\%profConf%.conf is not found!"
+    )
 )
 if NOT %PROFILE_INCPATHS% == "" set I_MPI_CFLAGS=%PROFILE_INCPATHS% %I_MPI_CFLAGS%
 if NOT %PROFILE_PRELIB% == ""   set mpilibs=%PROFILE_PRELIB% %mpilibs%
@@ -362,14 +404,14 @@ if "%show_env%" == "yes" (
 )
 
 if "%linking%" == "yes" (
-    if %I_MPI_TRACE_PATH% == "" (
+    if "%I_MPI_TRACE_PATH%" == "" (
         :: Place default mpi library at end for linking with ITAC
-        %Show% %CC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %OTHER_INCLUDE% -I%I_MPI_INCDIR% /link %OTHER_LIBPATH% /LIBPATH:"%I_MPI_ROOT%\lib%MPILIBDIR%" /LIBPATH:%I_MPI_LIBDIR% %I_MPI_OTHERLIBS% %link_args% %mpilibs% 
+        %Show% %CC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %OTHER_INCLUDE% -I"%I_MPI_INCDIR%"  -I"%I_MPI_INCDIR%\mpi" %LINKER_OPTION% %OTHER_LIBPATH% /LIBPATH:"%I_MPI_ROOT%%MPILIBDIR%" /LIBPATH:"%I_MPI_LIBDIR%" %I_MPI_OTHERLIBS% %link_args% %mpilibs% 
     ) else (
-        %Show% %CC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %OTHER_INCLUDE% -I%I_MPI_INCDIR% /link %OTHER_LIBPATH% /LIBPATH:%I_MPI_TRACE_PATH% /LIBPATH:"%I_MPI_ROOT%\lib%MPILIBDIR%" /LIBPATH:%I_MPI_LIBDIR% %VTTRACE_LIBS_START% %mpilibs% %I_MPI_OTHERLIBS% %link_args% 
+        %Show% %CC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %OTHER_INCLUDE% -I"%I_MPI_INCDIR%"  -I"%I_MPI_INCDIR%\mpi" %LINKER_OPTION% %OTHER_LIBPATH% /LIBPATH:"%I_MPI_TRACE_PATH%" /LIBPATH:"%I_MPI_ROOT%%MPILIBDIR%" /LIBPATH:"%I_MPI_LIBDIR%" %VTTRACE_LIBS_START% %mpilibs% %I_MPI_OTHERLIBS% %link_args%
     )
 ) else (
-    %Show% %CC% %I_MPI_CFLAGS% %allargs% %OTHER_INCLUDE% -I%I_MPI_INCDIR%
+    %Show% %CC% %I_MPI_CFLAGS% %allargs% %OTHER_INCLUDE% -I"%I_MPI_INCDIR%"
 )
 
 if ERRORLEVEL 1 (
@@ -447,6 +489,7 @@ rem        set CC=%arg:~4%
     rem -cc=* -config=*
     if "%arg%" == "-cc" ( rem "-cc=*"
         set CC=%_param: =%
+        set CCname=%CC%
         set addarg=no
         set param_was_processed=yes
         goto END_OF_CASE
@@ -460,9 +503,15 @@ rem        set CC=%arg:~4%
     rem -cxx=* -config=*
     if "%arg%" == "-cxx" ( rem "-cxx=*"
         set CC=%_param: =%
+        set CCname=%CC%
         set addarg=no
         set param_was_processed=yes
         set need_cxx_lib=yes
+        if "%_param: =%" == "icpx" (
+            set USE_ICPX=yes
+            set LIB_PREFIX=/l
+            set LINKER_OPTION=
+        )
         goto END_OF_CASE
     )
     if "%arg%" == "-show" (
@@ -528,16 +577,16 @@ rem    )
         goto END_OF_CASE
     )
 
-    if "%arg%" == "-Z7" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-Zi" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-ZI" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug" set MPILIBDIR=\debug& goto END_OF_CASE
+    if "%arg%" == "-Z7" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-Zi" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-ZI" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
     if "%arg%" == "-debug:none" goto END_OF_CASE
-    if "%arg%" == "-debug:extended" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:semantic_stepping" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:full" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:partial" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:minimal" set MPILIBDIR=\debug& goto END_OF_CASE
+    if "%arg%" == "-debug:extended" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:semantic_stepping" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:full" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:partial" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:minimal" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
     
     if "%arg%" == "-mt_mpi" (
         set addarg=no

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpicl.bat

@@ -19,8 +19,8 @@ rem This script sets some variable and the general script.
 rem ----------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpicxx.bat
+        call "%I_MPI_ROOT%\bin\mpicxx.bat"
 ) else (
-	call mpicxx.bat -cxx=cl %* 
+        call "%I_MPI_ROOT%\bin\mpicxx.bat" -cxx=cl %*
 )
 

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpicxx.bat

@@ -14,7 +14,7 @@ rem in the License.
 
 rem ----------------------------------------------------------------------------
 rem mpicxx.bat
-rem Simple script to compile and/or link MPI programs by Intel C++ Compiler.
+rem Simple script to compile and/or link MPI programs by Intel® C++ Compiler.
 rem This script sets some variable and the general script.
 rem ----------------------------------------------------------------------------
 
@@ -22,5 +22,4 @@ rem We need to use CXX lib additionally
 set need_cxx_lib=yes
 
 rem Invoke C/C++ version of driver
-call mpicc.bat %*
-
+call "%I_MPI_ROOT%\bin\mpicc.bat" %*

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpif77.bat

@@ -14,12 +14,12 @@ rem in the License.
 
 rem ----------------------------------------------------------------------------
 rem mpif77.bat
-rem Simple script to compile and/or link MPI programs by Intel Fortran Compiler.
+rem Simple script to compile and/or link MPI programs by Intel® Fortran Compiler.
 rem ----------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpifc.bat
+        call "%I_MPI_ROOT%\bin\mpifc.bat"
 ) else (
-	call mpifc.bat -fc=ifort %* 
+        call "%I_MPI_ROOT%\bin\mpifc.bat" -fc=ifort %*
 )
 

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpif90.bat

@@ -14,12 +14,12 @@ rem in the License.
 
 rem ----------------------------------------------------------------------------
 rem mpif90.bat
-rem Simple script to compile and/or link MPI programs by Intel Fortran Compiler.
+rem Simple script to compile and/or link MPI programs by Intel® Fortran Compiler.
 rem ----------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpifc.bat
+        call "%I_MPI_ROOT%\bin\mpifc.bat"
 ) else (
-	call mpifc.bat -fc=ifort %* 
+        call "%I_MPI_ROOT%\bin\mpifc.bat" -fc=ifort %*
 )
 

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpifc.bat

@@ -26,11 +26,11 @@ rem Keep the self name (as "filename.ext") in the variable before cycle. We will
 set selfname=%~nx0
 
 rem MPIVERSION is the version of the Intel^(R^) MPI Library that mpifc is intended for
-set MPIVERSION=2021.4
+set MPIVERSION=2021.14
 
 echo %selfname% for the Intel^(R^) MPI Library %MPIVERSION% for Windows*
 echo Copyright Intel Corporation.
-echo.
+echo\
 
 set fisrst_arg=x%1
 set "fisrst_arg=%fisrst_arg:"=%"
@@ -61,6 +61,7 @@ if "%fisrst_arg%" == "x" (
     echo All other options will be passed to the compiler without changing.
     echo ---------------------------------------------------------------------------- 
     echo The following environment variables are used:
+    echo    CMPLR_ROOT      Intel^(R^) Compiler installation directory path
     echo    I_MPI_ROOT      Intel^(R^) MPI Library installation directory path 
     echo    I_MPI_{FC,F77,F90} or MPICH_{FC,F77,F90}  
     echo                    the path/name of the underlying compiler to be used.
@@ -73,14 +74,26 @@ if "%fisrst_arg%" == "x" (
     exit /B 0
 )
 
+rem The CMPLR_ROOT should be defined by a installer
+if "%CMPLR_ROOT%" == "" (
+    echo You have to source ^<Intel Compiler^>\bin\vars.bat
+    exit /B 1
+)
 rem The I_MPI_ROOT should be defined by a installer 
 if "%I_MPI_ROOT%" == "" (
     echo You have to source ^<Intel MPI^>\bin\mpivars.bat
     exit /B 1
 )
-set I_MPI_INCDIR="%I_MPI_ROOT%\include"
-set I_MPI_LIBDIR="%I_MPI_ROOT%\lib"
-set I_MPI_CFGDIR="%I_MPI_ROOT%\etc"
+set "I_MPI_INCDIR=%I_MPI_ROOT%\include"
+set "I_MPI_LIBDIR=%I_MPI_ROOT%\lib"
+set "I_MPI_CFGDIR=%I_MPI_ROOT%\etc"
+if exist "%I_MPI_ROOT%\lib\mpi\debug" (
+    set "I_MPI_DBG_LIB_DIR=\lib\mpi\debug"
+    set "I_MPI_RELEASE_LIB_DIR=\lib"
+) else (
+    set "I_MPI_DBG_LIB_DIR=\lib\debug"
+    set "I_MPI_RELEASE_LIB_DIR=\lib\release"
+)
 :: The environment variables I_MPI_COMPILER_CONFIG_DIR may be used
 :: to override directory where *.conf files are placed.
 if NOT "%I_MPI_COMPILER_CONFIG_DIR%" == "" (
@@ -89,7 +102,7 @@ if NOT "%I_MPI_COMPILER_CONFIG_DIR%" == "" (
 
 :: The environment variables I_MPI_{FC,F77,F90} and MPICH_{FC,F77,F90} may 
 :: be used to override the default choice (the FC has highest priority).
-set FC=ifort.exe
+set FC="%CMPLR_ROOT%\bin\ifort.exe"
 if NOT "%I_MPI_F77%" == "" (
     set FC=%I_MPI_F77%
 ) else if NOT "%MPICH_F77%" == "" (
@@ -150,7 +163,7 @@ set I_MPI_CFLAGS=
 set I_MPI_LDFLAGS=
 set I_MPI_LIBNAME=impi
 set I_MPI_OTHERLIBS=
-set I_MPI_TRACE_PATH=""
+set I_MPI_TRACE_PATH=
 set OTHER_INCLUDE=
 set OTHER_LIBPATH=
 set VTTRACE_LIBS_START=
@@ -290,20 +303,17 @@ set "args_for_processing=%args_for_processing:"=%"
 
 :: Override mpi library in regards to -link_mpi
     if "%mpilib_override%" == "opt" (
-	set MPILIBDIR=\release
+	    set MPILIBDIR=%I_MPI_RELEASE_LIB_DIR%
         set I_MPI_LIBNAME=impi
-        set debug_suffix=
     ) else if "%mpilib_override%" == "dbg" (
-	set MPILIBDIR=\debug
+	    set MPILIBDIR=%I_MPI_DBG_LIB_DIR%
         set I_MPI_LIBNAME=impi
-        set debug_suffix=d
     ) else if NOT "%mpilib_override%" == "" (
         echo Warning: incorrect library version specified. Automatically selected library will be used
-		set MPILIBDIR=\release
     )
 
     if "%MPILIBDIR%" == "" (
-        set MPILIBDIR=\release
+        set MPILIBDIR=%I_MPI_RELEASE_LIB_DIR%
     )
 
 rem If there is a file $I_MPI_CFGDIR/mpif90-$FCname.conf, 
@@ -313,19 +323,19 @@ rem changes to the compilation environment.  See the variables used by the
 rem script (defined above)
 set FCname=%FC%
 rem echo FCname="%FC%" 
-if EXIST %I_MPI_CFGDIR%\mpifc-%FCname%.conf ( 
-    call :CALL_CONF_FILE %I_MPI_CFGDIR%\mpifc-%FCname%.conf
+if EXIST "%I_MPI_CFGDIR%\mpifc-%FCname%.conf" ( 
+    call :CALL_CONF_FILE "%I_MPI_CFGDIR%\mpifc-%FCname%.conf"
 )
 
 if "%trace_opt%" == "yes" (
-    if %I_MPI_TRACE_PATH% == "" (
+    if "%I_MPI_TRACE_PATH%" == "" (
         if "%static_log%" == "yes" (
-            set I_MPI_TRACE_PATH="%VT_LIB_DIR%"
+            set "I_MPI_TRACE_PATH=%VT_LIB_DIR%"
         ) else (
-            set I_MPI_TRACE_PATH="%VT_SLIB_DIR%"
+            set "I_MPI_TRACE_PATH=%VT_SLIB_DIR%"
         )
     )
-    set VTTRACE_LIBS_START=%I_MPI_TRACE_PATH% %I_MPI_TRACE_LIB% %I_MPI_TRACE_EXTRA_LIB%
+    set "VTTRACE_LIBS_START=%I_MPI_TRACE_PATH% %I_MPI_TRACE_LIB% %I_MPI_TRACE_EXTRA_LIB%"
 )
 
 rem Derived variables.  These are assembled from variables set from the
@@ -338,22 +348,22 @@ rem )
 
 rem Handle the case of a profile switch
 if NOT "%profConf%" == "" (
-    if EXIST %I_MPI_LIBDIR%\lib%profConf%.lib   set profConfLibExists=yes
+    if EXIST "%I_MPI_LIBDIR%\lib%profConf%.lib"   set profConfLibExists=yes
     if "%profConfLibExists%" == "yes" (
-       set mpilibs=%I_MPI_LIBDIR%\%profConf%.lib %mpilibs%
+       set "mpilibs=%I_MPI_LIBDIR%\%profConf%.lib %mpilibs%"
     ) 
-    if EXIST %I_MPI_CFGDIR%\%profConf%.conf (
-        call :CALL_CONF_FILE %I_MPI_CFGDIR%\%profConf%.conf
+    if EXIST "%I_MPI_CFGDIR%\%profConf%.conf" (
+        call :CALL_CONF_FILE "%I_MPI_CFGDIR%\%profConf%.conf"
     ) else (
-        echo The configuration file %I_MPI_CFGDIR%\%profConf%.conf is not found!
+        echo "The configuration file %I_MPI_CFGDIR%\%profConf%.conf is not found!"
     ) 
 )
 
 if "%ilp64%" == "yes" (
-    set FCINCDIRS=%FCINC%%I_MPI_INCDIR%\ilp64  %FCINC%%I_MPI_INCDIR%
-    set mpilibs=libmpi_ilp64.lib %mpilibs%
+    set FCINCDIRS=%FCINC%"%I_MPI_INCDIR%\mpi\ilp64"  %FCINC%"%I_MPI_INCDIR%" %FCINC%"%I_MPI_INCDIR%\mpi"
+    set "mpilibs=libmpi_ilp64.lib %mpilibs%"
 ) else (
-    set FCINCDIRS=%FCINC%%I_MPI_INCDIR%
+    set FCINCDIRS=%FCINC%"%I_MPI_INCDIR%" %FCINC%"%I_MPI_INCDIR%\mpi"
 )
 
 if NOT %PROFILE_INCPATHS% == "" set I_MPI_CFLAGS=%PROFILE_INCPATHS% %I_MPI_CFLAGS%
@@ -407,11 +417,11 @@ if "%show_env%" == "yes" (
 )
 
 if "%linking%" == "yes" (
-    if %I_MPI_TRACE_PATH% == "" (
+    if "%I_MPI_TRACE_PATH%" == "" (
     :: Place default mpi library at end for linking with ITAC
-	%Show% %FC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %FCMODDIRS% %OTHER_INCLUDE% %FCINCDIRS% /link %OTHER_LIBPATH% /LIBPATH:"%I_MPI_ROOT%\lib%MPILIBDIR%" /LIBPATH:%I_MPI_LIBDIR% %I_MPI_OTHERLIBS% %link_args% %mpilibs%
+	%Show% %FC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %FCMODDIRS% %OTHER_INCLUDE% %FCINCDIRS% /link %OTHER_LIBPATH% /LIBPATH:"%I_MPI_ROOT%%MPILIBDIR%" /LIBPATH:"%I_MPI_LIBDIR%" %I_MPI_OTHERLIBS% %link_args% %mpilibs%
     ) else (
-	%Show% %FC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %FCMODDIRS% %OTHER_INCLUDE% %FCINCDIRS% /link %OTHER_LIBPATH% /LIBPATH:%I_MPI_TRACE_PATH% /LIBPATH:"%I_MPI_ROOT%\lib%MPILIBDIR%" /LIBPATH:%I_MPI_LIBDIR% %VTTRACE_LIBS_START% %mpilibs% %I_MPI_OTHERLIBS% %link_args%
+	%Show% %FC% %I_MPI_CFLAGS% %I_MPI_LDFLAGS% %allargs% %FCMODDIRS% %OTHER_INCLUDE% %FCINCDIRS% /link %OTHER_LIBPATH% /LIBPATH:"%I_MPI_TRACE_PATH%" /LIBPATH:"%I_MPI_ROOT%%MPILIBDIR%" /LIBPATH:"%I_MPI_LIBDIR%" %VTTRACE_LIBS_START% %mpilibs% %I_MPI_OTHERLIBS% %link_args%
     )
 ) else (
     %Show% %FC% %I_MPI_CFLAGS% %allargs% %FCMODDIRS% %OTHER_INCLUDE% %FCINCDIRS%
@@ -582,15 +592,16 @@ rem    )
         goto END_OF_CASE
     )
 
-    if "%arg%" == "-Z7" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-Zi" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug" set MPILIBDIR=\debug& goto END_OF_CASE
+    if "%arg%" == "-Z7" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-Zi" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-ZI" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
     if "%arg%" == "-debug:none" goto END_OF_CASE
-    if "%arg%" == "-debug:extended" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:semantic_stepping" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:full" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:partial" set MPILIBDIR=\debug& goto END_OF_CASE
-    if "%arg%" == "-debug:minimal" set MPILIBDIR=\debug& goto END_OF_CASE
+    if "%arg%" == "-debug:extended" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:semantic_stepping" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:full" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:partial" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
+    if "%arg%" == "-debug:minimal" set MPILIBDIR=%I_MPI_DBG_LIB_DIR%& goto END_OF_CASE
 
 rem    if "%arg%" == "-static" (
 rem        set static_mpi=yes

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpiicc.bat

@@ -14,13 +14,13 @@ rem in the License.
 
 rem ----------------------------------------------------------------------------
 rem mpiicc.bat
-rem Simple script to compile and/or link MPI programs by Intel C++ Compiler.
+rem Simple script to compile and/or link MPI programs by Intel® C++ Compiler.
 rem This script sets some variable and the general script.
 rem ----------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpicc.bat
+        call "%I_MPI_ROOT%\bin\mpicc.bat"
 ) else (
-	call mpicc.bat -cc=icl %* 
+        call "%I_MPI_ROOT%\bin\mpicc.bat" -cc=icl %*
 )
 

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpiicpc.bat

@@ -14,13 +14,13 @@ rem in the License.
 
 rem ----------------------------------------------------------------------------
 rem mpiicpc.bat
-rem Simple script to compile and/or link MPI programs by Intel C++ Compiler.
+rem Simple script to compile and/or link MPI programs by Intel® C++ Compiler.
 rem This script sets some variable and the general script.
 rem ----------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpicxx.bat
+        call "%I_MPI_ROOT%\bin\mpicxx.bat"
 ) else (
-	call mpicxx.bat -cxx=icl %* 
+        call "%I_MPI_ROOT%\bin\mpicxx.bat" -cxx=icl %*
 )
 

impi_devel-2021.14.1.data/data/Library/bin/mpiicpx.bat

@@ -0,0 +1,24 @@
+@echo off
+rem Copyright Intel Corporation.
+rem 
+rem This software and the related documents are Intel copyrighted materials,
+rem and your use of them is governed by the express license under which they
+rem were provided to you (License). Unless the License provides otherwise,
+rem you may not use, modify, copy, publish, distribute, disclose or transmit
+rem this software or the related documents without Intel's prior written
+rem permission.
+rem 
+rem This software and the related documents are provided as is, with no
+rem express or implied warranties, other than those that are expressly stated
+rem in the License.
+
+rem ----------------------------------------------------------------------------------
+rem mpicxx.bat
+rem Simple script to compile and/or link MPI programs by Intel® LLVM-based C Compiler.
+rem ----------------------------------------------------------------------------------
+
+if "%1" == "" (
+        call "%I_MPI_ROOT%\bin\mpicxx.bat"
+) else (
+        call "%I_MPI_ROOT%\bin\mpicxx.bat" -cxx=icpx %*
+)

impi_devel-2021.14.1.data/data/Library/bin/mpiicx.bat

@@ -0,0 +1,24 @@
+@echo off
+rem Copyright Intel Corporation.
+rem 
+rem This software and the related documents are Intel copyrighted materials,
+rem and your use of them is governed by the express license under which they
+rem were provided to you (License). Unless the License provides otherwise,
+rem you may not use, modify, copy, publish, distribute, disclose or transmit
+rem this software or the related documents without Intel's prior written
+rem permission.
+rem 
+rem This software and the related documents are provided as is, with no
+rem express or implied warranties, other than those that are expressly stated
+rem in the License.
+
+rem ----------------------------------------------------------------------------------
+rem mpiicx.bat
+rem Simple script to compile and/or link MPI programs by Intel® LLVM-based C Compiler.
+rem ----------------------------------------------------------------------------------
+
+if "%1" == "" (
+        call "%I_MPI_ROOT%\bin\mpicc.bat"
+) else (
+        call "%I_MPI_ROOT%\bin\mpicc.bat" -cc=icx %*
+)

{impi_devel-2021.4.0.data → impi_devel-2021.14.1.data}/data/Library/bin/mpiifort.bat

@@ -14,12 +14,12 @@ rem in the License.
 
 rem ----------------------------------------------------------------------------
 rem mpiifort.bat
-rem Simple script to compile and/or link MPI programs by Intel Fortran Compiler.
+rem Simple script to compile and/or link MPI programs by Intel® Fortran Compiler.
 rem ----------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpifc.bat
+        call "%I_MPI_ROOT%\bin\mpifc.bat"
 ) else (
-	call mpifc.bat -fc=ifort %* 
+        call "%I_MPI_ROOT%\bin\mpifc.bat" -fc=ifort %*
 )
 

impi_devel-2021.14.1.data/data/Library/bin/mpiifx.bat

@@ -0,0 +1,24 @@
+@echo off
+rem Copyright Intel Corporation.
+rem 
+rem This software and the related documents are Intel copyrighted materials,
+rem and your use of them is governed by the express license under which they
+rem were provided to you (License). Unless the License provides otherwise,
+rem you may not use, modify, copy, publish, distribute, disclose or transmit
+rem this software or the related documents without Intel's prior written
+rem permission.
+rem 
+rem This software and the related documents are provided as is, with no
+rem express or implied warranties, other than those that are expressly stated
+rem in the License.
+
+rem -----------------------------------------------------------------------------------------
+rem mpiifx.bat
+rem Simple script to compile and/or link MPI programs by Intel®  LLVM-based Fortran Compiler.
+rem -----------------------------------------------------------------------------------------
+
+if "%1" == "" (
+        call "%I_MPI_ROOT%\bin\mpifc.bat"
+) else (
+        call "%I_MPI_ROOT%\bin\mpifc.bat" -fc=ifx %*
+)