From 71e201fc49f491ecf05b8bf0e850379db589486b Mon Sep 17 00:00:00 2001 From: Zhiru Date: Tue, 15 Oct 2019 18:04:55 +0800 Subject: [PATCH 1/4] add build_deps.sh Former-commit-id: 4b4dc06188a75d999d1b03867789c202833149ab --- core/build_deps.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 core/build_deps.sh diff --git a/core/build_deps.sh b/core/build_deps.sh new file mode 100755 index 0000000000..06f05fa49f --- /dev/null +++ b/core/build_deps.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +sudo apt-get install -y gfortran libmysqlclient-dev mysql-client libcurl4-openssl-dev + +sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so From 33f01a0653c72099e26e6e14df34126ca1684d22 Mon Sep 17 00:00:00 2001 From: JinHai-CN Date: Tue, 15 Oct 2019 18:12:22 +0800 Subject: [PATCH 2/4] Update CI files Former-commit-id: 973fecf6705d97ca8ce5e6bc1ede5267fdbc59cc --- ci/jenkinsfile/milvus_build.groovy | 2 -- ci/jenkinsfile/milvus_build_no_ut.groovy | 2 -- core/CHANGELOG.md | 2 +- core/cmake/ThirdPartyPackages.cmake | 3 ++- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/jenkinsfile/milvus_build.groovy b/ci/jenkinsfile/milvus_build.groovy index 66a54328ce..c5d937c2be 100644 --- a/ci/jenkinsfile/milvus_build.groovy +++ b/ci/jenkinsfile/milvus_build.groovy @@ -15,8 +15,6 @@ container('milvus-build-env') { && export JFROG_USER_NAME='${USERNAME}' \ && export JFROG_PASSWORD='${PASSWORD}' \ && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \ - && export http_proxy=http://proxy.zilliz.tech:1087 \ - && export https_proxy=http://proxy.zilliz.tech:1087 \ && ./build.sh -t ${params.BUILD_TYPE} -j -u -c" sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194" diff --git a/ci/jenkinsfile/milvus_build_no_ut.groovy b/ci/jenkinsfile/milvus_build_no_ut.groovy index d14e4b317b..87e68546b6 100644 --- a/ci/jenkinsfile/milvus_build_no_ut.groovy +++ b/ci/jenkinsfile/milvus_build_no_ut.groovy @@ -15,8 +15,6 @@ container('milvus-build-env') { && export JFROG_USER_NAME='${USERNAME}' \ && export JFROG_PASSWORD='${PASSWORD}' \ && export FAISS_URL='http://192.168.1.105:6060/jinhai/faiss/-/archive/branch-0.2.1/faiss-branch-0.2.1.tar.gz' \ - && export http_proxy=http://proxy.zilliz.tech:1087 \ - && export https_proxy=http://proxy.zilliz.tech:1087 \ && ./build.sh -t ${params.BUILD_TYPE} -j" sh "./coverage.sh -u root -p Fantast1c -t 192.168.1.194" } diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index f61928d29e..630a83e347 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -43,13 +43,13 @@ Please mark all change in change log and use the ticket from JIRA. - MS-608 - Update TODO names - MS-609 - Update task construct function - MS-611 - Add resources validity check in ResourceMgr -- MS-614 - Preload table at startup - MS-619 - Add optimizer class in scheduler - MS-626 - Refactor DataObj to support cache any type data - MS-648 - Improve unittest - MS-655 - Upgrade SPTAG ## New Feature +- MS-614 - Preload table at startup - MS-627 - Integrate new index: IVFSQHybrid - MS-631 - IVFSQ8H Index support - MS-636 - Add optimizer in scheduler for FAISS_IVFSQ8H diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index d22556bbf0..ade57c06ad 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -268,7 +268,8 @@ if(DEFINED ENV{MILVUS_BOOST_URL}) else() string(REPLACE "." "_" BOOST_VERSION_UNDERSCORES ${BOOST_VERSION}) set(BOOST_SOURCE_URL - "https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz") + "https://nchc.dl.sourceforge.net/project/boost/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz") + #"https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_UNDERSCORES}.tar.gz") endif() set(BOOST_MD5 "fea771fe8176828fabf9c09242ee8c26") From 2590072bb21c9ba10ec3f00f27e9752f408040d4 Mon Sep 17 00:00:00 2001 From: Zhiru Date: Tue, 15 Oct 2019 18:12:44 +0800 Subject: [PATCH 3/4] add build_deps.sh Former-commit-id: aedd4ad1c93658f7d1d13457b085b832d025c225 --- core/CHANGELOG.md | 3 ++- core/ubuntu_build_deps.sh | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 core/ubuntu_build_deps.sh diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index f61928d29e..097c7ed883 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -67,7 +67,8 @@ Please mark all change in change log and use the ticket from JIRA. - MS-610 - Change error code base value from hex to decimal - MS-624 - Re-organize project directory for open-source - MS-635 - Add compile option to support customized faiss - +- MS-660 - add ubuntu_build_deps.sh + # Milvus 0.4.0 (2019-09-12) ## Bug diff --git a/core/ubuntu_build_deps.sh b/core/ubuntu_build_deps.sh new file mode 100755 index 0000000000..06f05fa49f --- /dev/null +++ b/core/ubuntu_build_deps.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +sudo apt-get install -y gfortran libmysqlclient-dev mysql-client libcurl4-openssl-dev + +sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so From 35f00acbad8a1218ee7fdc7cdb5c47890edafed1 Mon Sep 17 00:00:00 2001 From: Zhiru Date: Tue, 15 Oct 2019 18:13:54 +0800 Subject: [PATCH 4/4] add build_deps.sh Former-commit-id: 2bcabfc54c0c690977ebbd3d67f812f6538d44a9 --- core/build_deps.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 core/build_deps.sh diff --git a/core/build_deps.sh b/core/build_deps.sh deleted file mode 100755 index 06f05fa49f..0000000000 --- a/core/build_deps.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -sudo apt-get install -y gfortran libmysqlclient-dev mysql-client libcurl4-openssl-dev - -sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so