[CPPRuntime] Fix C++ Runtime Clang compilation errors

.clang-format

@@ -29,4 +29,5 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 PointerAlignment: Left
 ReferenceAlignment: Left
 ReflowComments: true
+NamespaceMacros: ['SVS_DECLARE_NAMESPACE_VERSION']
 ---

.github/scripts/build-cpp-runtime-bindings.sh

@@ -48,7 +48,12 @@ if [ -n "$SVS_URL" ]; then
 fi
 
 # Build and install runtime bindings library (from bindings/cpp)
-CC=gcc CXX=g++ cmake .. "${CMAKE_ARGS[@]}"
+if [ -n "$CC" ]; then
+    echo "Using CC=${CC} and CXX=${CXX} for building cpp runtime bindings"
+else
+    echo "Using default compiler for building cpp runtime bindings"
+fi
+CC=${CC:-gcc} CXX=${CXX:-g++} cmake .. "${CMAKE_ARGS[@]}"
 cmake --build . -j
 cmake --install .
 

.github/workflows/build-cpp-runtime-bindings.yml

@@ -39,9 +39,18 @@ jobs:
           - name: "with static library"
             enable_lvq_leanvec: "ON"
             suffix: ""
+            cc: "gcc"
+            cxx: "g++"
           - name: "public only"
             enable_lvq_leanvec: "OFF"
             suffix: "-public-only"
+            cc: "gcc"
+            cxx: "g++"
+          - name: public only with Clang
+            enable_lvq_leanvec: "OFF"
+            suffix: "-public-only-clang"
+            cc: "clang"
+            cxx: "clang++"
       fail-fast: false
 
     steps:
@@ -58,6 +67,8 @@ jobs:
             -w /workspace \
             -e ENABLE_LVQ_LEANVEC=${{ matrix.enable_lvq_leanvec }} \
             -e SUFFIX=${{ matrix.suffix }} \
+            -e CC=${{ matrix.cc }} \
+            -e CXX=${{ matrix.cxx }} \
             svs-manylinux228:latest \
             /bin/bash .github/scripts/build-cpp-runtime-bindings.sh
 

bindings/cpp/CMakeLists.txt

@@ -82,6 +82,25 @@ target_compile_options(${TARGET_NAME} PRIVATE
     -fvisibility=hidden
 )
 
+# Add extra warnings for GCC/Clang if supported
+include(CheckCXXCompilerFlag)
+
+check_cxx_compiler_flag(
+    "-Winline-namespace-reopened-noninline"
+    SVS_RUNTIME_HAS_WINLINE_NAMESPACE_REOPENED_NONINLINE
+)
+if(SVS_RUNTIME_HAS_WINLINE_NAMESPACE_REOPENED_NONINLINE)
+    target_compile_options(${TARGET_NAME} PRIVATE -Winline-namespace-reopened-noninline)
+endif()
+
+check_cxx_compiler_flag(
+    "-Wunused-exception-parameter"
+    SVS_RUNTIME_HAS_WUNUSED_EXCEPTION_PARAMETER
+)
+if(SVS_RUNTIME_HAS_WUNUSED_EXCEPTION_PARAMETER)
+    target_compile_options(${TARGET_NAME} PRIVATE -Wunused-exception-parameter)
+endif()
+
 if(UNIX AND NOT APPLE)
     # Don't export 3rd-party symbols from the lib
     target_link_options(${TARGET_NAME} PRIVATE "SHELL:-Wl,--exclude-libs,ALL")

bindings/cpp/include/svs/runtime/api_defs.h

