Merge pull request #30 from kyamagu/v1.6.5

Update faiss to v1.6.5
kyamagu · Nov 26, 2020 · 17caa13 · 17caa13
2 parents 5a97b0f + 5100042
commit 17caa13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -230,7 +230,7 @@ jobs:
       run: |
         echo "FAISS_OPT_LEVEL=${{ matrix.opt }}" >> ${env:GITHUB_ENV}
         echo "FAISS_LIBRARY_SUFFIX=_${{ matrix.opt }}" >> ${env:GITHUB_ENV}
-    - uses: conda-incubator/setup-miniconda@v1
+    - uses: conda-incubator/setup-miniconda@v2
       with:
         auto-update-conda: true
         python-version: ${{ matrix.python-version }}

diff --git a/faiss b/faiss
diff --git a/setup.py b/setup.py
@@ -5,6 +5,7 @@
 import os
 
 NAME = 'faiss-cpu'
+VERSION = '1.6.5'
 
 LONG_DESCRIPTION = """
 Faiss is a library for efficient similarity search and clustering of dense
@@ -18,7 +19,7 @@
 FAISS_ROOT = os.getenv('FAISS_ROOT', 'faiss')
 FAISS_INCLUDE = os.getenv('FAISS_INCLUDE', os.path.join('/usr/local/include'))
 FAISS_LDFLAGS = os.getenv('FAISS_LDFLAGS')
-FAISS_OPT_LEVEL = os.getenv('FAISS_OPT_LEVEL', 'sse4')
+FAISS_OPT_LEVEL = os.getenv('FAISS_OPT_LEVEL', 'generic')
 FAISS_ENABLE_GPU = (
     os.getenv('FAISS_ENABLE_GPU', '').lower() in ('on', 'true')
 )
@@ -134,6 +135,7 @@ def __str__(self):
 
 
 class CustomBuildPy(build_py):
+    """Run build_ext before build_py to compile swig code."""
     def run(self):
         self.run_command("build_ext")
         return build_py.run(self)
@@ -159,7 +161,7 @@ def run(self):
 
 setup(
     name=NAME,
-    version='1.6.4.post2',
+    version=VERSION,
     description=(
         'A library for efficient similarity search and clustering of dense '
         'vectors.'