Skip to content

Commit f750815

Browse files
mdouzemeta-codesync[bot]
mdouze
authored and
meta-codesync[bot]
committed
Pin MKL to <2026 to avoid soname mismatch with pytorch (#5192)
Summary: Pull Request resolved: #5192 conda-forge added MKL 2026.0.0 which uses a new soname (libmkl_intel_lp64.so.3 instead of .so.2). The build env now resolves mkl-devel >=2024.2.2 to 2026.0.0, but the test env gets mkl 2025.3.1 because pytorch 2.10.0 is pinned to that version. This soname mismatch causes ImportError at test time. Adding <2026 upper bound forces both build and test envs to use MKL 2025.x, keeping sonames consistent until pytorch supports MKL 2026. 🤖 This diff was automatically generated by myclaw_faiss_monitor Reviewed By: mnorris11 Differential Revision: D104219406 fbshipit-source-id: e4d256eade13fe4e193a8ed8a48bbdb53616898e
1 parent bb2ce71 commit f750815

3 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎conda/faiss-gpu-cuvs/meta.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ outputs:
4949
- cmake >=3.30.4
5050
- make =4.2 # [not win]
5151
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
52-
- mkl >=2024.2.2 # [x86_64]
53-
- mkl-devel >=2024.2.2 # [x86_64]
52+
- mkl >=2024.2.2,<2026 # [x86_64]
53+
- mkl-devel >=2024.2.2,<2026 # [x86_64]
5454
- cuda-toolkit {{ cudatoolkit }}
5555
- cuda-cudart {{ cudart_constraints }}
5656
- cuda-cudart-dev {{ cudart_constraints }}
@@ -60,14 +60,14 @@ outputs:
6060
- cuda-cudart-static_linux-64 {{ cudart_constraints }} # [linux64]
6161
host:
6262
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
63-
- mkl >=2024.2.2 # [x86_64]
63+
- mkl >=2024.2.2,<2026 # [x86_64]
6464
- openblas =0.3.32 # [not x86_64]
6565
- libcuvs =26.02
6666
- cuda-version {{ cuda_constraints }}
6767
- libsvs-runtime =0.3.0 # [x86_64 and linux]
6868
run:
6969
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
70-
- mkl >=2024.2.2 # [x86_64]
70+
- mkl >=2024.2.2,<2026 # [x86_64]
7171
- openblas =0.3.32 # [not x86_64]
7272
- cuda-cudart {{ cuda_constraints }}
7373
- libcublas {{ libcublas_constraints }}
@@ -99,17 +99,17 @@ outputs:
9999
- cmake >=3.30.4
100100
- make =4.2 # [not win]
101101
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
102-
- mkl >=2024.2.2 # [x86_64]
102+
- mkl >=2024.2.2,<2026 # [x86_64]
103103
- cuda-toolkit {{ cudatoolkit }}
104104
host:
105-
- mkl >=2024.2.2 # [x86_64]
105+
- mkl >=2024.2.2,<2026 # [x86_64]
106106
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
107107
- python {{ python }}
108108
- numpy >=2.0,<2.3
109109
- setuptools
110110
- {{ pin_subpackage('libfaiss', exact=True) }}
111111
run:
112-
- mkl >=2024.2.2 # [x86_64]
112+
- mkl >=2024.2.2,<2026 # [x86_64]
113113
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64]
114114
- python {{ python }}
115115
- numpy >=2.0,<2.3

‎conda/faiss-gpu/meta.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ outputs:
5656
- cmake >=3.24.0
5757
- make =4.2 # [not win and not (osx and arm64)]
5858
- make =4.4 # [osx and arm64]
59-
- mkl-devel >=2024.2.2 # [x86_64]
59+
- mkl-devel >=2024.2.2,<2026 # [x86_64]
6060
- cuda-toolkit {{ cudatoolkit }}
6161
host:
62-
- mkl >=2024.2.2 # [x86_64]
62+
- mkl >=2024.2.2,<2026 # [x86_64]
6363
- openblas =0.3.32 # [not x86_64]
6464
- libsvs-runtime =0.3.0 # [x86_64 and linux]
6565
run:
66-
- mkl >=2024.2.2 # [x86_64]
66+
- mkl >=2024.2.2,<2026 # [x86_64]
6767
- openblas =0.3.32 # [not x86_64]
6868
- cuda-cudart {{ cuda_constraints }}
6969
- libcublas {{ libcublas_constraints }}
@@ -94,16 +94,16 @@ outputs:
9494
- make =4.4 # [osx and arm64]
9595
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64 and not win]
9696
- cuda-toolkit {{ cudatoolkit }}
97-
- mkl-devel >=2024.2.2 # [x86_64]
97+
- mkl-devel >=2024.2.2,<2026 # [x86_64]
9898
host:
99-
- mkl >=2024.2.2 # [x86_64]
99+
- mkl >=2024.2.2,<2026 # [x86_64]
100100
- python {{ python }}
101101
- numpy >=2.0,<3.0
102102
- setuptools
103103
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64 and not win]
104104
- {{ pin_subpackage('libfaiss', exact=True) }}
105105
run:
106-
- mkl >=2024.2.2 # [x86_64]
106+
- mkl >=2024.2.2,<2026 # [x86_64]
107107
- python {{ python }}
108108
- numpy >=2.0,<3.0
109109
- packaging

