Improve VSAG's compatibility with macOS

Signed-off-by: stuBirdFly <[email protected]>

Author: stuBirdFly

CMakeLists.txt

@@ -73,24 +73,28 @@ option (DISABLE_NEON_FORCE "Force disable neon instructions" OFF)
 option (DISABLE_SVE_FORCE "Force disable sve instructions" OFF)
 # AIO library configuration
 option (ENABLE_LIBAIO "Whether to enable libaio support" ON)
+if (NOT APPLE)
+    if (ENABLE_CXX11_ABI)
+        add_definitions (-D_GLIBCXX_USE_CXX11_ABI=1)
+        message (STATUS "Using libstdc++ with ${Yellow}C++11 ABI${CR}")
+    else ()
+        add_definitions (-D_GLIBCXX_USE_CXX11_ABI=0)
+        message (STATUS "Using libstdc++ with ${Yellow}pre-C++11 ABI${CR}")
 
-if (ENABLE_CXX11_ABI)
-    add_definitions (-D_GLIBCXX_USE_CXX11_ABI=1)
-    message (STATUS "Using libstdc++ with ${Yellow}C++11 ABI${CR}")
-else ()
-    add_definitions (-D_GLIBCXX_USE_CXX11_ABI=0)
-    message (STATUS "Using libstdc++ with ${Yellow}pre-C++11 ABI${CR}")
-
-    # for avoiding symbol conflict: _Rep::_S_create
-    vsag_add_shared_linker_flag(-fvisibility-inlines-hidden)
+        # for avoiding symbol conflict: _Rep::_S_create
+        vsag_add_shared_linker_flag(-fvisibility-inlines-hidden)
+    endif ()
 endif ()
 
 if (ENABLE_WERROR)
     add_compile_options (-Werror)
 endif ()
 
-vsag_add_exe_linker_flag (-static-libstdc++)
-vsag_add_shared_linker_flag (-static-libstdc++)
+# On Apple platforms, use the system's libc++ instead of static linking libstdc++
+if (NOT APPLE)
+    vsag_add_exe_linker_flag (-static-libstdc++)
+    vsag_add_shared_linker_flag (-static-libstdc++)
+endif ()
 vsag_add_shared_linker_flag (-fvisibility=hidden)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -107,25 +111,30 @@ else ()
     endif ()
 endif ()
 
-if (ENABLE_LIBCXX)
+if (ENABLE_LIBCXX OR APPLE)
     message (STATUS "Using libc++ with C++11 ABI")
-
-    set (LIBCXX_SEARCH_PATH /opt/alibaba-cloud-compiler/lib64)
-    find_library (LIBCXX_STATIC libc++.a PATHS ${LIBCXX_SEARCH_PATH})
-    find_library (LIBCXXABI_STATIC libc++abi.a PATHS ${LIBCXX_SEARCH_PATH})
-    if (LIBCXX_STATIC AND LIBCXXABI_STATIC)
-        get_filename_component (LIBCXX_DIR "${LIBCXX_STATIC}" DIRECTORY)
-        message (STATUS "Found libc++ at ${LIBCXX_STATIC}")
-        message (STATUS "Found libc++abi at ${LIBCXXABI_STATIC}")
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-
-        vsag_add_shared_linker_flag ("-fuse-ld=lld")
-        vsag_add_shared_linker_flag ("-Wl,-rpath,${LIBCXX_DIR}")
-        vsag_add_exe_linker_flag ("-fuse-ld=lld")
-        vsag_add_exe_linker_flag ("-Wl,-rpath,${LIBCXX_DIR}")
-        set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} ${LIBCXX_STATIC} ${LIBCXXABI_STATIC}")
-    else ()
-        message (FATAL_ERROR "libc++ or libc++abi not found")
+    if (APPLE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
+    else()
+        set (LIBCXX_SEARCH_PATH /opt/alibaba-cloud-compiler/lib64)
+        find_library (LIBCXX_STATIC libc++.a PATHS ${LIBCXX_SEARCH_PATH})
+        find_library (LIBCXXABI_STATIC libc++abi.a PATHS ${LIBCXX_SEARCH_PATH})
+        if (LIBCXX_STATIC AND LIBCXXABI_STATIC)
+            get_filename_component (LIBCXX_DIR "${LIBCXX_STATIC}" DIRECTORY)
+            message (STATUS "Found libc++ at ${LIBCXX_STATIC}")
+            message (STATUS "Found libc++abi at ${LIBCXXABI_STATIC}")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+
+            vsag_add_shared_linker_flag ("-fuse-ld=lld")
+            vsag_add_shared_linker_flag ("-Wl,-rpath,${LIBCXX_DIR}")
+            vsag_add_exe_linker_flag ("-fuse-ld=lld")
+            vsag_add_exe_linker_flag ("-Wl,-rpath,${LIBCXX_DIR}")
+            set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} ${LIBCXX_STATIC} ${LIBCXXABI_STATIC}")
+        else ()
+            message (FATAL_ERROR "libc++ or libc++abi not found")
+        endif ()
     endif ()
 else ()
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -202,17 +211,17 @@ set (common_cmake_args
         "-DCMAKE_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include"
         "-DCMAKE_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:/opt/alibaba-cloud-compiler/lib64"
 )
