From 18daf608329e71682679b03cf39b59e5873d3d31 Mon Sep 17 00:00:00 2001 From: Ailing Date: Wed, 4 Apr 2018 14:00:39 -0700 Subject: [PATCH 1/2] update build_faiss with more cuda version support --- conda/build_faiss.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/conda/build_faiss.sh b/conda/build_faiss.sh index c0a82a9a6..f4e61ebd9 100755 --- a/conda/build_faiss.sh +++ b/conda/build_faiss.sh @@ -27,11 +27,23 @@ if [[ "$OSTYPE" == "darwin"* ]]; then time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-cpu time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-cpu else - . ./switch_cuda_version.sh 8.0 + export CUDA_VERSION="0.0" + export CUDNN_VERSION="0.0" time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-cpu time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-cpu time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-cpu + . ./switch_cuda_version.sh 8.0 + time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-gpu + time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-gpu + time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-gpu + + . ./switch_cuda_version.sh 9.0 + time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-gpu + time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-gpu + time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-gpu + + . ./switch_cuda_version.sh 9.1 time conda build -c $ANACONDA_USER --no-anaconda-upload --python 2.7 faiss-gpu time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.5 faiss-gpu time conda build -c $ANACONDA_USER --no-anaconda-upload --python 3.6 faiss-gpu From d323c59a5cd1ea4f5fd410c18d2c21ff9783f958 Mon Sep 17 00:00:00 2001 From: Ailing Date: Wed, 4 Apr 2018 14:51:45 -0700 Subject: [PATCH 2/2] Update meta.yaml delete cudatoolkit in faiss-gpu --- conda/faiss-gpu/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml index 11fa6ea67..b65638bfc 100644 --- a/conda/faiss-gpu/meta.yaml +++ b/conda/faiss-gpu/meta.yaml @@ -18,7 +18,6 @@ requirements: - python - numpy >=1.11 - mkl - - cudatoolkit build: number: {{ environ.get('FAISS_BUILD_NUMBER') }} @@ -38,4 +37,4 @@ about: license: BSD 3-Clause license_family: BSD license_file: LICENSE - summary: A library for efficient similarity search and clustering of dense vectors. \ No newline at end of file + summary: A library for efficient similarity search and clustering of dense vectors.