Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

switch mkl to mkl-static. #1914

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

switch mkl to mkl-static. #1914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
943437e
switch mkl to mkl-static.
xuhancn Jul 5, 2024
2e50539
Merge branch 'pytorch:main' into xu_switch_to_mkl_static
xuhancn Jul 9, 2024
d134b8e
update mkl-static version to 2024.2.0
xuhancn Jul 10, 2024
0e4c932
Merge branch 'pytorch:main' into xu_switch_to_mkl_static
xuhancn Jul 10, 2024
0e6f833
Delete mkl-static from yaml
xuhancn Jul 12, 2024
20a1c3e
Revert "Delete mkl-static from yaml"
xuhancn Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conda/debugging_pytorch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions conda/pytorch-nightly/meta.yaml
View file
Open in desktop
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=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
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