From 82877d279a6635ea04535f7c802a726f8f354de9 Mon Sep 17 00:00:00 2001 From: Xu Han Date: Fri, 19 Apr 2024 22:21:29 +0800 Subject: [PATCH 1/7] Windows use mkl static lib. --- windows/condaenv.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 022e61891..74a8c9449 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -9,11 +9,11 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( set PYTHON_VERSION_STR=%%v set PYTHON_VERSION_STR=!PYTHON_VERSION_STR:.=! conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s - if "%%v" == "3.8" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "mkl=2020.2" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "mkl=2020.2" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 "mkl=2023.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.8" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 "intel::mkl-static=2023.1" "intel::mkl-include=2023.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v ) endlocal From a0dadc25056e3c099e29c3f665c20ca0cb755379 Mon Sep 17 00:00:00 2001 From: Xu Han Date: Fri, 19 Apr 2024 22:48:42 +0800 Subject: [PATCH 2/7] remove mkl-include installation due to already installed. --- windows/build_pytorch.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/build_pytorch.bat b/windows/build_pytorch.bat index 750d3c5e3..6853234c9 100644 --- a/windows/build_pytorch.bat +++ b/windows/build_pytorch.bat @@ -122,7 +122,7 @@ for %%v in (%DESIRED_PYTHON_PREFIX%) do ( ) else ( set "PATH=%CONDA_HOME%\envs\%%v;%CONDA_HOME%\envs\%%v\scripts;%CONDA_HOME%\envs\%%v\Library\bin;%ORIG_PATH%" ) - pip install ninja mkl-include==2021.4.0 mkl-devel==2021.4.0 + pip install ninja @setlocal :: Set Flags if not "%CUDA_VERSION%"=="cpu" ( From e5f747d498ba25a975d015167df8ee550e5a51fd Mon Sep 17 00:00:00 2001 From: Xu Han Date: Fri, 19 Apr 2024 22:54:25 +0800 Subject: [PATCH 3/7] remove copy mkl dll files, due to static link. --- windows/internal/copy.bat | 5 +---- windows/internal/copy_cpu.bat | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/windows/internal/copy.bat b/windows/internal/copy.bat index 9893fc7c5..b2d078944 100755 --- a/windows/internal/copy.bat +++ b/windows/internal/copy.bat @@ -11,10 +11,7 @@ copy "%CUDA_PATH%\extras\CUPTI\lib64\cupti64_*.dll*" pytorch\torch\lib copy "C:\Program Files\NVIDIA Corporation\NvToolsExt\bin\x64\nvToolsExt64_1.dll*" pytorch\torch\lib copy "%CONDA_LIB_PATH%\libiomp*5md.dll" pytorch\torch\lib -IF "%PACKAGE_TYPE%"=="libtorch" ( - copy "%CONDA_LIB_PATH%\mkl_intel_thread.1.dll" pytorch\torch\lib - copy "%CONDA_LIB_PATH%\mkl_core.1.dll" pytorch\torch\lib -) + :: Should be set in build_pytorch.bat copy "%libuv_ROOT%\bin\uv.dll" pytorch\torch\lib diff --git a/windows/internal/copy_cpu.bat b/windows/internal/copy_cpu.bat index 0a4c0dabb..864180d85 100755 --- a/windows/internal/copy_cpu.bat +++ b/windows/internal/copy_cpu.bat @@ -1,8 +1,3 @@ copy "%CONDA_LIB_PATH%\libiomp*5md.dll" pytorch\torch\lib :: Should be set in build_pytorch.bat -copy "%libuv_ROOT%\bin\uv.dll" pytorch\torch\lib - -IF "%PACKAGE_TYPE%"=="libtorch" ( - copy "%CONDA_LIB_PATH%\mkl_intel_thread.1.dll" pytorch\torch\lib - copy "%CONDA_LIB_PATH%\mkl_core.1.dll" pytorch\torch\lib -) +copy "%libuv_ROOT%\bin\uv.dll" pytorch\torch\lib \ No newline at end of file From 3ed84081e0b9df54d9b2ca7e0286be4105c800ad Mon Sep 17 00:00:00 2001 From: Xu Han Date: Wed, 24 Apr 2024 23:35:11 +0800 Subject: [PATCH 4/7] fix some pip install confilct. --- windows/condaenv.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 74a8c9449..c8f8747be 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -11,8 +11,8 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s if "%%v" == "3.8" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "intel::mkl-static=2022.2.1" "intel::mkl-include=2022.2.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "intel::mkl-static=2022.2.1" "intel::mkl-include=2022.2.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 "intel::mkl-static=2023.1" "intel::mkl-include=2023.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v ) endlocal From 1f2c0d60e191d5d3f900502752e0c5443831f66e Mon Sep 17 00:00:00 2001 From: Xu Han Date: Thu, 25 Apr 2024 01:39:52 +0800 Subject: [PATCH 5/7] remove mkl version limitation. --- windows/condaenv.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index c8f8747be..054fb98ba 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -9,11 +9,11 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( set PYTHON_VERSION_STR=%%v set PYTHON_VERSION_STR=!PYTHON_VERSION_STR:.=! conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s - if "%%v" == "3.8" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "intel::mkl-static=2020.2" "intel::mkl-include=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "intel::mkl-static=2022.2.1" "intel::mkl-include=2022.2.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "intel::mkl-static=2022.2.1" "intel::mkl-include=2022.2.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 "intel::mkl-static=2023.1" "intel::mkl-include=2023.1" intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.8" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 intel::mkl-static intel::mkl-include intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 intel::mkl-static intel::mkl-include intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 intel::mkl-static intel::mkl-include intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v ) endlocal From d9012e26b14013626e43bb9b157ed7f4fb3ea480 Mon Sep 17 00:00:00 2001 From: Xu Han Date: Thu, 25 Apr 2024 23:37:25 +0800 Subject: [PATCH 6/7] remove useless version limitation. --- windows/condaenv.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 054fb98ba..51e11593c 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -11,9 +11,9 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s if "%%v" == "3.8" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 intel::mkl-static intel::mkl-include intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 intel::mkl-static intel::mkl-include intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 intel::mkl-static intel::mkl-include intel-openmp=2023.2.0 pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 intel::mkl-static intel::mkl-include pyyaml boto3 cmake ninja typing_extensions python=%%v ) endlocal From 239edc2d661ed9e80d68bcd406b14856268b8659 Mon Sep 17 00:00:00 2001 From: Xu Han Date: Fri, 26 Apr 2024 00:11:42 +0800 Subject: [PATCH 7/7] delete useless mkl script. --- windows/build_pytorch.bat | 5 ----- windows/internal/check_deps.bat | 2 +- windows/internal/static_lib_test.bat | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/windows/build_pytorch.bat b/windows/build_pytorch.bat index 6853234c9..cd231d9a6 100644 --- a/windows/build_pytorch.bat +++ b/windows/build_pytorch.bat @@ -63,11 +63,6 @@ echo "Failed to create conda env" exit /B 1 :done - -:: Install MKL -rmdir /s /q mkl -del mkl_2020.2.254.7z - :: Download MAGMA Files on CUDA builds set MAGMA_VERSION=2.5.4 diff --git a/windows/internal/check_deps.bat b/windows/internal/check_deps.bat index 5e1f58e35..72e2bd6e7 100755 --- a/windows/internal/check_deps.bat +++ b/windows/internal/check_deps.bat @@ -65,7 +65,7 @@ if %PYVER% LSS 35 ( echo Warning: PyTorch for Python 2 under Windows is experimental. echo Python x64 3.5 or up is recommended to compile PyTorch on Windows echo Maybe you can create a virual environment if you have conda installed: - echo ^> conda create -n test python=3.6 pyyaml mkl numpy + echo ^> conda create -n test python=3.6 pyyaml numpy echo ^> activate test ) diff --git a/windows/internal/static_lib_test.bat b/windows/internal/static_lib_test.bat index aa15dd68f..2335ce0b3 100644 --- a/windows/internal/static_lib_test.bat +++ b/windows/internal/static_lib_test.bat @@ -70,11 +70,6 @@ echo "install and test libtorch" pip install cmake echo "installing cmake" -curl https://s3.amazonaws.com/ossci-windows/mkl_2020.2.254.7z -k -O -7z x -aoa mkl_2020.2.254.7z -omkl -set LIB=%CD%\mkl\lib;%LIB% - - if "%VC_YEAR%" == "2019" powershell internal\vs2019_install.ps1 if "%VC_YEAR%" == "2022" powershell internal\vs2022_install.ps1