From cb1dbf20c7d23e0950c81436decb1df01039bcb6 Mon Sep 17 00:00:00 2001 From: presburger Date: Sun, 28 Apr 2024 20:13:25 +0800 Subject: [PATCH] enhance:remove openblas from conan (#32002) issue: #30683 Signed-off-by: yusheng.ma --- internal/core/conanfile.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index 70cc88a18d..cdeb40a1d7 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -41,7 +41,7 @@ class MilvusConan(ConanFile): "google-cloud-cpp/2.5.0@milvus/dev", "opentelemetry-cpp/1.8.1.1@milvus/dev", "librdkafka/1.9.1", - "abseil/20230125.3" + "abseil/20230125.3", ) generators = ("cmake", "cmake_find_package") default_options = { @@ -75,8 +75,6 @@ class MilvusConan(ConanFile): "fmt:header_only": True, "onetbb:tbbmalloc": False, "onetbb:tbbproxy": False, - "openblas:shared": True, - "openblas:dynamic_arch": True, } def configure(self): @@ -86,13 +84,9 @@ class MilvusConan(ConanFile): # By default abseil use static link but can not be compatible with macos X86 self.options["abseil"].shared = True self.options["arrow"].with_jemalloc = False - if self.settings.arch == "armv8": - self.options["openblas"].dynamic_arch = False def requirements(self): if self.settings.os != "Macos": - # MacOS does not need openblas - # self.requires("openblas/0.3.23@milvus/dev") self.requires("libunwind/1.7.2") def imports(self):