Fix build errors when WIRH_CARDINAL=true

Signed-off-by: yhmo <yihua.mo@zilliz.com>

Author: yhmo

CMakeLists.txt

@@ -180,6 +180,7 @@ set(CARDINAL_LIBS "")
 if(WITH_CARDINAL)
   add_definitions(-DKNOWHERE_WITH_CARDINAL)
   add_subdirectory(cmake/libs/cardinal/v1)
+  target_link_libraries(cardinalv1 PRIVATE milvus-common::milvus-common)
   list(APPEND CARDINAL_LIBS cardinalv1)
   add_subdirectory(cmake/libs/cardinal/v2)
   list(APPEND CARDINAL_LIBS cardinalv2)

Makefile

@@ -17,7 +17,7 @@ BUILD_DIR ?= $(PWD)/build
 SHELL := /bin/bash
 
 # Conan install-only flags (not valid for conan build)
-CONAN_INSTALL_FLAGS := --update --build=missing
+CONAN_INSTALL_FLAGS := --build=missing
 
 # ---------- User-facing build flags ----------
 # Usage: make WITH_GPU=True WITH_UT=True WITH_ASAN=True WITH_DEBUG=True
@@ -27,6 +27,7 @@ WITH_BENCHMARK ?=
 WITH_ASAN ?=
 WITH_SVS ?=
 WITH_CARDINAL ?=
+CARDINAL_VERSION_FORCE_CHECKOUT ?=
 WITH_DEBUG ?=
 CONAN_PROFILE ?=
 
@@ -35,7 +36,7 @@ CONAN_PROFILE ?=
 # variables such as WITH_ASAN to every sub-process, which causes the custom
 # folly recipe to pick up $ENV{WITH_ASAN} and compile folly itself with
 # -fsanitize=address — breaking the build on GCC.
-unexport WITH_GPU WITH_UT WITH_BENCHMARK WITH_ASAN WITH_CARDINAL WITH_DEBUG
+unexport WITH_GPU WITH_UT WITH_BENCHMARK WITH_ASAN WITH_CARDINAL CARDINAL_VERSION_FORCE_CHECKOUT WITH_DEBUG
 
 # ---------- Derived settings ----------
 ifdef WITH_DEBUG
@@ -92,6 +93,16 @@ ifdef WITH_CARDINAL
     CONAN_SETTINGS += -o \&:with_cardinal=True
 endif
 
+ifneq ($(CARDINAL_VERSION_FORCE_CHECKOUT),)
+    ifneq ($(filter True true ON on 1,$(CARDINAL_VERSION_FORCE_CHECKOUT)),)
+        CONAN_SETTINGS += -o \&:cardinal_version_force_checkout=True
+    else ifneq ($(filter False false OFF off 0,$(CARDINAL_VERSION_FORCE_CHECKOUT)),)
+        CONAN_SETTINGS += -o \&:cardinal_version_force_checkout=False
+    else
+        $(error CARDINAL_VERSION_FORCE_CHECKOUT must be True/False, ON/OFF, or 1/0)
+    endif
+endif
+
 ifdef CONAN_PROFILE
     CONAN_SETTINGS += -pr $(CONAN_PROFILE)
 endif
@@ -160,6 +171,7 @@ help: ## Show available targets
 	@echo "  WITH_ASAN=True     Enable AddressSanitizer"
 	@echo "  WITH_SVS=True      Enable SVS (Intel Scalable Vector Search, x86 only)"
 	@echo "  WITH_CARDINAL=True Enable Cardinal build"
+	@echo "  CARDINAL_VERSION_FORCE_CHECKOUT=True Force Cardinal checkout to configured version"
 	@echo "  WITH_DEBUG=True    Debug build (default: Release)"
 	@echo "  CONAN_PROFILE=<p>  Use a custom Conan profile (e.g. clang, gcc-15)"
 	@echo "  LIBCXX=<lib>       Override compiler.libcxx (auto-detected from OS)"

cmake/libs/cardinal/v1/CMakeLists.txt