@@ -32,8 +32,7 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 class OptionalBool {
     enum class Value : int8_t { Undef = -1, True = 1, False = 0 };
     Value value_;
@@ -206,7 +205,6 @@ struct SVS_RUNTIME_API_INTERFACE ResultsAllocator {
         return this->allocate(result_counts);
     }
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/dynamic_ivf_index.h

@@ -24,8 +24,7 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 /// @brief Abstract interface for dynamic IVF indices (supports add/delete).
 struct SVS_RUNTIME_API DynamicIVFIndex : public IVFIndex {
     /// @brief Utility function to check storage kind support.
@@ -160,7 +159,6 @@ struct SVS_RUNTIME_API DynamicIVFIndexLeanVec : public DynamicIVFIndex {
         size_t intra_query_threads = 1
     ) noexcept;
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/dynamic_vamana_index.h

@@ -25,17 +25,14 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 // Abstract interface for Dynamic Vamana-based indexes.
 struct SVS_RUNTIME_API DynamicVamanaIndex : public VamanaIndex {
     virtual Status add(size_t n, const size_t* labels, const float* x) noexcept = 0;
     virtual Status
     remove_selected(size_t* num_removed, const IDFilter& selector) noexcept = 0;
     virtual Status remove(size_t n, const size_t* labels) noexcept = 0;
 
-    virtual Status reset() noexcept = 0;
-
     // Utility function to check storage kind support
     static Status check_storage_kind(StorageKind storage_kind) noexcept;
 
@@ -65,7 +62,6 @@ struct SVS_RUNTIME_API DynamicVamanaIndex : public VamanaIndex {
 
     static Status destroy(DynamicVamanaIndex* index) noexcept;
 
-    virtual Status save(std::ostream& out) const noexcept = 0;
     static Status load(
         DynamicVamanaIndex** index,
         std::istream& in,
@@ -131,7 +127,6 @@ struct SVS_RUNTIME_API DynamicVamanaIndexLeanVec : public DynamicVamanaIndex {
         const VamanaIndex::DynamicIndexParams& dynamic_index_params
     ) noexcept;
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/flat_index.h

@@ -23,8 +23,7 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 // Abstract interface for Flat indices.
 struct SVS_RUNTIME_API FlatIndex {
     // Utility function to check storage kind support
@@ -45,7 +44,6 @@ struct SVS_RUNTIME_API FlatIndex {
     virtual Status save(std::ostream& out) const noexcept = 0;
     static Status load(FlatIndex** index, std::istream& in, MetricType metric) noexcept;
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/ivf_index.h

@@ -24,8 +24,7 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 // Abstract interface for IVF (Inverted File) indices.
 struct SVS_RUNTIME_API IVFIndex {
     virtual ~IVFIndex();
@@ -170,7 +169,6 @@ struct SVS_RUNTIME_API IVFIndexLeanVec : public IVFIndex {
         size_t intra_query_threads = 1
     ) noexcept;
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/training.h

@@ -23,8 +23,7 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 struct SVS_RUNTIME_API LeanVecTrainingData {
     virtual ~LeanVecTrainingData();
 
@@ -70,7 +69,6 @@ struct SVS_RUNTIME_API LeanVecTrainingData {
     virtual Status save(std::ostream& out) const noexcept = 0;
     static Status load(LeanVecTrainingData** training_data, std::istream& in) noexcept;
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/vamana_index.h

@@ -23,8 +23,7 @@
 
 namespace svs {
 namespace runtime {
-namespace v0 {
-
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 namespace detail {
 struct VamanaBuildParameters {
     size_t graph_max_degree = Unspecify<size_t>();
@@ -128,7 +127,6 @@ struct SVS_RUNTIME_API VamanaIndexLeanVec : public VamanaIndex {
         const VamanaIndex::SearchParams& default_search_params = {}
     ) noexcept;
 };
-
-} // namespace v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
 } // namespace runtime
 } // namespace svs

bindings/cpp/include/svs/runtime/version.h

@@ -21,7 +21,7 @@
 ///
 /// This header defines the SVS Runtime API versioning scheme:
 /// 1. Versioned namespaces (e.g., v0, v1) for API stability
-/// 2. Using declarations to bring current version to parent namespace
+/// 2. Inline namespace to expose the current API version at svs::runtime::*
 /// 3. Clean integration points for external libraries
 ///
 /// Usage:
@@ -59,21 +59,21 @@
 #define SVS_RUNTIME_API_VERSION SVS_RUNTIME_VERSION_MAJOR
 #endif
 
+#define SVS_API_VERSION_NS_IMPL(version) v##version
+#define SVS_API_VERSION_NS(version) SVS_API_VERSION_NS_IMPL(version)
+#define SVS_RUNTIME_API_VERSION_NAMESPACE SVS_API_VERSION_NS(SVS_RUNTIME_API_VERSION)
+
 #if (SVS_RUNTIME_API_VERSION == 0)
-/// Use v0 API
-/// Current API version namespace
-#define SVS_RUNTIME_CURRENT_API_NAMESPACE v0
-namespace svs {
-namespace runtime {
 /// Current API version namespace (v0)
 /// All public runtime APIs live here and are accessible as svs::runtime::FunctionName
 /// due to inline namespace
-inline namespace v0 {
-// Public runtime APIs will be defined in their respective headers
-// IMPORTANT: include this header before other runtime headers to ensure proper versioning
-}
-} // namespace runtime
-} // namespace svs
+#define SVS_DECLARE_NAMESPACE_VERSION_0 inline namespace SVS_API_VERSION_NS(0)
+
+// Forward declaration for the current version namespace as inline namespace
+// This enforces compilation warnings/errors if the v0 namespace is not inlined below
+namespace svs::runtime {
+inline namespace v0 {}
+} // namespace svs::runtime
 #else
 #error "Unsupported SVS Runtime major version"
 #endif
@@ -86,11 +86,15 @@ inline namespace v0 {
 #define SVS_RUNTIME_CREATE_API_ALIAS(alias_name, version_ns) \
     namespace alias_name = svs::runtime::version_ns
 
+/// Helper macro to declare versioned namespaces for API definitions
+#define SVS_DECLARE_NAMESPACE_VERSION_IMPL(version) SVS_DECLARE_NAMESPACE_VERSION_##version
+#define SVS_DECLARE_NAMESPACE_VERSION(version) SVS_DECLARE_NAMESPACE_VERSION_IMPL(version)
+
 ///
 /// @brief Version information structure for runtime queries
 ///
-namespace svs::runtime::v0 {
-
+namespace svs::runtime {
+SVS_DECLARE_NAMESPACE_VERSION(0) {
 struct VersionInfo {
     static constexpr int major = SVS_RUNTIME_VERSION_MAJOR;
     static constexpr int minor = SVS_RUNTIME_VERSION_MINOR;
@@ -109,5 +113,5 @@ struct VersionInfo {
         return major == requested_major;
     }
 };
-
-} // namespace svs::runtime::v0
+} // SVS_DECLARE_NAMESPACE_VERSION(0)
+} // namespace svs::runtime

bindings/cpp/src/dynamic_vamana_index.cpp

@@ -63,7 +63,7 @@ struct DynamicVamanaIndexManagerBase : public DynamicVamanaIndex {
         });
     }
 
-    size_t blocksize_bytes() const noexcept { return impl_->blocksize_bytes(); }
+    size_t blocksize_bytes() const noexcept override { return impl_->blocksize_bytes(); }
 
     Status
     remove_selected(size_t* num_removed, const IDFilter& selector) noexcept override {

bindings/cpp/src/dynamic_vamana_index_impl.h

@@ -65,6 +65,8 @@ class DynamicVamanaIndexImpl {
         }
     }
 
+    virtual ~DynamicVamanaIndexImpl() = default;
+
     size_t size() const { return impl_ ? impl_->size() : 0; }
 
     size_t blocksize_bytes() const { return 1u << dynamic_index_params_.blocksize_exp; }

bindings/cpp/src/vamana_index_impl.h

@@ -69,6 +69,8 @@ class VamanaIndexImpl {
         }
     }
 
+    virtual ~VamanaIndexImpl() = default;
+
     size_t size() const { return impl_ ? get_impl()->size() : 0; }
 
     size_t dimensions() const { return dim_; }

docker/x86_64/manylinux228/Dockerfile

@@ -20,8 +20,8 @@ RUN yum install -y cmake-3.26.5 \
     && (if [ -x /usr/local/bin/cmake ]; then rm /usr/local/bin/cmake; fi) \
     && ln -sf /usr/bin/cmake3 /usr/local/bin/cmake
 
-# Install gcc-11
-RUN yum install -y gcc-toolset-11-11.1-1.el8 wget-1.19.5 \
+# Install gcc-11 and clang
+RUN yum install -y gcc-toolset-11-11.1-1.el8 wget-1.19.5 clang-20.1.8 \
     && yum clean all
 
 # Configure environment setup properly without recursion

include/svs/lib/threads/thread.h

@@ -888,7 +888,7 @@ template <typename T = telemetry::NoTelemetry> class ThreadImpl {
         // * Catch this exception and wrap its message inside a `ThreadError`.
         try {
             unsafe_assign(fn);
-        } catch (const ThreadCrashedError& err) {
+        } catch (const ThreadCrashedError&) {
             try {
                 unsafe_get_exception();
             } catch (const std::exception& inner_error) { throw ThreadError{inner_error}; }