From 0d6966b41bc9699792e4ffad0c23b0774fa9d8ee Mon Sep 17 00:00:00 2001 From: zhiru Date: Mon, 14 Oct 2019 17:19:10 +0800 Subject: [PATCH 01/11] update grpc download url to https://github.com/youny626/grpc-milvus/archive/master.zip Former-commit-id: 06dfa0e0876376498d48d09d5b7c4d2ee634fbbc --- core/cmake/ThirdPartyPackages.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index 5347aa0aca..f5e62152a1 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -370,7 +370,7 @@ if(DEFINED ENV{MILVUS_GRPC_URL}) set(GRPC_SOURCE_URL "$ENV{MILVUS_GRPC_URL}") else() set(GRPC_SOURCE_URL - "http://git.zilliz.tech/kun.yu/grpc/-/archive/master/grpc-master.tar.gz") + "https://github.com/youny626/grpc-milvus/archive/master.zip") endif() set(GRPC_MD5 "7ec59ad54c85a12dcbbfede09bf413a9") From 44eda65b41f75343e7c098024346705b1f84ef0a Mon Sep 17 00:00:00 2001 From: zhiru Date: Mon, 14 Oct 2019 17:35:21 +0800 Subject: [PATCH 02/11] update grpc download url to https://github.com/youny626/grpc-milvus/archive/master.zip Former-commit-id: ae1134f8ab9b2e7c7f1c4c1464993c35d1491fd5 --- core/cmake/ThirdPartyPackages.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index f5e62152a1..a7632831b0 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -370,9 +370,9 @@ if(DEFINED ENV{MILVUS_GRPC_URL}) set(GRPC_SOURCE_URL "$ENV{MILVUS_GRPC_URL}") else() set(GRPC_SOURCE_URL - "https://github.com/youny626/grpc-milvus/archive/master.zip") + "https://github.com/youny626/grpc-milvus/archive/${GRPC_VERSION}.zip") endif() -set(GRPC_MD5 "7ec59ad54c85a12dcbbfede09bf413a9") +set(GRPC_MD5 "fdd2656424c0e0e046b21354513fc70f") # ---------------------------------------------------------------------- From 44b830639a51bf404b8d5c378fe612b7591736b1 Mon Sep 17 00:00:00 2001 From: "yudong.cai" Date: Mon, 14 Oct 2019 18:20:15 +0800 Subject: [PATCH 03/11] MS-606 fix result reduce bug Former-commit-id: 86bf350874b7a5ec72e77eea2be1f8a5a8548e19 --- core/src/scheduler/task/SearchTask.cpp | 9 +- core/unittest/db/test_search.cpp | 125 ++++++++++++++----------- 2 files changed, 76 insertions(+), 58 deletions(-) diff --git a/core/src/scheduler/task/SearchTask.cpp b/core/src/scheduler/task/SearchTask.cpp index b5f1599eba..b7a1e211d2 100644 --- a/core/src/scheduler/task/SearchTask.cpp +++ b/core/src/scheduler/task/SearchTask.cpp @@ -315,10 +315,10 @@ XSearchTask::MergeTopkArray(std::vector& tar_ids, std::vector& t return; } - std::vector id_buf(nq * topk, -1); - std::vector dist_buf(nq * topk, 0.0); - uint64_t output_k = std::min(topk, tar_input_k + src_input_k); + std::vector id_buf(nq * output_k, -1); + std::vector dist_buf(nq * output_k, 0.0); + uint64_t buf_k, src_k, tar_k; uint64_t src_idx, tar_idx, buf_idx; uint64_t src_input_k_multi_i, tar_input_k_multi_i, buf_k_multi_i; @@ -349,6 +349,7 @@ XSearchTask::MergeTopkArray(std::vector& tar_ids, std::vector& t if (src_k < src_input_k) { while (buf_k < output_k && src_k < src_input_k) { src_idx = src_input_k_multi_i + src_k; + buf_idx = buf_k_multi_i + buf_k; id_buf[buf_idx] = src_ids[src_idx]; dist_buf[buf_idx] = src_distance[src_idx]; src_k++; @@ -356,6 +357,8 @@ XSearchTask::MergeTopkArray(std::vector& tar_ids, std::vector& t } } else { while (buf_k < output_k && tar_k < tar_input_k) { + tar_idx = tar_input_k_multi_i + tar_k; + buf_idx = buf_k_multi_i + buf_k; id_buf[buf_idx] = tar_ids[tar_idx]; dist_buf[buf_idx] = tar_distance[tar_idx]; tar_k++; diff --git a/core/unittest/db/test_search.cpp b/core/unittest/db/test_search.cpp index b0ce9a28b6..dc393b7a26 100644 --- a/core/unittest/db/test_search.cpp +++ b/core/unittest/db/test_search.cpp @@ -110,87 +110,102 @@ CheckTopkResult(const std::vector& input_ids_1, } // namespace -TEST(DBSearchTest, TOPK_TEST) { - uint64_t NQ = 15; - uint64_t TOP_K = 64; - bool ascending; +void MergeTopkToResultSetTest(uint64_t topk_1, uint64_t topk_2, uint64_t nq, uint64_t topk, bool ascending) { std::vector ids1, ids2; std::vector dist1, dist2; ms::ResultSet result; + BuildResult(ids1, dist1, topk_1, nq, ascending); + BuildResult(ids2, dist2, topk_2, nq, ascending); + ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, topk_1, nq, topk, ascending, result); + ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, topk_2, nq, topk, ascending, result); + CheckTopkResult(ids1, dist1, ids2, dist2, topk, nq, ascending, result); +} + +TEST(DBSearchTest, MERGE_RESULT_SET_TEST) { + uint64_t NQ = 15; + uint64_t TOP_K = 64; /* test1, id1/dist1 valid, id2/dist2 empty */ - ascending = true; - BuildResult(ids1, dist1, TOP_K, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, TOP_K, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkToResultSetTest(TOP_K, 0, NQ, TOP_K, true); + MergeTopkToResultSetTest(TOP_K, 0, NQ, TOP_K, false); /* test2, id1/dist1 valid, id2/dist2 valid */ - BuildResult(ids2, dist2, TOP_K, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, TOP_K, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkToResultSetTest(TOP_K, TOP_K, NQ, TOP_K, true); + MergeTopkToResultSetTest(TOP_K, TOP_K, NQ, TOP_K, false); /* test3, id1/dist1 small topk */ - ids1.clear(); - dist1.clear(); - result.clear(); - BuildResult(ids1, dist1, TOP_K/2, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, TOP_K/2, NQ, TOP_K, ascending, result); - ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, TOP_K, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkToResultSetTest(TOP_K/2, TOP_K, NQ, TOP_K, true); + MergeTopkToResultSetTest(TOP_K/2, TOP_K, NQ, TOP_K, false); /* test4, id1/dist1 small topk, id2/dist2 small topk */ - ids2.clear(); - dist2.clear(); - result.clear(); - BuildResult(ids2, dist2, TOP_K/3, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, TOP_K/2, NQ, TOP_K, ascending, result); - ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, TOP_K/3, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkToResultSetTest(TOP_K/2, TOP_K/3, NQ, TOP_K, true); + MergeTopkToResultSetTest(TOP_K/2, TOP_K/3, NQ, TOP_K, false); +} -///////////////////////////////////////////////////////////////////////////////////////// - ascending = false; - ids1.clear(); - dist1.clear(); - ids2.clear(); - dist2.clear(); - result.clear(); +void MergeTopkArrayTest(uint64_t topk_1, uint64_t topk_2, uint64_t nq, uint64_t topk, bool ascending) { + std::vector ids1, ids2; + std::vector dist1, dist2; + ms::ResultSet result; + BuildResult(ids1, dist1, topk_1, nq, ascending); + BuildResult(ids2, dist2, topk_2, nq, ascending); + uint64_t result_topk = std::min(topk, topk_1 + topk_2); + ms::XSearchTask::MergeTopkArray(ids1, dist1, topk_1, ids2, dist2, topk_2, nq, topk, ascending); + if (ids1.size() != result_topk * nq) { + std::cout << ids1.size() << " " << result_topk * nq << std::endl; + } + ASSERT_TRUE(ids1.size() == result_topk * nq); + ASSERT_TRUE(dist1.size() == result_topk * nq); + for (uint64_t i = 0; i < nq; i++) { + for (uint64_t k = 1; k < result_topk; k++) { + if (ascending) { + if (dist1[i * result_topk + k] < dist1[i * result_topk + k - 1]) { + std::cout << dist1[i * result_topk + k - 1] << " " << dist1[i * result_topk + k] << std::endl; + } + ASSERT_TRUE(dist1[i * result_topk + k] >= dist1[i * result_topk + k - 1]); + } else { + if (dist1[i * result_topk + k] > dist1[i * result_topk + k - 1]) { + std::cout << dist1[i * result_topk + k - 1] << " " << dist1[i * result_topk + k] << std::endl; + } + ASSERT_TRUE(dist1[i * result_topk + k] <= dist1[i * result_topk + k - 1]); + } + } + } +} + +TEST(DBSearchTest, MERGE_ARRAY_TEST) { + uint64_t NQ = 15; + uint64_t TOP_K = 64; /* test1, id1/dist1 valid, id2/dist2 empty */ - BuildResult(ids1, dist1, TOP_K, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, TOP_K, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkArrayTest(TOP_K, 0, NQ, TOP_K, true); + MergeTopkArrayTest(TOP_K, 0, NQ, TOP_K, false); + MergeTopkArrayTest(0, TOP_K, NQ, TOP_K, true); + MergeTopkArrayTest(0, TOP_K, NQ, TOP_K, false); /* test2, id1/dist1 valid, id2/dist2 valid */ - BuildResult(ids2, dist2, TOP_K, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, TOP_K, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkArrayTest(TOP_K, TOP_K, NQ, TOP_K, true); + MergeTopkArrayTest(TOP_K, TOP_K, NQ, TOP_K, false); /* test3, id1/dist1 small topk */ - ids1.clear(); - dist1.clear(); - result.clear(); - BuildResult(ids1, dist1, TOP_K/2, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, TOP_K/2, NQ, TOP_K, ascending, result); - ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, TOP_K, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkArrayTest(TOP_K/2, TOP_K, NQ, TOP_K, true); + MergeTopkArrayTest(TOP_K/2, TOP_K, NQ, TOP_K, false); + MergeTopkArrayTest(TOP_K, TOP_K/2, NQ, TOP_K, true); + MergeTopkArrayTest(TOP_K, TOP_K/2, NQ, TOP_K, false); /* test4, id1/dist1 small topk, id2/dist2 small topk */ - ids2.clear(); - dist2.clear(); - result.clear(); - BuildResult(ids2, dist2, TOP_K/3, NQ, ascending); - ms::XSearchTask::MergeTopkToResultSet(ids1, dist1, TOP_K/2, NQ, TOP_K, ascending, result); - ms::XSearchTask::MergeTopkToResultSet(ids2, dist2, TOP_K/3, NQ, TOP_K, ascending, result); - CheckTopkResult(ids1, dist1, ids2, dist2, TOP_K, NQ, ascending, result); + MergeTopkArrayTest(TOP_K/2, TOP_K/3, NQ, TOP_K, true); + MergeTopkArrayTest(TOP_K/2, TOP_K/3, NQ, TOP_K, false); + MergeTopkArrayTest(TOP_K/3, TOP_K/2, NQ, TOP_K, true); + MergeTopkArrayTest(TOP_K/3, TOP_K/2, NQ, TOP_K, false); } TEST(DBSearchTest, REDUCE_PERF_TEST) { int32_t index_file_num = 478; /* sift1B dataset, index files num */ bool ascending = true; - std::vector thread_vec = {4, 8, 11}; - std::vector nq_vec = {1, 10, 100, 1000}; - std::vector topk_vec = {1, 4, 16, 64, 256, 1024}; + std::vector thread_vec = {4, 8}; + std::vector nq_vec = {1, 10, 100}; + std::vector topk_vec = {1, 4, 16, 64}; int32_t NQ = nq_vec[nq_vec.size()-1]; int32_t TOPK = topk_vec[topk_vec.size()-1]; From 8a2d5c8296b0c56e670c96a4dad5ed7c553962db Mon Sep 17 00:00:00 2001 From: "xiaojun.lin" Date: Mon, 14 Oct 2019 19:20:08 +0800 Subject: [PATCH 04/11] fix copy_cpu_to_gpu Former-commit-id: 8703a392ac93bd9450492a6841a169bb2287c6ea --- .../index/vector_index/IndexIVFSQHybrid.cpp | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp b/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp index e44d049a1a..9b6bebd79a 100644 --- a/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp +++ b/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp @@ -79,8 +79,24 @@ IVFSQHybrid::CopyGpuToCpu(const Config& config) { VectorIndexPtr IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) { - auto p = CopyCpuToGpuWithQuantizer(device_id, config); - return p.first; + if (auto res = FaissGpuResourceMgr::GetInstance().GetRes(device_id)) { + ResScope rs(res, device_id, false); + faiss::gpu::GpuClonerOptions option; + option.allInGpu = true; + + faiss::IndexComposition index_composition; + index_composition.index = index_.get(); + index_composition.quantizer = nullptr; + index_composition.mode = 0; // copy all + + auto gpu_index = faiss::gpu::index_cpu_to_gpu(res->faiss_res.get(), device_id, &index_composition, &option); + + std::shared_ptr device_index = std::shared_ptr(gpu_index);; + auto new_idx = std::make_shared(device_index, device_id, res); + return new_idx; + } else { + KNOWHERE_THROW_MSG("CopyCpuToGpu Error, can't get gpu_resource"); + } } void From 80339fae7b488a8eff931c9cd7f89e9c67854bdf Mon Sep 17 00:00:00 2001 From: "xiaojun.lin" Date: Mon, 14 Oct 2019 19:24:29 +0800 Subject: [PATCH 05/11] update Former-commit-id: 34c175b32ce8eaab4505759e80c61128e34262f8 --- core/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 6c561c0e5a..8b6b125b8e 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -17,6 +17,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-640 - Cache object size calculate incorrect - MS-641 - Segment fault(signal 11) in PickToLoad - MS-639 - SQ8H index created failed and server hang +- MS-652 - IVFSQH quantization double free ## Improvement - MS-552 - Add and change the easylogging library From a3bc7dee4cca10ceb27952e31d963c39f94c1be2 Mon Sep 17 00:00:00 2001 From: "xiaojun.lin" Date: Mon, 14 Oct 2019 19:51:37 +0800 Subject: [PATCH 06/11] UPDATE LINT Former-commit-id: 6cf032ad6c5d714e643327d57b52ffae0ea2098c --- .../knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp b/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp index 9b6bebd79a..da0ed2283c 100644 --- a/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp +++ b/core/src/index/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp @@ -27,6 +27,7 @@ namespace knowhere { #ifdef CUSTOMIZATION + IndexModelPtr IVFSQHybrid::Train(const DatasetPtr& dataset, const Config& config) { auto build_cfg = std::dynamic_pointer_cast(config); @@ -91,7 +92,7 @@ IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) { auto gpu_index = faiss::gpu::index_cpu_to_gpu(res->faiss_res.get(), device_id, &index_composition, &option); - std::shared_ptr device_index = std::shared_ptr(gpu_index);; + std::shared_ptr device_index = std::shared_ptr(gpu_index); auto new_idx = std::make_shared(device_index, device_id, res); return new_idx; } else { From b5d1f57ff2fe0c3eb0c185449c6031cba681787c Mon Sep 17 00:00:00 2001 From: quicksilver Date: Mon, 14 Oct 2019 20:00:08 +0800 Subject: [PATCH 07/11] check thirdparty cache directory status Former-commit-id: 573e28369c6466f9de23c6e92dac903bde23429e --- core/cmake/ThirdPartyPackages.cmake | 4 ++++ core/src/index/cmake/ThirdPartyPackagesCore.cmake | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index a7632831b0..48231e6d06 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -158,6 +158,10 @@ if(USE_JFROG_CACHE STREQUAL "ON") endif() set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache") + if(NOT EXISTS ${THIRDPARTY_PACKAGE_CACHE}) + message(STATUS "Will create cached directory: ${THIRDPARTY_PACKAGE_CACHE}") + file(MAKE_DIRECTORY ${THIRDPARTY_PACKAGE_CACHE}) + endif() endif() macro(resolve_dependency DEPENDENCY_NAME) diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake index 12d5c2a711..4c233125bc 100644 --- a/core/src/index/cmake/ThirdPartyPackagesCore.cmake +++ b/core/src/index/cmake/ThirdPartyPackagesCore.cmake @@ -125,6 +125,10 @@ endif() if(USE_JFROG_CACHE STREQUAL "ON") set(JFROG_ARTFACTORY_CACHE_URL "${JFROG_ARTFACTORY_URL}/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${KNOWHERE_BUILD_ARCH}/${BUILD_TYPE}") set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache") + if(NOT EXISTS ${THIRDPARTY_PACKAGE_CACHE}) + message(STATUS "Will create cached directory: ${THIRDPARTY_PACKAGE_CACHE}") + file(MAKE_DIRECTORY ${THIRDPARTY_PACKAGE_CACHE}) + endif() endif() macro(resolve_dependency DEPENDENCY_NAME) From b9040295297171bdd822a04ab0ac4a0d88a93d74 Mon Sep 17 00:00:00 2001 From: zhiru Date: Mon, 14 Oct 2019 20:17:20 +0800 Subject: [PATCH 08/11] update grpc download md5 Former-commit-id: c6840e3bc4e8baaa09c457e3dd80c931f88c112c --- core/cmake/ThirdPartyPackages.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index a7632831b0..23182cee59 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -372,7 +372,7 @@ else() set(GRPC_SOURCE_URL "https://github.com/youny626/grpc-milvus/archive/${GRPC_VERSION}.zip") endif() -set(GRPC_MD5 "fdd2656424c0e0e046b21354513fc70f") +set(GRPC_MD5 "0362ba219f59432c530070b5f5c3df73") # ---------------------------------------------------------------------- From 63fbc43fbc53d624cc2843109cca1f56abd957ee Mon Sep 17 00:00:00 2001 From: zhiru Date: Mon, 14 Oct 2019 20:20:52 +0800 Subject: [PATCH 09/11] switch back sqlite orm url Former-commit-id: 1de6661e2ede4ef8336d812df61decca50f40d93 --- core/cmake/ThirdPartyPackages.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index 23182cee59..d32875f7e0 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -324,8 +324,8 @@ if(DEFINED ENV{MILVUS_SQLITE_ORM_URL}) set(SQLITE_ORM_SOURCE_URL "$ENV{MILVUS_SQLITE_ORM_URL}") else() set(SQLITE_ORM_SOURCE_URL - "http://192.168.1.105:6060/Test/sqlite_orm/-/archive/master/sqlite_orm-master.zip") -# "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip") +# "http://192.168.1.105:6060/Test/sqlite_orm/-/archive/master/sqlite_orm-master.zip") + "https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.zip") endif() set(SQLITE_ORM_MD5 "ba9a405a8a1421c093aa8ce988ff8598") From 1278e8bfd2fc4c9b7f69966de46572c19b3383b6 Mon Sep 17 00:00:00 2001 From: jinhai Date: Mon, 14 Oct 2019 20:49:52 +0800 Subject: [PATCH 10/11] Update milvus_build.groovy Former-commit-id: 4abbc16329c5f9603af6c6aacc61efef1df5d8e2 --- ci/jenkinsfile/milvus_build.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkinsfile/milvus_build.groovy b/ci/jenkinsfile/milvus_build.groovy index 63c9850d18..663d2e0f77 100644 --- a/ci/jenkinsfile/milvus_build.groovy +++ b/ci/jenkinsfile/milvus_build.groovy @@ -1,5 +1,5 @@ container('milvus-build-env') { - timeout(time: 40, unit: 'MINUTES') { + timeout(time: 120, unit: 'MINUTES') { gitlabCommitStatus(name: 'Build Engine') { dir ("milvus_engine") { try { From c11820aff16cf987bb8943251b03cacc67ef191c Mon Sep 17 00:00:00 2001 From: jinhai Date: Mon, 14 Oct 2019 20:50:15 +0800 Subject: [PATCH 11/11] Update milvus_build_no_ut.groovy Former-commit-id: fa74d0a126b5cccd104309e9e26737b1d3942e37 --- ci/jenkinsfile/milvus_build_no_ut.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkinsfile/milvus_build_no_ut.groovy b/ci/jenkinsfile/milvus_build_no_ut.groovy index 9947cf2c84..cea9c8550b 100644 --- a/ci/jenkinsfile/milvus_build_no_ut.groovy +++ b/ci/jenkinsfile/milvus_build_no_ut.groovy @@ -1,5 +1,5 @@ container('milvus-build-env') { - timeout(time: 40, unit: 'MINUTES') { + timeout(time: 120, unit: 'MINUTES') { gitlabCommitStatus(name: 'Build Engine') { dir ("milvus_engine") { try {