@@ -3,7 +3,7 @@ project(knowhere CXX C)
 
 # Use short SHA1 as version
 # v2.5 tag is used for cardinal v1
-set(CARDINAL_VERSION v2.5.105)
+set(CARDINAL_VERSION 12ad9e4687962624d8af7721b58367d11cf3fddb)
 set(CARDINAL_REPO_URL "https://github.com/zilliztech/cardinal.git")
 
 set(CARDINAL_ROOT  "${KNOWHERE_THRID_ROOT}/cardinalv1")

cmake/libs/cardinal/v2/CMakeLists.txt

@@ -3,7 +3,13 @@ project(knowhere CXX C)
 
 # Use short SHA1 as version
 # v2.6 tag is used for cardinal v2
-set(CARDINAL_VERSION v3.0.1)
+# now we use recipe branch of cardinal repo since the pr is not merged into cardinal repo: https://github.com/zilliztech/cardinal/pull/834
+# the cardinal repo fetches knowhere to run ci workflow so the two repos are coupling. to decouple them:
+# 1. use cardinal recipe branch in knowhere to pass the ci check
+# 2. in the cardianl pr#834, use the knowhere branch to run ci
+# 3. merge the knowhere pr
+# 4. in the cardinal pr#834, use the knowhere master branch to run ci, and merge the cardinal pr after ci passed
+set(CARDINAL_VERSION f0654cb40be0db57e73770707f44a1980b328423)
 set(CARDINAL_REPO_URL "https://github.com/zilliztech/cardinal.git")
 
 set(CARDINAL_ROOT  "${KNOWHERE_THRID_ROOT}/cardinalv2")

conanfile.py

@@ -28,6 +28,7 @@ class KnowhereConan(ConanFile):
         "with_diskann": [True, False],
         "with_svs": [True, False],
         "with_cardinal": [True, False],
+        "cardinal_version_force_checkout": [True, False],
         "with_profiler": [True, False],
         "with_ut": [True, False],
         "with_benchmark": [True, False],
@@ -44,6 +45,7 @@ class KnowhereConan(ConanFile):
         "with_diskann": False,
         "with_svs": False,
         "with_cardinal": False,
+        "cardinal_version_force_checkout": False,
         "with_profiler": False,
         "with_ut": False,
         "glog/*:shared": True,
@@ -107,7 +109,7 @@ def config_options(self):
     def configure(self):
         if self.options.shared:
             self.options.rm_safe("fPIC")
-        if self.settings.os in ["Linux", "Android"] and str(self.settings.arch) in self._openblas_dynamic_arches:
+        if self.settings.os == "Linux" and str(self.settings.arch) in self._openblas_dynamic_arches:
             self.options["openblas"].dynamic_arch = True
 
     def requirements(self):
@@ -136,11 +138,9 @@ def requirements(self):
         self.requires("xxhash/0.8.3#caa6d0af1b951c247922e38fbcebdbe6")
         if self.settings.os == "Linux":
             self.requires("openblas/0.3.30")
-        if self.settings.os == "Android":
-            self.requires("openblas/0.3.30")
         if not self.options.with_light:
             self.requires("opentelemetry-cpp/1.23.0@milvus/dev#11bc565ec6e82910ae8f7471da756720")
-        if self.settings.os not in ["Macos", "Android"]:
+        if self.settings.os != "Macos":
             self.requires("libunwind/1.8.1#748a981ace010b80163a08867b732e71")
         if self.options.with_ut:
             self.requires("catch2/3.7.1")
@@ -210,6 +210,7 @@ def generate(self):
         tc.variables["WITH_DISKANN"] = self.options.with_diskann
         tc.variables["WITH_SVS"] = self.options.with_svs
         tc.variables["WITH_CARDINAL"] = self.options.with_cardinal
+        tc.variables["CARDINAL_VERSION_FORCE_CHECKOUT"] = self.options.cardinal_version_force_checkout
         tc.variables["WITH_CUVS"] = self.options.with_cuvs
         tc.variables["WITH_PROFILER"] = self.options.with_profiler
         tc.variables["WITH_UT"] = self.options.with_ut