Merge pull request #1463 from dantegd/fea-faiss-161

[REVIEW] Update FAISS to 1.6.1
rapidsai · Dec 12, 2019 · d8aca4c · d8aca4c
2 parents 35b077e + 667ff7d
commit d8aca4c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 ## Improvements
 - PR #1473: C++: lazy initialization of "costly" resources inside cumlHandle
 
+- PR #1463: Update FAISS submodule to 1.6.1
+
 ## Bug Fixes
 
 - PR #1470: Documentation: add make_regression, fix ARIMA section

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -282,7 +282,7 @@ add_dependencies(cutlass cub)
 
 ExternalProject_Add(faiss
   GIT_REPOSITORY    https://github.com/facebookresearch/faiss.git
-  GIT_TAG           656368b5eda4d376177a3355673d217fa95000b6
+  GIT_TAG           v1.6.1
   CONFIGURE_COMMAND LIBS=-pthread
                     CPPFLAGS=-w
                     LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib

diff --git a/cpp/src_prims/selection/knn.h b/cpp/src_prims/selection/knn.h
@@ -20,7 +20,7 @@
 
 #include "distance/distance.h"
 
-#include <faiss/Heap.h>
+#include <faiss/utils/Heap.h>
 #include <faiss/gpu/GpuDistance.h>
 #include <faiss/gpu/GpuIndexFlat.h>
 #include <faiss/gpu/GpuResources.h>