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 conda recipes. (#1894)

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

Reviewed By: wickedfoo

Differential Revision: D28510244

Pulled By: beauby

fbshipit-source-id: 32983b7eeab497b8d576caaadd56e13a2134a4ab
This commit is contained in:
Lucas Hosseini
2021-05-18 09:10:54 -07:00
committed by Facebook GitHub Bot
parent 67a8070d7d
commit 77825c52bd
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conda/faiss-gpu/meta.yaml
+3 -5
View File
@@ -39,12 +39,10 @@ outputs:
- cmake >=3.18
- make # [not win]
host:
- mkl-devel >=2018
- blas =*=mkl
- mkl =2018
- cudatoolkit {{ cudatoolkit }}
run:
- mkl >=2018
- blas =*=mkl
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
test:
commands:
@@ -65,11 +63,11 @@ outputs:
- make # [not win]
host:
- python {{ python }}
- numpy 1.11.*
- numpy =1.11
- {{ pin_subpackage('libfaiss', exact=True) }}
run:
- python {{ python }}
- {{ pin_compatible('numpy') }}
- numpy >=1.11,<2
- {{ pin_subpackage('libfaiss', exact=True) }}
test:
requires:
conda/faiss/meta.yaml
+3 -7
View File
@@ -31,8 +31,6 @@ outputs:
string: "h{{ PKG_HASH }}_{{ number }}_cpu"
run_exports:
- {{ pin_compatible('libfaiss', exact=True) }}
ignore_run_exports:
- mkl # [osx]
requirements:
build:
- {{ compiler('cxx') }}
@@ -40,11 +38,9 @@ outputs:
- cmake >=3.17
- make # [not win]
host:
- mkl-devel >=2018
- blas =*=mkl
- mkl =2018
run:
- mkl >=2018
- blas =*=mkl
test:
commands:
- test -f $PREFIX/lib/libfaiss$SHLIB_EXT # [not win]
@@ -65,11 +61,11 @@ outputs:
- make # [not win]
host:
- python {{ python }}
- numpy 1.11.*
- numpy =1.11
- {{ pin_subpackage('libfaiss', exact=True) }}
run:
- python {{ python }}
- {{ pin_compatible('numpy') }}
- numpy >=1.11,<2
- {{ pin_subpackage('libfaiss', exact=True) }}
test:
requires: