facebookresearch/faiss
1
0
Fork 0
mirror of https://github.com/facebookresearch/faiss.git synced 2026-10-12 02:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Windows build (#2594)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebookresearch/faiss/pull/2594

Bumping `mkl` to 2021 and installing `mkl-devel` in the build environment to fix the Windows nightly build.

Reviewed By: mlomeli1

Differential Revision: D41534391

fbshipit-source-id: 7c681f530a1efe649cd176135a23ebb0fb44d70f
This commit is contained in:
Gergely Szilvasy
2022-11-25 11:58:33 -08:00
committed by Facebook GitHub Bot
parent 2647516421
commit d83600b164
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conda/faiss-gpu/meta.yaml
+3 -3
View File
@@ -39,12 +39,12 @@ outputs:
- llvm-openmp # [osx]
- cmake >=3.18
- make # [not win]
- mkl-devel =2021
host:
- mkl =2018
- mkl =2021
- cudatoolkit {{ cudatoolkit }}
run:
- mkl >=2018 # [not win]
- mkl >=2018,<2021 # [win]
- mkl >=2021
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
test:
requires:
conda/faiss/meta.yaml
+4 -5
View File
@@ -38,11 +38,11 @@ outputs:
- llvm-openmp # [osx]
- cmake >=3.17
- make # [not win]
- mkl-devel =2021
host:
- mkl =2018
- mkl =2021
run:
- mkl >=2018 # [not win]
- mkl >=2018,<2021 # [win]
- mkl >=2021 # [win]
test:
requires:
- conda-build
@@ -65,8 +65,7 @@ outputs:
- make # [not win]
host:
- python {{ python }}
- numpy =1.16 # [not win]
- numpy =1.11 # [win]
- numpy =1.16
- {{ pin_subpackage('libfaiss', exact=True) }}
run:
- python {{ python }}