-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Ji Bin <[email protected]>
- Loading branch information
Showing
7 changed files
with
125 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
|
||
MILVUS_REPO="https://github.com/milvus-io/milvus.git" | ||
MILVUS_VERSION="v2.3.5" | ||
MILVUS_VERSION="v2.3.8" | ||
BUILD_PROXY= | ||
BUILD_FORCE=NO |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From e8663fb525b5e34f9a4c5ece5cecf82304e2f975 Mon Sep 17 00:00:00 2001 | ||
From: Ji Bin <[email protected]> | ||
Date: Sun, 5 Nov 2023 18:27:32 +0800 | ||
Subject: [PATCH] fix for gettid | ||
|
||
Signed-off-by: Ji Bin <[email protected]> | ||
--- | ||
include/knowhere/comp/thread_pool.h | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/include/knowhere/comp/thread_pool.h b/include/knowhere/comp/thread_pool.h | ||
index 29d1eb6..895ec53 100644 | ||
--- a/include/knowhere/comp/thread_pool.h | ||
+++ b/include/knowhere/comp/thread_pool.h | ||
@@ -13,6 +13,7 @@ | ||
|
||
#include <omp.h> | ||
#include <sys/resource.h> | ||
+#include <sys/syscall.h> | ||
|
||
#include <cerrno> | ||
#include <cstring> | ||
@@ -39,7 +40,7 @@ class ThreadPool { | ||
std::thread | ||
newThread(folly::Func&& func) override { | ||
return folly::NamedThreadFactory::newThread([&, func = std::move(func)]() mutable { | ||
- if (setpriority(PRIO_PROCESS, gettid(), 19) != 0) { | ||
+ if (setpriority(PRIO_PROCESS, syscall(SYS_gettid), 19) != 0) { | ||
LOG_KNOWHERE_ERROR_ << "Failed to set priority of knowhere thread. Error is: " | ||
<< std::strerror(errno); | ||
} else { | ||
-- | ||
2.43.0 | ||
|
29 changes: 29 additions & 0 deletions
29
milvus_binary/patches/milvus-v2.3.8/0001-link-with-CoreServices-for-macos.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From 3545739f355460b84abac84c83a7b363d664431f Mon Sep 17 00:00:00 2001 | ||
From: Ji Bin <[email protected]> | ||
Date: Mon, 13 Nov 2023 23:20:16 +0800 | ||
Subject: [PATCH 1/2] link with CoreServices for macos | ||
|
||
Signed-off-by: Ji Bin <[email protected]> | ||
--- | ||
internal/core/src/storage/azure-blob-storage/CMakeLists.txt | 5 +++++ | ||
1 file changed, 5 insertions(+) | ||
|
||
diff --git a/internal/core/src/storage/azure-blob-storage/CMakeLists.txt b/internal/core/src/storage/azure-blob-storage/CMakeLists.txt | ||
index 62b2e971c..bf803da35 100644 | ||
--- a/internal/core/src/storage/azure-blob-storage/CMakeLists.txt | ||
+++ b/internal/core/src/storage/azure-blob-storage/CMakeLists.txt | ||
@@ -36,6 +36,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-return-type - | ||
add_library(blob-chunk-manager SHARED AzureBlobChunkManager.cpp) | ||
target_link_libraries(blob-chunk-manager PUBLIC Azure::azure-identity Azure::azure-storage-blobs) | ||
|
||
+if (APPLE) | ||
+ find_library(CORESERVICES_LIBRARY CoreServices) | ||
+ target_link_libraries(blob-chunk-manager PRIVATE ${CORESERVICES_LIBRARY}) | ||
+endif (APPLE) | ||
+ | ||
install(TARGETS blob-chunk-manager DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
|
||
if ( BUILD_UNIT_TEST STREQUAL "ON" ) | ||
-- | ||
2.43.0 | ||
|
25 changes: 25 additions & 0 deletions
25
milvus_binary/patches/milvus-v2.3.8/0002-fix-for-gettid.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From 99b8bbd82fbcd5ca64bc68c67006c45fd2cf0c48 Mon Sep 17 00:00:00 2001 | ||
From: Ji Bin <[email protected]> | ||
Date: Sun, 5 Nov 2023 18:49:29 +0800 | ||
Subject: [PATCH 2/2] fix for gettid | ||
|
||
Signed-off-by: Ji Bin <[email protected]> | ||
--- | ||
internal/core/thirdparty/knowhere/CMakeLists.txt | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/internal/core/thirdparty/knowhere/CMakeLists.txt b/internal/core/thirdparty/knowhere/CMakeLists.txt | ||
index ea65c26f0..19451903c 100644 | ||
--- a/internal/core/thirdparty/knowhere/CMakeLists.txt | ||
+++ b/internal/core/thirdparty/knowhere/CMakeLists.txt | ||
@@ -41,6 +41,7 @@ FetchContent_Declare( | ||
GIT_TAG ${KNOWHERE_VERSION} | ||
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-src | ||
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/knowhere-build | ||
+ PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/../../../patches/knowhere-v2.2.4.patch | ||
DOWNLOAD_DIR ${THIRDPARTY_DOWNLOAD_PATH} ) | ||
|
||
FetchContent_GetProperties( knowhere ) | ||
-- | ||
2.43.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ | |
import json | ||
import hashlib | ||
|
||
__version__ = '2.3.5' | ||
__version__ = '2.3.8' | ||
|
||
LOGGERS = {} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters