Skip to content

Commit 943437e

Browse files
committed
switch mkl to mkl-static.
1 parent f6f456c commit 943437e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

conda/debugging_pytorch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export USE_CUDA_STATIC_LINK=1
1414
. ./switch_cuda_version.sh 9.0
1515

1616

17-
conda install -y cmake numpy=1.17 setuptools pyyaml mkl=2018 mkl-include typing_extension ninja magma-cuda80 -c pytorch
17+
conda install -y cmake numpy=1.17 setuptools pyyaml mkl-static=2018 mkl-include typing_extension ninja magma-cuda80 -c pytorch
1818

1919
export CMAKE_PREFIX_PATH="$(dirname $(which conda))/../"
2020
git clone https://github.com/pytorch/pytorch -b nightly2 --recursive

conda/pytorch-nightly/meta.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ requirements:
2121
- pyyaml
2222
{% if cross_compile_arm64 == 0 %}
2323
- mkl-include # [x86_64]
24-
- mkl=2020.2 # [py <= 311 and x86_64 and not win]
25-
- mkl=2023.1 # [py >= 312 and x86_64]
26-
- mkl-devel=2023.1 # [x86_64 and win]
24+
- mkl-static=2020.2 # [py <= 311 and x86_64 and not win]
25+
- mkl-static=2023.1 # [py >= 312 and x86_64]
26+
- mkl-static=2023.1 # [x86_64 and win]
2727
{% endif %}
2828
- typing_extensions
2929
- ninja
@@ -39,8 +39,8 @@ requirements:
3939
run:
4040
- python
4141
{% if cross_compile_arm64 == 0 %}
42-
- mkl >=2018 # [x86_64 and not win]
43-
- mkl=2023.1 # [x86_64 and win]
42+
- mkl-static >=2018 # [x86_64 and not win]
43+
- mkl-static=2023.1 # [x86_64 and win]
4444
{% endif %}
4545
- libuv # [win]
4646
- intel-openmp # [win]
@@ -54,7 +54,7 @@ requirements:
5454
- jinja2
5555
- pyyaml
5656
{% if cross_compile_arm64 == 0 %}
57-
- blas * mkl # [x86_64]
57+
- blas * mkl-static # [x86_64]
5858
{% endif %}
5959
- pytorch-mutex 1.0 {{ build_variant }} # [not osx ]
6060
{{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT', '') }}

0 commit comments

Comments
 (0)