Fix example linking and rename steady timer

Author: driPyf

examples/c++/CMakeLists.txt

@@ -33,10 +33,18 @@ endif()
 
 # --- Dependency groups ---
 find_package(Threads REQUIRED)
+find_package(OpenMP QUIET)
 
+set(zvec_openmp_deps)
+if(OpenMP_FOUND)
+    list(APPEND zvec_openmp_deps OpenMP::OpenMP_CXX)
+endif()
 
 set(zvec_core_deps
     zvec_turbo
+    omega
+    _lightgbm
+    ${zvec_openmp_deps}
 )
 
 if (NOT WIN32)
@@ -52,6 +60,8 @@ if (NOT WIN32)
     set(zvec_db_deps
             roaring
             rocksdb
+            omega
+            _lightgbm
             arrow
             arrow_acero
             arrow_bundled_dependencies
@@ -63,6 +73,7 @@ if (NOT WIN32)
             ${GFLAGS_LIB}
             ${PROTOBUF_LIB}
             lz4
+            ${zvec_openmp_deps}
     )
 else ()
     # Windows static libraries use different naming conventions
@@ -77,6 +88,8 @@ else ()
     set(zvec_db_deps
             roaring
             rocksdb
+            omega
+            _lightgbm
             arrow_static
             arrow_acero_static
             arrow_bundled_dependencies
@@ -90,6 +103,7 @@ else ()
             lz4
             rpcrt4
             shlwapi
+            ${zvec_openmp_deps}
     )
 endif ()
 
@@ -124,6 +138,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 elseif(APPLE)
     target_link_libraries(zvec-core INTERFACE
         -Wl,-force_load ${ZVEC_LIB_DIR}/libzvec_core.a
+        -Wl,-force_load ${ZVEC_LIB_DIR}/libomega.a
         zvec-ailego
         ${zvec_core_deps}
     )
