From bce5ac57504be92c38fb1768f76e6a4b96edc398 Mon Sep 17 00:00:00 2001 From: Xu Han Date: Sat, 6 Jul 2024 03:39:52 +0800 Subject: [PATCH] switch mkl to mkl-static. --- conda/debugging_pytorch.sh | 2 +- conda/pytorch-nightly/conda_build_config.yaml | 2 +- conda/pytorch-nightly/meta.yaml | 12 ++++++------ conda/vs2019/conda_build_config.yaml | 2 +- conda/vs2022/conda_build_config.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conda/debugging_pytorch.sh b/conda/debugging_pytorch.sh index 4cce4f225e..bf1a2edc0d 100644 --- a/conda/debugging_pytorch.sh +++ b/conda/debugging_pytorch.sh @@ -14,7 +14,7 @@ export USE_CUDA_STATIC_LINK=1 . ./switch_cuda_version.sh 9.0 -conda install -y cmake numpy=1.17 setuptools pyyaml mkl=2018 mkl-include typing_extension ninja magma-cuda80 -c pytorch +conda install -y cmake numpy=1.17 setuptools pyyaml mkl-static=2018 mkl-include typing_extension ninja magma-cuda80 -c pytorch export CMAKE_PREFIX_PATH="$(dirname $(which conda))/../" git clone https://github.com/pytorch/pytorch -b nightly2 --recursive diff --git a/conda/pytorch-nightly/conda_build_config.yaml b/conda/pytorch-nightly/conda_build_config.yaml index 5188bb0ebe..e33234f92c 100644 --- a/conda/pytorch-nightly/conda_build_config.yaml +++ b/conda/pytorch-nightly/conda_build_config.yaml @@ -1,5 +1,5 @@ blas_impl: - - mkl # [x86_64] + - mkl-static # [x86_64] c_compiler: - vs2017 # [win] cxx_compiler: diff --git a/conda/pytorch-nightly/meta.yaml b/conda/pytorch-nightly/meta.yaml index aa5319d6fa..37e7c959f3 100644 --- a/conda/pytorch-nightly/meta.yaml +++ b/conda/pytorch-nightly/meta.yaml @@ -21,9 +21,9 @@ requirements: - pyyaml {% if cross_compile_arm64 == 0 %} - mkl-include # [x86_64] - - mkl=2020.2 # [py <= 311 and x86_64 and not win] - - mkl=2023.1 # [py >= 312 and x86_64] - - mkl-devel=2023.1 # [x86_64 and win] + - mkl-static=2020.2 # [py <= 311 and x86_64 and not win] + - mkl-static=2023.1 # [py >= 312 and x86_64] + - mkl-static=2023.1 # [x86_64 and win] {% endif %} - typing_extensions - ninja @@ -39,8 +39,8 @@ requirements: run: - python {% if cross_compile_arm64 == 0 %} - - mkl >=2018 # [x86_64 and not win] - - mkl=2023.1 # [x86_64 and win] + - mkl-static >=2018 # [x86_64 and not win] + - mkl-static=2023.1 # [x86_64 and win] {% endif %} - libuv # [win] - intel-openmp # [win] @@ -54,7 +54,7 @@ requirements: - jinja2 - pyyaml {% if cross_compile_arm64 == 0 %} - - blas * mkl # [x86_64] + - blas * mkl-static # [x86_64] {% endif %} - pytorch-mutex 1.0 {{ build_variant }} # [not osx ] {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }} diff --git a/conda/vs2019/conda_build_config.yaml b/conda/vs2019/conda_build_config.yaml index 358052ec01..2ed6f38edc 100644 --- a/conda/vs2019/conda_build_config.yaml +++ b/conda/vs2019/conda_build_config.yaml @@ -1,5 +1,5 @@ blas_impl: - - mkl # [x86_64] + - mkl-static # [x86_64] c_compiler: - vs2019 # [win] cxx_compiler: diff --git a/conda/vs2022/conda_build_config.yaml b/conda/vs2022/conda_build_config.yaml index e2a4de3c2e..2b8058cb81 100644 --- a/conda/vs2022/conda_build_config.yaml +++ b/conda/vs2022/conda_build_config.yaml @@ -1,5 +1,5 @@ blas_impl: - - mkl # [x86_64] + - mkl-static # [x86_64] c_compiler: - vs2022 # [win] cxx_compiler: