Skip to content

Commit eea4a48

Browse files
algoriddlefacebook-github-bot
authored andcommitted
pin mkl to 2023 (facebookresearch#2856)
Summary: This fixes the build, except for MacOS, where there's a problem with cmake + OpenMP. We can fix it separately. Pull Request resolved: facebookresearch#2856 Reviewed By: mlomeli1 Differential Revision: D45704458 Pulled By: algoriddle fbshipit-source-id: 0c09036ae5fa34ab114b857f407a35603986613a
1 parent 81f2709 commit eea4a48

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
name: Set up environment
177177
command: |
178178
conda update -y -q conda
179-
conda install -y -q cmake=3.23.1 make swig mkl=2021 mkl-devel=2021 numpy scipy pytest gxx_linux-64 sysroot_linux-64=2.17 -c pkgs/main -c conda-forge
179+
conda install -y -q cmake=3.23.1 make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64=2.17 -c pkgs/main -c conda-forge
180180
- run:
181181
name: Build all targets
182182
no_output_timeout: 30m

conda/faiss-gpu/meta.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ outputs:
4040
- llvm-openmp # [osx]
4141
- cmake =3.23.1
4242
- make # [not win]
43-
- mkl-devel =2021
43+
- mkl-devel =2023
4444
host:
45-
- mkl =2021
45+
- mkl =2023
4646
- cudatoolkit {{ cudatoolkit }}
4747
run:
48-
- mkl >=2021
48+
- mkl =2023
4949
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
5050
test:
5151
requires:

conda/faiss/meta.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ outputs:
3737
build:
3838
- {{ compiler('cxx') }}
3939
- sysroot_linux-64 =2.17 # [linux64]
40-
- llvm-openmp # [osx]
4140
- cmake =3.23.1
4241
- make # [not win]
43-
- mkl-devel =2021 # [x86_64]
44-
- openblas # [not x86_64]
42+
- mkl-devel =2023 # [x86_64]
4543
host:
46-
- mkl =2021 # [x86_64]
44+
- mkl =2023 # [x86_64]
45+
- openblas # [not x86_64]
4746
run:
48-
- mkl >=2021 # [win]
47+
- mkl =2023 # [x86_64]
48+
- openblas # [not x86_64]
4949
test:
5050
requires:
5151
- conda-build

0 commit comments

Comments
 (0)