@@ -161,6 +176,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     )
 elseif(APPLE)
     target_link_libraries(zvec-db INTERFACE
+        -Wl,-force_load ${ZVEC_LIB_DIR}/libzvec_db.a
         zvec_db
         zvec-core
         zvec-ailego

examples/c/CMakeLists.txt

@@ -45,6 +45,12 @@ link_directories(${ZVEC_LIB_DIR} ${ZVEC_DEPENDENCY_LIB_DIR})
 
 # Find required packages
 find_package(Threads REQUIRED)
+find_package(OpenMP QUIET)
+
+set(zvec_openmp_deps)
+if(OpenMP_FOUND)
+    list(APPEND zvec_openmp_deps OpenMP::OpenMP_CXX)
+endif()
 
 # --- Determine debug/release library names ---
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -62,6 +68,8 @@ if(NOT WIN32)
     set(zvec_c_api_deps
         roaring
         rocksdb
+        omega
+        _lightgbm
         arrow
         arrow_acero
         arrow_bundled_dependencies
@@ -73,6 +81,7 @@ if(NOT WIN32)
         ${GFLAGS_LIB}
         ${PROTOBUF_LIB}
         lz4
+        ${zvec_openmp_deps}
         ${CMAKE_THREAD_LIBS_INIT}
         ${CMAKE_DL_LIBS}
     )
@@ -82,6 +91,8 @@ else()
     set(zvec_c_api_deps
         roaring
         rocksdb
+        omega
+        _lightgbm
         arrow_static
         arrow_acero_static
         arrow_bundled_dependencies
@@ -93,6 +104,7 @@ else()
         ${GFLAGS_LIB}
         ${PROTOBUF_LIB}
         lz4
+        ${zvec_openmp_deps}
         ${CMAKE_THREAD_LIBS_INIT}
         rpcrt4
         shlwapi
@@ -206,4 +218,4 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release" AND ANDROID)
     set_property(TARGET c_api_basic_example c_api_collection_schema_example c_api_doc_example
                  c_api_index_example c_api_field_schema_example c_api_optimized_example
                  PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
+endif()

src/core/algorithm/hnsw/hnsw_streamer.cc

@@ -18,8 +18,8 @@
 #include <ailego/internal/cpu_features.h>
 #include <ailego/pattern/defer.h>
 #include <ailego/utility/memory_helper.h>
-#include "utility/rdtsc_timer.h"
 #include "utility/sparse_utility.h"
+#include "utility/steady_clock_timer.h"
 #include "hnsw_algorithm.h"
 #include "hnsw_context.h"
 #include "hnsw_dist_calculator.h"
@@ -680,9 +680,9 @@ int HnswStreamer::search_impl(const void *query, const IndexQueryMeta &qmeta,
   const bool use_empty_hooks = UseEmptyHnswHooks();
   HnswAlgorithm::SearchHooks empty_hooks;
   for (size_t q = 0; q < count; ++q) {
-    auto query_start = RdtscTimer::Now();
+    auto query_start = SteadyClockTimer::Now();
     ctx->reset_query(query);
-    auto query_search_start = RdtscTimer::Now();
+    auto query_search_start = SteadyClockTimer::Now();
     if (use_empty_hooks) {
       bool stopped_early = false;
       ret = alg_->search_with_hooks(ctx, &empty_hooks, &stopped_early);
@@ -693,11 +693,11 @@ int HnswStreamer::search_impl(const void *query, const IndexQueryMeta &qmeta,
       LOG_ERROR("Hnsw searcher fast search failed");
       return ret;
     }
-    auto query_search_end = RdtscTimer::Now();
+    auto query_search_end = SteadyClockTimer::Now();
     auto query_search_time_ns =
-        RdtscTimer::ElapsedNs(query_search_start, query_search_end);
+        SteadyClockTimer::ElapsedNs(query_search_start, query_search_end);
     auto query_latency_ns =
-        RdtscTimer::ElapsedNs(query_start, RdtscTimer::Now());
+        SteadyClockTimer::ElapsedNs(query_start, SteadyClockTimer::Now());
     uint64_t query_seq = HnswQueryStatsSequence().fetch_add(1);
     if (ShouldLogHnswQueryStats(query_seq)) {
       LOG_INFO(
@@ -811,7 +811,7 @@ int HnswStreamer::search_bf_impl(
     auto &topk = ctx->topk_heap();
 
     for (size_t q = 0; q < count; ++q) {
-      auto query_start = RdtscTimer::Now();
+      auto query_start = SteadyClockTimer::Now();
       ctx->reset_query(query);
       topk.clear();
       for (node_id_t id = 0; id < entity_.doc_cnt(); ++id) {
@@ -825,7 +825,7 @@ int HnswStreamer::search_bf_impl(
         }
       }
       auto query_latency_ns =
-          RdtscTimer::ElapsedNs(query_start, RdtscTimer::Now());
+          SteadyClockTimer::ElapsedNs(query_start, SteadyClockTimer::Now());
       uint64_t query_seq = HnswQueryStatsSequence().fetch_add(1);
       if (ShouldLogHnswQueryStats(query_seq)) {
         LOG_INFO(

src/core/utility/rdtsc_timer.cc

@@ -0,0 +1,31 @@
+// Copyright 2025-present the zvec 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.
+
+#include "utility/steady_clock_timer.h"
+
+namespace zvec {
+namespace core {
+
+SteadyClockTimer::tick_t SteadyClockTimer::Now() {
+  const auto now = std::chrono::steady_clock::now().time_since_epoch();
+  return static_cast<tick_t>(
+      std::chrono::duration_cast<std::chrono::nanoseconds>(now).count());
+}
+
+uint64_t SteadyClockTimer::ElapsedNs(tick_t start, tick_t end) {
+  return end > start ? (end - start) : 0;
+}
+
+}  // namespace core
+}  // namespace zvec

src/core/utility/steady_clock_timer.cc

@@ -12,34 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef ZVEC_CORE_UTILITY_RDTSC_TIMER_H_
-#define ZVEC_CORE_UTILITY_RDTSC_TIMER_H_
+#ifndef ZVEC_CORE_UTILITY_STEADY_CLOCK_TIMER_H_
+#define ZVEC_CORE_UTILITY_STEADY_CLOCK_TIMER_H_
 
+#include <chrono>
 #include <cstdint>
 
-#if defined(__x86_64__) || defined(__i386__)
-#define ZVEC_CORE_HAS_TSC 1
-#else
-#define ZVEC_CORE_HAS_TSC 0
-#endif
-
 namespace zvec {
 namespace core {
 
-class RdtscTimer {
+class SteadyClockTimer {
  public:
   using tick_t = uint64_t;
 
   static tick_t Now();
   static uint64_t ElapsedNs(tick_t start, tick_t end);
-
- private:
-  static uint64_t MonotonicRawNs();
-  static double NsPerTick();
-  static double CalibrateNsPerTick();
 };
 
 }  // namespace core
 }  // namespace zvec
 
-#endif  // ZVEC_CORE_UTILITY_RDTSC_TIMER_H_
+#endif  // ZVEC_CORE_UTILITY_STEADY_CLOCK_TIMER_H_