Merge branch 'main' into export-D46385243

facebookresearch · Jun 8, 2023 · 5a08dc9 · 5a08dc9
2 parents d03994c + f82298f
commit 5a08dc9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,11 +44,7 @@ project(faiss
   LANGUAGES ${FAISS_LANGUAGES})
 include(GNUInstallDirs)
 
-if(FAISS_ENABLE_RAFT)
 set(CMAKE_CXX_STANDARD 17)
-else()
-set(CMAKE_CXX_STANDARD 11)
-endif()
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 

diff --git a/faiss/AutoTune.h b/faiss/AutoTune.h
@@ -11,7 +11,6 @@
 #define FAISS_AUTO_TUNE_H
 
 #include <stdint.h>
-#include <unordered_map>
 #include <vector>
 
 #include <faiss/Index.h>

diff --git a/faiss/python/CMakeLists.txt b/faiss/python/CMakeLists.txt
@@ -11,7 +11,7 @@ project(pyfaiss
   HOMEPAGE_URL "https://github.com/facebookresearch/faiss"
   LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 
 find_package(SWIG REQUIRED COMPONENTS python)
 include(${SWIG_USE_FILE})