From d8b11121a8f1e5ec1d79f5b99547d07508ecefc6 Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Fri, 16 Sep 2022 17:46:47 +0800 Subject: [PATCH] Decrease build time by removing compiling openblas (#19207) Signed-off-by: Jenny Li Signed-off-by: Jenny Li --- .env | 4 ++-- build/docker/milvus/ubuntu20.04/Dockerfile | 10 +++++----- internal/core/thirdparty/knowhere/CMakeLists.txt | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 7eabd8216e763..fe06f4a434d77 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ IMAGE_REPO=milvusdb IMAGE_ARCH=amd64 OS_NAME=ubuntu20.04 -DATE_VERSION=20220914-0bfd2c9 -LATEST_DATE_VERSION=20220914-0bfd2c9 +DATE_VERSION=20220915-18817a4 +LATEST_DATE_VERSION=20220915-18817a4 MINIO_ADDRESS=minio:9000 PULSAR_ADDRESS=pulsar://pulsar:6650 ETCD_ENDPOINTS=etcd:2379 \ No newline at end of file diff --git a/build/docker/milvus/ubuntu20.04/Dockerfile b/build/docker/milvus/ubuntu20.04/Dockerfile index 0423b47320f5a..028931cf9398c 100644 --- a/build/docker/milvus/ubuntu20.04/Dockerfile +++ b/build/docker/milvus/ubuntu20.04/Dockerfile @@ -9,20 +9,20 @@ # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # or implied. See the License for the specific language governing permissions and limitations under the License. -FROM milvusdb/openblas:ubuntu20.04-20220825-4feedf1 AS openblas +FROM milvusdb/openblas:ubuntu20.04-20220914-179ea77 AS openblas #FROM alpine FROM ubuntu:focal-20220426 RUN apt-get update && \ - apt-get install -y --no-install-recommends libtbb-dev gfortran netcat iputils-ping ca-certificates && \ + apt-get install -y --no-install-recommends libtbb-dev gfortran netcat iputils-ping ca-certificates liblapack3 && \ apt-get remove --purge -y && \ rm -rf /var/lib/apt/lists/* -COPY --from=openblas /usr/lib/libopenblas-r0.3.9.so /usr/lib/ +COPY --from=openblas /usr/local/lib/libopenblasp-r0.3.21.so /usr/lib/ -RUN ln -s /usr/lib/libopenblas-r0.3.9.so /usr/lib/libopenblas.so.0 && \ - ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so +RUN ln -s /usr/lib/libopenblasp-r0.3.21.so /usr/lib/libopenblas.so.3 && \ + ln -s /usr/lib/libopenblas.so.3 /usr/lib/libopenblas.so COPY ./bin/ /milvus/bin/ diff --git a/internal/core/thirdparty/knowhere/CMakeLists.txt b/internal/core/thirdparty/knowhere/CMakeLists.txt index a695acad80189..b61087a59aade 100644 --- a/internal/core/thirdparty/knowhere/CMakeLists.txt +++ b/internal/core/thirdparty/knowhere/CMakeLists.txt @@ -11,8 +11,8 @@ # or implied. See the License for the specific language governing permissions and limitations under the License. #------------------------------------------------------------------------------- -set( KNOWHERE_VERSION v1.3.0 ) -set( KNOWHERE_SOURCE_MD5 "e43de07b5a5603bda1e340cc7309c115") +set( KNOWHERE_VERSION v1.3.1 ) +set( KNOWHERE_SOURCE_MD5 "62eee25f4e15a52d2dadce2471976023") if ( DEFINED ENV{MILVUS_KNOWHERE_URL} ) set( KNOWHERE_SOURCE_URL "$ENV{MILVUS_KNOWHERE_URL}" ) @@ -33,8 +33,8 @@ macro(build_knowhere) ) externalproject_add(knowhere_ep - #GIT_REPOSITORY "https://github.com/milvus-io/knowhere.git" - #GIT_TAG main + # GIT_REPOSITORY "https://github.com/milvus-io/knowhere.git" + # GIT_TAG main URL ${KNOWHERE_SOURCE_URL} URL_MD5 ${KNOWHERE_SOURCE_MD5} CMAKE_ARGS ${KNOWHERE_CMAKE_ARGS}