impi-devel 2021.13.1__py2.py3-none-win_amd64.whl → 2021.14.0__py2.py3-none-win_amd64.whl

{impi_devel-2021.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpicc.bat

@@ -27,7 +27,7 @@ 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.13
+set MPIVERSION=2021.14
 
 echo %selfname% for the Intel^(R^) MPI Library %MPIVERSION% for Windows*
 echo Copyright Intel Corporation.
@@ -95,18 +95,48 @@ 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
@@ -302,7 +332,6 @@ 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"
@@ -460,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
@@ -473,6 +503,7 @@ 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

{impi_devel-2021.13.1.data → impi_devel-2021.14.0.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.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpicxx.bat

@@ -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.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpif77.bat

@@ -18,8 +18,8 @@ rem Simple script to compile and/or link MPI programs by Intel® Fortran Compile
 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.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpif90.bat

@@ -18,8 +18,8 @@ rem Simple script to compile and/or link MPI programs by Intel® Fortran Compile
 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.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpifc.bat

@@ -26,7 +26,7 @@ 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.13
+set MPIVERSION=2021.14
 
 echo %selfname% for the Intel^(R^) MPI Library %MPIVERSION% for Windows*
 echo Copyright Intel Corporation.
@@ -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,6 +74,11 @@ 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
@@ -96,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%" == "" (

{impi_devel-2021.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpiicc.bat

@@ -19,8 +19,8 @@ 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.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpiicpc.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=icl %* 
+        call "%I_MPI_ROOT%\bin\mpicxx.bat" -cxx=icl %*
 )
 

{impi_devel-2021.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpiicpx.bat

@@ -18,7 +18,7 @@ rem Simple script to compile and/or link MPI programs by Intel® LLVM-based C Co
 rem ----------------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpicxx.bat
+        call "%I_MPI_ROOT%\bin\mpicxx.bat"
 ) else (
-	call mpicxx.bat -cxx=icpx %* 
+        call "%I_MPI_ROOT%\bin\mpicxx.bat" -cxx=icpx %*
 )

{impi_devel-2021.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpiicx.bat

@@ -18,7 +18,7 @@ rem Simple script to compile and/or link MPI programs by Intel® LLVM-based C Co
 rem ----------------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpicc.bat
+        call "%I_MPI_ROOT%\bin\mpicc.bat"
 ) else (
-	call mpicc.bat -cc=icx %* 
+        call "%I_MPI_ROOT%\bin\mpicc.bat" -cc=icx %*
 )

{impi_devel-2021.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpiifort.bat

@@ -18,8 +18,8 @@ rem Simple script to compile and/or link MPI programs by Intel® Fortran Compile
 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.13.1.data → impi_devel-2021.14.0.data}/data/Library/bin/mpiifx.bat

@@ -18,7 +18,7 @@ rem Simple script to compile and/or link MPI programs by Intel®  LLVM-based For
 rem -----------------------------------------------------------------------------------------
 
 if "%1" == "" (
-	call mpifc.bat
+        call "%I_MPI_ROOT%\bin\mpifc.bat"
 ) else (
-	call mpifc.bat -fc=ifx %* 
+        call "%I_MPI_ROOT%\bin\mpifc.bat" -fc=ifx %*
 )