‎conda/faiss/meta.yaml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ outputs:
4545
- make =4.2 # [not win and not (osx and arm64)]
4646
- make =4.4 # [osx and arm64]
4747
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
48-
- mkl-devel >=2024.2.2 # [x86_64]
48+
- mkl-devel >=2024.2.2,<2026 # [x86_64]
4949
- python_abi <3.12
5050
{% elif PY_VER == '3.12' %}
51-
- mkl-devel >=2024.2.2 # [x86_64 and not win]
52-
- mkl-devel >=2024.2.2 # [x86_64 and win]
51+
- mkl-devel >=2024.2.2,<2026 # [x86_64 and not win]
52+
- mkl-devel >=2024.2.2,<2026 # [x86_64 and win]
5353
- python_abi =3.12
5454
{% else %}
55-
- mkl-devel >=2024.2.2 # [x86_64 and not win]
56-
- mkl-devel >=2024.2.2 # [x86_64 and win]
55+
- mkl-devel >=2024.2.2,<2026 # [x86_64 and not win]
56+
- mkl-devel >=2024.2.2,<2026 # [x86_64 and win]
5757
- python_abi
5858
{% endif %}
5959
- libopenblas =0.3.32 # [osx]
@@ -62,11 +62,11 @@ outputs:
6262
- libcxx =20.1.1 # [osx and arm64]
6363
- libsvs-runtime =0.3.0 # [x86_64 and linux]
6464
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
65-
- mkl >=2024.2.2 # [x86_64]
65+
- mkl >=2024.2.2,<2026 # [x86_64]
6666
- python_abi <3.12
6767
{% elif PY_VER == '3.12' %}
68-
- mkl >=2024.2.2 # [x86_64 and not win]
69-
- mkl >=2024.2.2 # [x86_64 and win]
68+
- mkl >=2024.2.2,<2026 # [x86_64 and not win]
69+
- mkl >=2024.2.2,<2026 # [x86_64 and win]
7070
- python_abi =3.12
7171
{% endif %}
7272
- openblas =0.3.32 # [not x86_64]
@@ -76,11 +76,11 @@ outputs:
7676
- libcxx =20.1.1 # [osx and arm64]
7777
- libsvs-runtime =0.3.0 # [x86_64 and linux]
7878
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
79-
- mkl >=2024.2.2 # [x86_64]
79+
- mkl >=2024.2.2,<2026 # [x86_64]
8080
- python_abi <3.12
8181
{% elif PY_VER == '3.12' %}
82-
- mkl >=2024.2.2 # [x86_64 and not win]
83-
- mkl >=2024.2.2 # [x86_64 and win]
82+
- mkl >=2024.2.2,<2026 # [x86_64 and not win]
83+
- mkl >=2024.2.2,<2026 # [x86_64 and win]
8484
- python_abi =3.12
8585
{% endif %}
8686
- openblas =0.3.32 # [not x86_64]
@@ -113,11 +113,11 @@ outputs:
113113
- make =4.4 # [osx and arm64]
114114
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64 and not win]
115115
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
116-
- mkl >=2024.2.2 # [x86_64]
116+
- mkl >=2024.2.2,<2026 # [x86_64]
117117
- python_abi <3.12
118118
{% elif PY_VER == '3.12' %}
119-
- mkl >=2024.2.2 # [x86_64 and not win]
120-
- mkl >=2024.2.2 # [x86_64 and win]
119+
- mkl >=2024.2.2,<2026 # [x86_64 and not win]
120+
- mkl >=2024.2.2,<2026 # [x86_64 and win]
121121
- python_abi =3.12
122122
{% endif %}
123123
- libopenblas =0.3.32 # [osx]
@@ -129,11 +129,11 @@ outputs:
129129
- libcxx =20.1.1 # [osx and arm64]
130130
- _openmp_mutex =4.5=2_kmp_llvm # [x86_64 and not win]
131131
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
132-
- mkl >=2024.2.2 # [x86_64]
132+
- mkl >=2024.2.2,<2026 # [x86_64]
133133
- python_abi <3.12
134134
{% elif PY_VER == '3.12' %}
135-
- mkl >=2024.2.2 # [x86_64 and not win]
136-
- mkl >=2024.2.2 # [x86_64 and win]
135+
- mkl >=2024.2.2,<2026 # [x86_64 and not win]
136+
- mkl >=2024.2.2,<2026 # [x86_64 and win]
137137
- python_abi =3.12
138138
{% endif %}
139139
- libopenblas =0.3.32 # [osx]
@@ -144,11 +144,11 @@ outputs:
144144
- {{ pin_subpackage('libfaiss', exact=True) }}
145145
- libcxx =20.1.1 # [osx and arm64]
146146
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
147-
- mkl >=2024.2.2 # [x86_64]
147+
- mkl >=2024.2.2,<2026 # [x86_64]
148148
- python_abi <3.12
149149
{% elif PY_VER == '3.12' %}
150-
- mkl >=2024.2.2 # [x86_64 and not win]
151-
- mkl >=2024.2.2 # [x86_64 and win]
150+
- mkl >=2024.2.2,<2026 # [x86_64 and not win]
151+
- mkl >=2024.2.2,<2026 # [x86_64 and win]
152152
- python_abi =3.12
153153
{% endif %}
154154
- libopenblas =0.3.32 # [osx]
@@ -159,11 +159,11 @@ outputs:
159159
- pytorch-cpu >=2.7 # [not win]
160160
- pytorch >=2.7 # [win]
161161
{% if PY_VER == '3.10' or PY_VER == '3.11' %}
162-
- mkl >=2024.2.2 # [x86_64]
162+
- mkl >=2024.2.2,<2026 # [x86_64]
163163
- python_abi <3.12
164164
{% elif PY_VER == '3.12' %}
165-
- mkl >=2024.2.2 # [x86_64 and not win]
166-
- mkl >=2024.2.2 # [x86_64 and win]
165+
- mkl >=2024.2.2,<2026 # [x86_64 and not win]
166+
- mkl >=2024.2.2,<2026 # [x86_64 and win]
167167
- python_abi =3.12
168168
{% endif %}
169169
commands:

0 commit comments

Comments
 (0)