Add faiss & openmp versions (#21909)

jbajic · dothebart · commit 22583ce3cea6 · 2025-08-15T17:07:51.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* Add faiss and openmp versions in --version output of arangod.
+
 * Fix BTS-2171: Reduce the amount of code executed on dedicated network threads,
   which might have reduced its throughput or delayed processing of other network
   responses.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1036,7 +1036,8 @@ if(STATIC_EXECUTABLES)
     set(BLAS_LIBRARIES "/usr/lib/aarch64-linux-gnu/libblas.a" CACHE PATH "BLAS static library path")
     set(OpenMP_gomp_LIBRARY "/usr/lib/gcc/aarch64-linux-gnu/13/libgomp.a")
   endif()
-  message("LAPACK: ${LAPACK_LIBRARIES} and BLAS: to ${BLAS_LIBRARIES}")
+  message(STATUS "LAPACK: ${LAPACK_LIBRARIES}")
+  message(STATUS "BLAS: ${BLAS_LIBRARIES}")
 
   # Setting this is necessary because we want to bind to gcc static library
   # since the LLVM OpenMP implementation fails in our CI
@@ -1046,18 +1047,21 @@ if(STATIC_EXECUTABLES)
   set(OpenMP_C_LIB_NAMES "gomp;pthread")
   set(OpenMP_CXX_LIB_NAMES "gomp;pthread")
   set(OpenMP_pthread_LIBRARY "pthread")
+  # This is hardcoded since we know exactly with which OpenMP version we want to build
+  add_definitions(-DARANGODB_OPENMP_VERSION="5.1")
 
-  # TODO avoid hard coded paths
-  set(FAISS_EXE_LINKER_FLAGS "-fopenmp=libgomp -L/opt/omp -llapack -lgfortran")
+  set(FAISS_EXE_LINKER_FLAGS "-fopenmp=libgomp -llapack -lgfortran")
+  message(STATUS "OpenMP version: " ${OpenMP_CXX_VERSION})
 else()
   set(BLA_STATIC Off)
   set(BLA_VENDOR OpenBLAS)
   find_package(OpenMP REQUIRED)
+  add_definitions(-DARANGODB_OPENMP_VERSION=${OpenMP_CXX_VERSION})
+
   find_package(LAPACK)
   find_package(BLAS)
 
   set(FAISS_EXE_LINKER_FLAGS "${OpenMP_CXX_FLAGS}")
-
   foreach(lapack_lib ${LAPACK_LIBRARIES})
     message(STATUS "Using LAPACK library: ${lapack_lib}")
     set(FAISS_EXE_LINKER_FLAGS "${FAISS_EXE_LINKER_FLAGS} ${lapack_lib}")
@@ -1078,6 +1082,9 @@ set(FAISS_ENABLE_RAFT OFF CACHE BOOL "Disable RAFT")
 
 add_subdirectory(3rdParty/faiss EXCLUDE_FROM_ALL)
 
+add_library(faiss_interface INTERFACE)
+target_include_directories(faiss_interface SYSTEM INTERFACE ${PROJECT_SOURCE_DIR}/3rdParty/faiss)
+
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_ORIG}")
 
 # ------------------------------------------------------------------------------
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -273,6 +273,7 @@ target_link_libraries(arango_basic_http_client
          fuerte
          rocksdb
          rocksdb_interface
+         faiss_interface
 )
 target_include_directories(arango_basic_http_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 if (USE_ENTERPRISE)
diff --git a/lib/Rest/Version.cpp b/lib/Rest/Version.cpp
@@ -25,12 +25,12 @@
 
 #include <cstdint>
 #include <sstream>
-#include <string_view>
 
 #include <openssl/ssl.h>
 
 #include <rocksdb/convenience.h>
 #include <rocksdb/version.h>
+#include <faiss/Index.h>
 
 #include <velocypack/Builder.h>
 #include <velocypack/Version.h>
@@ -308,6 +308,8 @@ void Version::initialize() {
 #else
   Values["libunwind"] = "false";
 #endif
+  Values["faiss"] = getFaissVersion();
+  Values["openmp"] = getOpenMPVersion();
 
   if constexpr (arangodb::build_id::supportsBuildIdReader()) {
     Values["build-id"] =
@@ -379,6 +381,19 @@ std::string Version::getBoostVersion() {
 #endif
 }
 
+std::string Version::getFaissVersion() {
+  return std::format("{}.{}.{}", FAISS_VERSION_MAJOR, FAISS_VERSION_MINOR,
+                     FAISS_VERSION_PATCH);
+}
+
+std::string Version::getOpenMPVersion() {
+#if defined(ARANGODB_OPENMP_VERSION)
+  return std::format("{}", ARANGODB_OPENMP_VERSION);
+#else
+  return {};
+#endif
+}
+
 // get boost reactor type
 std::string Version::getBoostReactorType() {
 #if defined(BOOST_ASIO_HAS_IOCP)
diff --git a/lib/Rest/Version.h b/lib/Rest/Version.h
@@ -143,6 +143,12 @@ class Version {
   // get endianness
   static std::string getEndianness();
 
+  // get Faiss version
+  static std::string getFaissVersion();
+
+  // get OpenMP version
+  static std::string getOpenMPVersion();
+
   // get plaform
   static std::string getPlatform();
 

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,7 @@ target_link_libraries(arango_basic_http_client`
`273`	`273`	`fuerte`
`274`	`274`	`rocksdb`
`275`	`275`	`rocksdb_interface`
	`276`	`+ faiss_interface`
`276`	`277`	`)`
`277`	`278`	`target_include_directories(arango_basic_http_client PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})`
`278`	`279`	`if (USE_ENTERPRISE)`