From 9f05d18ff6184a3f1f5511b72d40a405abb4188d Mon Sep 17 00:00:00 2001 From: Enwei Jiao Date: Tue, 7 Nov 2023 14:32:09 +0800 Subject: [PATCH] Upgrade conan to 1.61.0 (#182) Signed-off-by: Enwei Jiao --- README.md | 2 +- ci/E2E2.groovy | 2 +- ci/E2E_GPU.groovy | 2 +- ci/UT_GPU.groovy | 2 +- scripts/install_deps.sh | 6 +++--- scripts/python_deps.sh | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index f4605e392..b15d3f151 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Here's a list of verified OS types where Knowhere can successfully build and run ```bash $ sudo apt install build-essential libopenblas-dev libaio-dev python3-dev python3-pip -$ pip3 install conan==1.59.0 --user +$ pip3 install conan==1.61.0 --user $ export PATH=$PATH:$HOME/.local/bin ``` diff --git a/ci/E2E2.groovy b/ci/E2E2.groovy index 1aa06d70b..237c3d367 100644 --- a/ci/E2E2.groovy +++ b/ci/E2E2.groovy @@ -27,7 +27,7 @@ pipeline { version="${env.CHANGE_ID}.${date}.${gitShortCommit}" sh "apt-get update || true" sh "apt-get install libaio-dev libopenblas-dev libcurl4-openssl-dev libdouble-conversion-dev libevent-dev libgflags-dev git -y" - sh "pip3 install conan==1.58.0" + sh "pip3 install conan==1.61.0" sh "conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local" sh "rm -rf /usr/local/lib/cmake/" sh "mkdir build" diff --git a/ci/E2E_GPU.groovy b/ci/E2E_GPU.groovy index e428adfb7..1a5bcf538 100644 --- a/ci/E2E_GPU.groovy +++ b/ci/E2E_GPU.groovy @@ -32,7 +32,7 @@ pipeline { sh "apt-get install build-essential libopenblas-dev libcurl4-openssl-dev libaio-dev libdouble-conversion-dev libevent-dev libgflags-dev git -y" sh "git config --global --add safe.directory '*'" sh "git submodule update --recursive --init" - sh "pip3 install conan==1.58.0" + sh "pip3 install conan==1.61.0" sh "conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local" sh "rm -rf /usr/local/lib/cmake/" sh "mkdir build" diff --git a/ci/UT_GPU.groovy b/ci/UT_GPU.groovy index 51d5987c9..bf916b8d3 100644 --- a/ci/UT_GPU.groovy +++ b/ci/UT_GPU.groovy @@ -27,7 +27,7 @@ pipeline { version="${env.CHANGE_ID}.${date}.${gitShortCommit}" sh "apt-get update || true" sh "apt-get install libaio-dev libcurl4-openssl-dev libdouble-conversion-dev libevent-dev libgflags-dev git -y" - sh "pip3 install conan==1.58.0" + sh "pip3 install conan==1.61.0" sh "conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local" sh "rm -rf /usr/local/lib/cmake/" sh "mkdir build" diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 327be3068..241b12815 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -44,7 +44,7 @@ if [[ "${MACHINE}" == "Linux" ]]; then #DiskANN dependencies sudo apt-get install -y libboost-program-options-dev sudo apt-get install -y libaio-dev - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local # Pre-installation of openblas can save about 15 minutes of openblas building time. # But the apt-installed openblas version is 0.2.20, while the latest openblas version is 0.3.19. @@ -95,14 +95,14 @@ if [[ "${MACHINE}" == "Linux" ]]; then wget -c https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz && \ tar -zxvf cmake-3.22.2-linux-x86_64.tar.gz && \ sudo ln -sf $(pwd)/cmake-3.22.2-linux-x86_64/bin/cmake /usr/bin/cmake - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local fi fi if [[ "${MACHINE}" == "Mac" ]]; then brew install libomp llvm ninja openblas - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local fi diff --git a/scripts/python_deps.sh b/scripts/python_deps.sh index bb683117a..cddb18cdb 100644 --- a/scripts/python_deps.sh +++ b/scripts/python_deps.sh @@ -36,7 +36,7 @@ if [[ "${MACHINE}" == "Linux" ]]; then # for Ubuntu 18.04 release_num=$(lsb_release -r --short) sudo apt install -y libcurl4-openssl-dev libaio libaio-devel libopenblas-dev - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 elif [[ -x "$(command -v yum)" ]]; then yum install -y sudo case $(uname -m) in @@ -45,10 +45,10 @@ if [[ "${MACHINE}" == "Linux" ]]; then x86_64) sudo yum install -y openblas-devel libaio libaio-devel ;; arm) ;; esac - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 elif [[ -x "$(command -v apk)" ]]; then apk add openblas-dev libaio libaio-dev - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 fi fi @@ -63,7 +63,7 @@ if [[ "${MACHINE}" == "Mac" ]]; then export CMAKE_PREFIX_PATH="/usr/local;${CMAKE_PREFIX_PATH}" export CC="$(brew --prefix llvm)/bin/clang" export CXX="$(brew --prefix llvm)/bin/clang++" - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 conan profile new default --detect --force conan profile update settings.compiler=clang default conan profile update settings.compiler.version=16 default