-
-set (common_configure_envs
-        "env"
-        "CC=${CMAKE_C_COMPILER}"
-        "CXX=${CMAKE_CXX_COMPILER}"
-        "CFLAGS=${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE -gdwarf-4"
-        "CXXFLAGS=${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE -gdwarf-4"
-        "CPPFLAGS=-isystem ${CMAKE_INSTALL_PREFIX}/include"
-        "LDFLAGS=-Wl,-rpath=\\\\$\\$ORIGIN ${ld_flags}"
-        "PATH=${BUILDING_PATH}:$ENV{PATH}"
-        "ACLOCAL_PATH=${ACLOCAL_PATH}"
+include (cmake/DarwinDep.cmake)
+set(common_configure_envs
+    "env"
+    "CC=${CMAKE_C_COMPILER}"
+    "CXX=${CMAKE_CXX_COMPILER}"
+    "CFLAGS=${CMAKE_C_FLAGS} -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE -gdwarf-4"
+    "CXXFLAGS=${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fPIC -O2 -D_DEFAULT_SOURCE -D_GNU_SOURCE -gdwarf-4"
+    "CPPFLAGS=-isystem ${CMAKE_INSTALL_PREFIX}/include"
+    "LDFLAGS=${ld_flags_workaround} ${ld_flags}"  # Use the workaround for LDFLAGS
+    "PATH=${BUILDING_PATH}:$ENV{PATH}"
+    "ACLOCAL_PATH=${ACLOCAL_PATH}"
 )
 
 # set the default compilation parallelism of thirdparties
@@ -319,7 +328,9 @@ endif ()
 
 # sources
 add_subdirectory (src)
-add_subdirectory (mockimpl)
+if (NOT APPLE)
+    add_subdirectory (mockimpl)
+endif ()
 if (ENABLE_EXAMPLES)
     add_subdirectory (examples/cpp)
 endif ()
@@ -353,7 +364,9 @@ if (ENABLE_PYBINDS)
     pybind11_add_module (_pyvsag python_bindings/binding.cpp)
     target_compile_options (_pyvsag PRIVATE -fopenmp)
     target_link_libraries (_pyvsag PRIVATE pybind11::module vsag)
-    target_link_options(_pyvsag PRIVATE -static-libstdc++ -static-libgcc)
+    if (NOT APPLE)
+        target_link_options(_pyvsag PRIVATE -static-libstdc++ -static-libgcc)
+    endif ()
 
     message(STATUS "Building _pyvsag for Python ${Python3_VERSION}")
     message(STATUS "Expected output: _pyvsag${Python3_SOABI}${CMAKE_SHARED_MODULE_SUFFIX}")

Makefile

@@ -19,6 +19,11 @@ ifdef EXTRA_DEFINED
 endif
 VSAG_CMAKE_ARGS := ${VSAG_CMAKE_ARGS} -G ${CMAKE_GENERATOR} -S.
 
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+  VSAG_CMAKE_ARGS := ${VSAG_CMAKE_ARGS} -DENABLE_LIBCXX=ON -DENABLE_WERROR=OFF -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
+endif
+
 UT_FILTER = ""
 ifdef CASE
   UT_FILTER = $(CASE)

cmake/DarwinDep.cmake

@@ -0,0 +1,85 @@
+
+# Copyright 2025-present the vsag project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if(APPLE)
+    set(ld_flags_workaround "-Wl,-rpath,@loader_path")
+    # Find OpenMP - will locate libomp on macOS
+    find_package(OpenMP REQUIRED)
+    if (OpenMP_CXX_FOUND)
+        message(STATUS "Found OpenMP: ${OpenMP_CXX_INCLUDE_DIRS}")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+    endif()
+    
+    # Find LAPACK - will automatically use Accelerate framework on macOS
+    find_package(LAPACK)
+    if (LAPACK_FOUND)
+        message(STATUS "Found LAPACK (using Accelerate framework on macOS)")
+        # LAPACK libraries are in LAPACK_LIBRARIES variable
+    else()
+        message(WARNING "LAPACK not found")
+    endif()
+
+    # Find gfortran and its library path for OpenBLAS
+    find_program(GFORTRAN_EXECUTABLE NAMES gfortran)
+    if(GFORTRAN_EXECUTABLE)
+        execute_process(
+            COMMAND ${GFORTRAN_EXECUTABLE} -print-file-name=libgfortran.dylib
+            OUTPUT_VARIABLE GFORTRAN_LIB
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        if(EXISTS "${GFORTRAN_LIB}" AND NOT IS_DIRECTORY "${GFORTRAN_LIB}")
+            get_filename_component(GFORTRAN_LIB_DIR "${GFORTRAN_LIB}" DIRECTORY)
+            list(APPEND CMAKE_INSTALL_RPATH "${GFORTRAN_LIB_DIR}")
+        else()
+            unset(GFORTRAN_LIB)
+            message(WARNING "gfortran found but libgfortran.dylib not found via -print-file-name; OpenBLAS link may fail")
+        endif()
+    else()
+        message(WARNING "gfortran not found; OpenBLAS/LAPACKE features may not link on macOS")
+    endif()
+
+    # Fixup: some scripts (e.g. OpenBLAS fallback) set BLAS_LIBRARIES/LAPACK_LIBRARIES to include
+    # a bare `gfortran` token (expands to -lgfortran). On macOS libgfortran is often not in the
+    # default linker search paths, causing: `ld: library 'gfortran' not found`.
+    function(vsag_darwin_fixup_blas_lapack_libs)
+        if (NOT APPLE)
+            return()
+        endif()
+        if (NOT DEFINED GFORTRAN_LIB OR NOT EXISTS "${GFORTRAN_LIB}")
+            return()
+        endif()
+
+        foreach(_var BLAS_LIBRARIES LAPACK_LIBRARIES)
+            if(DEFINED ${_var})
+                set(_new_list "")
+                foreach(_item IN LISTS ${_var})
+                    if(_item STREQUAL "gfortran")
+                        list(APPEND _new_list "${GFORTRAN_LIB}")
+                    else()
+                        list(APPEND _new_list "${_item}")
+                    endif()
+                endforeach()
+                # Keep cache in sync so downstream includes/targets see the rewritten list.
+                set(${_var} "${_new_list}" CACHE STRING "" FORCE)
+            endif()
+        endforeach()
+    endfunction()
+
+    # Run after the whole top-level configure has defined BLAS/LAPACK variables (order independent).
+    cmake_language(DEFER CALL vsag_darwin_fixup_blas_lapack_libs)
+else()
+    set(ld_flags_workaround "-Wl,-rpath=\\$\\$ORIGIN")
+endif()

examples/cpp/102_index_diskann.cpp

@@ -121,7 +121,7 @@ main(int argc, char** argv) {
     }
 
     /******************* Serialize and Clean Index *****************/
-    std::unordered_map<std::string, size_t> meta_info;
+    std::unordered_map<std::string, uint64_t> meta_info;
     {
         if (auto bs = index->Serialize(); bs.has_value()) {
             index = nullptr;

examples/cpp/107_index_pyramid.cpp

@@ -49,7 +49,7 @@ create_random_string(bool is_full) {
     }
 
     std::string random_string = selected_levels.empty() ? "" : selected_levels[0];
-    for (size_t i = 1; i < selected_levels.size(); ++i) {
+    for (uint64_t i = 1; i < selected_levels.size(); ++i) {
         random_string += "/" + selected_levels[i];
     }
 

examples/cpp/201_custom_allocator.cpp

@@ -26,7 +26,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
     void*
-    Allocate(size_t size) override {
+    Allocate(uint64_t size) override {
         vsag::Options::Instance().logger()->Debug("allocate " + std::to_string(size) + " bytes.");
         auto addr = (void*)malloc(size);
         sizes_[addr] = size;
@@ -44,7 +44,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
     void*
-    Reallocate(void* p, size_t size) override {
+    Reallocate(void* p, uint64_t size) override {
         vsag::Options::Instance().logger()->Debug("reallocate " + std::to_string(size) + " bytes.");
         auto addr = (void*)realloc(p, size);
         sizes_.erase(p);
@@ -53,7 +53,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
 private:
-    std::unordered_map<void*, size_t> sizes_;
+    std::unordered_map<void*, uint64_t> sizes_;
 };
 
 int

examples/cpp/313_feature_search_allocator.cpp

@@ -28,7 +28,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
     void*
-    Allocate(size_t size) override {
+    Allocate(uint64_t size) override {
         vsag::Options::Instance().logger()->Debug("allocate " + std::to_string(size) + " bytes.");
         auto addr = (void*)malloc(size);
         sizes_[addr] = size;
@@ -46,7 +46,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
     void*
-    Reallocate(void* p, size_t size) override {
+    Reallocate(void* p, uint64_t size) override {
         vsag::Options::Instance().logger()->Debug("reallocate " + std::to_string(size) + " bytes.");
         auto addr = (void*)realloc(p, size);
         sizes_.erase(p);
@@ -55,7 +55,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
 private:
-    std::unordered_map<void*, size_t> sizes_;
+    std::unordered_map<void*, uint64_t> sizes_;
 };
 
 int

examples/cpp/314_feature_hgraph_search_allocator.cpp

@@ -28,7 +28,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
     void*
-    Allocate(size_t size) override {
+    Allocate(uint64_t size) override {
         vsag::Options::Instance().logger()->Debug("allocate " + std::to_string(size) + " bytes.");
         auto addr = (void*)malloc(size);
         sizes_[addr] = size;
@@ -46,7 +46,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
     void*
-    Reallocate(void* p, size_t size) override {
+    Reallocate(void* p, uint64_t size) override {
         vsag::Options::Instance().logger()->Debug("reallocate " + std::to_string(size) + " bytes.");
         auto addr = (void*)realloc(p, size);
         sizes_.erase(p);
@@ -55,7 +55,7 @@ class ExampleAllocator : public vsag::Allocator {
     }
 
 private:
-    std::unordered_map<void*, size_t> sizes_;
+    std::unordered_map<void*, uint64_t> sizes_;
 };
 
 int

extern/antlr4/antlr4.cmake

@@ -42,7 +42,9 @@ ExternalProject_Add(
 
 include_directories(${install_dir}/include/antlr4-runtime)
 link_directories(${install_dir}/lib)
-link_directories(${install_dir}/lib64)
+if (NOT APPLE)
+    link_directories(${install_dir}/lib64)
+endif()
 
 include_directories(extern/antlr4/fc)
 file(GLOB ANTLR4_GEN_SRC "extern/antlr4/fc/*.cpp")

extern/boost/boost.cmake

@@ -5,6 +5,11 @@ cmake_policy(SET CMP0114 NEW)
 set(name boost)
 set(source_dir ${CMAKE_CURRENT_BINARY_DIR}/${name}/source)
 set(install_dir ${CMAKE_CURRENT_BINARY_DIR}/${name}/install)
+if(APPLE)
+    set(BOOST_TOOLSET "clang")
+else()
+    set(BOOST_TOOLSET "gcc")
+endif()
 get_filename_component(compiler_path ${CMAKE_CXX_COMPILER} DIRECTORY)
 ExternalProject_Add(
     ${name}
@@ -39,6 +44,7 @@ ExternalProject_Add(
             runtime-link=static
             link=static
             variant=release
+            toolset=${BOOST_TOOLSET}
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND ""
     LOG_CONFIGURE TRUE