Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/analyzer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install Dependency
run: |
sudo apt update && sudo apt install -y cmake g++ gcc libopenblas-dev libaio-dev libcurl4-openssl-dev libevent-dev clang-tidy python3-pip && \
pip3 install conan==1.58.0 && conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local
pip3 install conan==1.61.0 && conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local
- name: Cache conan
id: cache-conan
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ut.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: |
sudo apt update \
&& sudo apt install -y cmake g++ gcc libopenblas-dev libcurl4-openssl-dev libaio-dev libevent-dev python3 python3-pip lcov \
&& 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
- name: Build & Run
run: |
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
run: |
sudo apt update \
&& sudo apt install -y cmake g++ gcc libopenblas-dev libaio-dev libcurl4-openssl-dev libevent-dev libgflags-dev python3 python3-pip python3-setuptools \
&& pip3 install conan==1.58.0 pytest faiss-cpu numpy wheel \
&& pip3 install conan==1.61.0 pytest faiss-cpu numpy wheel \
&& conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion ci/E2E2.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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"
Expand Down
2 changes: 1 addition & 1 deletion ci/E2E_GPU.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ci/UT_GPU.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,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"
Expand Down
6 changes: 3 additions & 3 deletions scripts/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions scripts/python_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down