v2.2.15

Signed-off-by: Ji Bin <[email protected]>
matrixji · Nov 25, 2023 · 0470df9 · 0470df9
1 parent 8bd10fc
commit 0470df9
Show file tree

Hide file tree

Showing 6 changed files with 939 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -160,10 +160,8 @@ jobs:
         shell: msys2 {0}
         run: |
           # workaround for keyring error
-          if ! pacman -S --noconfirm --needed git patch ; then
-            pacman-key --refresh-keys
-            pacman -S --noconfirm --needed git patch
-          fi
+          sed -i 's/SigLevel.*/SigLevel = Never/' /etc/pacman.conf
+          pacman -S --noconfirm --needed git patch
           pacman -S --noconfirm --needed mingw-w64-x86_64-python mingw-w64-x86_64-python-wheel mingw-w64-x86_64-python-pip
       - name: Build Wheel
         shell: msys2 {0}
@@ -187,7 +185,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu:18.04", "ubuntu:22.04", "centos:7", "fedora:36"]
+        os: ["ubuntu:18.04", "ubuntu:22.04", "centos:7", "fedora:38"]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
@@ -200,7 +198,7 @@ jobs:
           if [[ "${{ matrix.os }}" == "centos:7" ]] ; then
             yum -y install epel-release
             yum -y install python36 python36-pip python36-wheel
-          elif [[ "${{ matrix.os }}" == "fedora:36" ]] ; then
+          elif [[ "${{ matrix.os }}" == "fedora:38" ]] ; then
             dnf -y install python3 python3-pip python3-wheel python3-devel gcc gcc-c++
           elif [[ "${{ matrix.os }}" =~ "ubuntu" ]] ; then
             apt update

diff --git a/milvus_binary/build.sh b/milvus_binary/build.sh
@@ -137,6 +137,7 @@ function install_deps_for_macosx() {
     bash milvus/scripts/install_deps.sh
     # need this for cache binary
     brew install md5sha1sum
+    brew install libomp
 }
 
 # build for macos arm64/x86_64

diff --git a/milvus_binary/env.sh b/milvus_binary/env.sh
@@ -1,5 +1,5 @@
 
 MILVUS_REPO="https://github.com/milvus-io/milvus.git"
-MILVUS_VERSION="v2.2.14"
+MILVUS_VERSION="v2.2.15"
 BUILD_PROXY=
 BUILD_FORCE=NO
diff --git a/milvus_binary/patches/knowhere-v1.3.19.patch b/milvus_binary/patches/knowhere-v1.3.19.patch
@@ -0,0 +1,48 @@
+From aba7299dd6e5202ca6a348dd686c421a993f2923 Mon Sep 17 00:00:00 2001
+From: Ji Bin <[email protected]>
+Date: Thu, 23 Nov 2023 10:26:22 +0800
+Subject: [PATCH] patch for v1.3.19
+
+Signed-off-by: Ji Bin <[email protected]>
+---
+ CMakeLists.txt                    | 4 +---
+ knowhere/archive/KnowhereConfig.h | 1 +
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36f7332..64d8f10 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,8 +32,6 @@ if ( APPLE )
+     else()
+         set( APPLE_LLVM_PREFIX "/usr/local" )
+     endif()
+-    set ( CMAKE_C_COMPILER "${APPLE_LLVM_PREFIX}/opt/llvm/bin/clang" )
+-    set ( CMAKE_CXX_COMPILER "${APPLE_LLVM_PREFIX}/opt/llvm/bin/clang++" )
+ endif ()
+
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
+@@ -80,7 +78,7 @@ include( CheckCXXCompilerFlag )
+ if ( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+     message(STATUS "MacOS")
+     set ( MACOS TRUE )
+-    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${APPLE_LLVM_PREFIX}/opt/libomp/lib" )
++    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${APPLE_LLVM_PREFIX}/opt/libomp/include" )
+ elseif ( "${CMAKE_SYSTEM}" MATCHES "Linux" )
+     message( STATUS "Linux")
+     set ( LINUX TRUE )
+diff --git a/knowhere/archive/KnowhereConfig.h b/knowhere/archive/KnowhereConfig.h
+index f83bb94..f794e8b 100644
+--- a/knowhere/archive/KnowhereConfig.h
++++ b/knowhere/archive/KnowhereConfig.h
+@@ -11,6 +11,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <vector>
+ #include <string>
+
+-- 
+2.42.1
+