Skip to content

Commit

Permalink
switch mkl to mkl-static.
Browse files Browse the repository at this point in the history
  • Loading branch information
xuhancn committed Jul 5, 2024
1 parent f6f456c commit 28f22cc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion conda/pytorch-nightly/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blas_impl:
- mkl # [x86_64]
- mkl-static # [x86_64]
c_compiler:
- vs2017 # [win]
cxx_compiler:
Expand Down
12 changes: 6 additions & 6 deletions conda/pytorch-nightly/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand All @@ -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', '') }}
Expand Down
2 changes: 1 addition & 1 deletion conda/vs2019/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blas_impl:
- mkl # [x86_64]
- mkl-static # [x86_64]
c_compiler:
- vs2019 # [win]
cxx_compiler:
Expand Down
2 changes: 1 addition & 1 deletion conda/vs2022/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blas_impl:
- mkl # [x86_64]
- mkl-static # [x86_64]
c_compiler:
- vs2022 # [win]
cxx_compiler:
Expand Down

0 comments on commit 28f22cc

Please sign in to comment.