mirrors/faiss
1
0
Fork 0
mirror of https://github.com/facebookresearch/faiss.git synced 2025-06-03 21:54:02 +08:00
Code Issues Projects Releases Wiki Activity

pin mkl to 2023 (#2856)

Browse Source 
Summary:
This fixes the build, except for MacOS, where there's a problem with cmake + OpenMP. We can fix it separately.

Pull Request resolved: https://github.com/facebookresearch/faiss/pull/2856

Reviewed By: mlomeli1

Differential Revision: D45704458

Pulled By: algoriddle

fbshipit-source-id: 0c09036ae5fa34ab114b857f407a35603986613a
This commit is contained in:
Gergely Szilvasy 2023-05-09 12:20:54 -07:00 committed by Facebook GitHub Bot
parent 81f27099ec
commit eea4a48b97
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -176,7 +176,7 @@ jobs:
name: Set up environment name: Set up environment
command: | command: |
conda update -y -q conda conda update -y -q conda
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 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
- run: - run:
name: Build all targets name: Build all targets
no_output_timeout: 30m no_output_timeout: 30m

6
conda/faiss-gpu/meta.yaml
View File

@ -40,12 +40,12 @@ outputs:
- llvm-openmp # [osx] - llvm-openmp # [osx]
- cmake =3.23.1 - cmake =3.23.1
- make # [not win] - make # [not win]
- mkl-devel =2021 - mkl-devel =2023
host: host:
- mkl =2021 - mkl =2023
- cudatoolkit {{ cudatoolkit }} - cudatoolkit {{ cudatoolkit }}
run: run:
- mkl >=2021 - mkl =2023
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }} - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
test: test:
requires: requires:

10
conda/faiss/meta.yaml
View File

@ -37,15 +37,15 @@ outputs:
build: build:
- {{ compiler('cxx') }} - {{ compiler('cxx') }}
- sysroot_linux-64 =2.17 # [linux64] - sysroot_linux-64 =2.17 # [linux64]
- llvm-openmp # [osx]
- cmake =3.23.1 - cmake =3.23.1
- make # [not win] - make # [not win]
- mkl-devel =2021 # [x86_64] - mkl-devel =2023 # [x86_64]
- openblas # [not x86_64]
host: host:
- mkl =2021 # [x86_64] - mkl =2023 # [x86_64]
- openblas # [not x86_64]
run: run:
- mkl >=2021 # [win] - mkl =2023 # [x86_64]
- openblas # [not x86_64]
test: test:
requires: requires:
- conda-build - conda-build