diff --git a/conda/debugging_pytorch.sh b/conda/debugging_pytorch.sh index 4cce4f225..bf1a2edc0 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/meta.yaml b/conda/pytorch-nightly/meta.yaml index aa5319d6f..b6b3db269 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=2024.2.0 # [py <= 311 and x86_64 and not win] + - mkl-static=2024.2.0 # [py >= 312 and x86_64] + - mkl-static=2024.2.0 # [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', '') }}