test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 02:48:45 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Decrease build time by removing compiling openblas (#19207)

Browse Source 
Signed-off-by: Jenny Li <jing.li@zilliz.com>

Signed-off-by: Jenny Li <jing.li@zilliz.com>
This commit is contained in:
Jenny Li 2022-09-16 17:46:47 +08:00 committed by GitHub
parent a7be67451f
commit d8b11121a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@ -1,8 +1,8 @@
IMAGE_REPO=milvusdb IMAGE_REPO=milvusdb
IMAGE_ARCH=amd64 IMAGE_ARCH=amd64
OS_NAME=ubuntu20.04 OS_NAME=ubuntu20.04
DATE_VERSION=20220914-0bfd2c9 DATE_VERSION=20220915-18817a4
LATEST_DATE_VERSION=20220914-0bfd2c9 LATEST_DATE_VERSION=20220915-18817a4
MINIO_ADDRESS=minio:9000 MINIO_ADDRESS=minio:9000
PULSAR_ADDRESS=pulsar://pulsar:6650 PULSAR_ADDRESS=pulsar://pulsar:6650
ETCD_ENDPOINTS=etcd:2379 ETCD_ENDPOINTS=etcd:2379

10
build/docker/milvus/ubuntu20.04/Dockerfile
View File

@ -9,20 +9,20 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express # 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. # 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 alpine
FROM ubuntu:focal-20220426 FROM ubuntu:focal-20220426
RUN apt-get update && \ 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 && \ apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/* 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 && \ RUN ln -s /usr/lib/libopenblasp-r0.3.21.so /usr/lib/libopenblas.so.3 && \
ln -s /usr/lib/libopenblas.so.0 /usr/lib/libopenblas.so ln -s /usr/lib/libopenblas.so.3 /usr/lib/libopenblas.so
COPY ./bin/ /milvus/bin/ COPY ./bin/ /milvus/bin/

8
internal/core/thirdparty/knowhere/CMakeLists.txt vendored
View File

@ -11,8 +11,8 @@
# or implied. See the License for the specific language governing permissions and limitations under the License. # or implied. See the License for the specific language governing permissions and limitations under the License.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
set( KNOWHERE_VERSION v1.3.0 ) set( KNOWHERE_VERSION v1.3.1 )
set( KNOWHERE_SOURCE_MD5 "e43de07b5a5603bda1e340cc7309c115") set( KNOWHERE_SOURCE_MD5 "62eee25f4e15a52d2dadce2471976023")
if ( DEFINED ENV{MILVUS_KNOWHERE_URL} ) if ( DEFINED ENV{MILVUS_KNOWHERE_URL} )
set( KNOWHERE_SOURCE_URL "$ENV{MILVUS_KNOWHERE_URL}" ) set( KNOWHERE_SOURCE_URL "$ENV{MILVUS_KNOWHERE_URL}" )
@ -33,8 +33,8 @@ macro(build_knowhere)
) )
externalproject_add(knowhere_ep externalproject_add(knowhere_ep
#GIT_REPOSITORY "https://github.com/milvus-io/knowhere.git" # GIT_REPOSITORY "https://github.com/milvus-io/knowhere.git"
#GIT_TAG main # GIT_TAG main
URL ${KNOWHERE_SOURCE_URL} URL ${KNOWHERE_SOURCE_URL}
URL_MD5 ${KNOWHERE_SOURCE_MD5} URL_MD5 ${KNOWHERE_SOURCE_MD5}
CMAKE_ARGS ${KNOWHERE_CMAKE_ARGS} CMAKE_ARGS ${KNOWHERE_CMAKE_ARGS}