From c7bc4a8a224929ee749c98d2cf91ffc28f3f1abc Mon Sep 17 00:00:00 2001 From: "xiaojun.lin" Date: Sun, 8 Mar 2020 14:21:59 +0800 Subject: [PATCH 1/4] update max_support_dim Signed-off-by: xiaojun.lin --- CHANGELOG.md | 1 + core/src/wrapper/ConfAdapter.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 951494dddc..221a6891dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ Please mark all change in change log and use the issue from GitHub - \#1532 Search with ivf_flat failed with open-dataset: sift-256-hamming - \#1535 Degradation searching performance with metric_type: binary_idmap - \#1556 Index file not created after table and index created +- \#1560 Search crashed with Super-high dimensional binary vector ## Feature - \#216 Add CLI to get server info diff --git a/core/src/wrapper/ConfAdapter.cpp b/core/src/wrapper/ConfAdapter.cpp index 7742f3bab7..db06504def 100644 --- a/core/src/wrapper/ConfAdapter.cpp +++ b/core/src/wrapper/ConfAdapter.cpp @@ -31,7 +31,7 @@ namespace engine { #define GPU_MAX_NRPOBE 1024 #endif -#define DEFAULT_MAX_DIM 16384 +#define DEFAULT_MAX_DIM 32768 #define DEFAULT_MIN_DIM 1 #define DEFAULT_MAX_K 16384 #define DEFAULT_MIN_K 1 From 0ce5a3f5eb34ebf59a9326ba5a1d65cc787da0e0 Mon Sep 17 00:00:00 2001 From: "xiaojun.lin" Date: Sun, 8 Mar 2020 16:15:59 +0800 Subject: [PATCH 2/4] update. Signed-off-by: xiaojun.lin --- core/unittest/wrapper/test_wrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/unittest/wrapper/test_wrapper.cpp b/core/unittest/wrapper/test_wrapper.cpp index ba3ed0f1a1..65e672e8c6 100644 --- a/core/unittest/wrapper/test_wrapper.cpp +++ b/core/unittest/wrapper/test_wrapper.cpp @@ -85,7 +85,7 @@ INSTANTIATE_TEST_CASE_P( // std::make_tuple(milvus::engine::IndexType::NSG_MIX, "Default", 128, 250000, 10, 10), #endif // std::make_tuple(milvus::engine::IndexType::SPTAG_KDT_RNT_CPU, "Default", 128, 100, 10, 10), - // std::make_tuple(milvus::engine::IndexType::SPTAG_BKT_RNT_CPU, "Default", 128, 100, 10, 10), + // std::make_tuple(milvus::engine::IndexType::SPTAG_BKT_RNT_CPU, "Default", 126, 100, 10, 10), std::make_tuple(milvus::engine::IndexType::HNSW, "Default", 64, 10000, 5, 10), std::make_tuple(milvus::engine::IndexType::FAISS_IDMAP, "Default", 64, 1000, 10, 10), std::make_tuple(milvus::engine::IndexType::FAISS_IVFFLAT_CPU, "Default", 64, 1000, 10, 10), From aedde79f264f618d54c20c0dc0a13e9742f00912 Mon Sep 17 00:00:00 2001 From: "yudong.cai" Date: Sun, 8 Mar 2020 19:14:40 +0800 Subject: [PATCH 3/4] #1567 update yaml config description Signed-off-by: yudong.cai --- CHANGELOG.md | 1 + core/conf/demo/server_config.yaml | 2 +- core/conf/server_cpu_config.template | 2 +- core/conf/server_gpu_config.template | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 951494dddc..90c0754faa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -93,6 +93,7 @@ Please mark all change in change log and use the issue from GitHub - \#1480 Add return code for AVX512 selection - \#1524 Update config "preload_table" description - \#1544 Update resources name in HTTP module +- \#1567 Update yaml config description ## Task - \#1327 Exclude third-party code from codebeat diff --git a/core/conf/demo/server_config.yaml b/core/conf/demo/server_config.yaml index cb15b1487f..ef0e15c029 100644 --- a/core/conf/demo/server_config.yaml +++ b/core/conf/demo/server_config.yaml @@ -108,7 +108,7 @@ cache_config: # | compared with 'nq' to decide if OpenBLAS should be used. | | | # | If nq >= use_blas_threshold, OpenBLAS will be used, search | | | # | response times will be stable but the search speed will be | | | -# | slower; if nq < use_blas_threshold, SSE will be used, | | | +# | slower; if nq < use_blas_threshold, AVX will be used, | | | # | search speed will be faster but search response times will | | | # | fluctuate. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ diff --git a/core/conf/server_cpu_config.template b/core/conf/server_cpu_config.template index e511bc22f7..083a47aa25 100644 --- a/core/conf/server_cpu_config.template +++ b/core/conf/server_cpu_config.template @@ -108,7 +108,7 @@ cache_config: # | compared with 'nq' to decide if OpenBLAS should be used. | | | # | If nq >= use_blas_threshold, OpenBLAS will be used, search | | | # | response times will be stable but the search speed will be | | | -# | slower; if nq < use_blas_threshold, SSE will be used, | | | +# | slower; if nq < use_blas_threshold, AVX will be used, | | | # | search speed will be faster but search response times will | | | # | fluctuate. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ diff --git a/core/conf/server_gpu_config.template b/core/conf/server_gpu_config.template index 2a926f3f6a..f0455b1f31 100644 --- a/core/conf/server_gpu_config.template +++ b/core/conf/server_gpu_config.template @@ -108,7 +108,7 @@ cache_config: # | compared with 'nq' to decide if OpenBLAS should be used. | | | # | If nq >= use_blas_threshold, OpenBLAS will be used, search | | | # | response times will be stable but the search speed will be | | | -# | slower; if nq < use_blas_threshold, SSE will be used, | | | +# | slower; if nq < use_blas_threshold, AVX will be used, | | | # | search speed will be faster but search response times will | | | # | fluctuate. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ From c1e917636f417193626019bea89391a632637870 Mon Sep 17 00:00:00 2001 From: "yudong.cai" Date: Sun, 8 Mar 2020 19:20:24 +0800 Subject: [PATCH 4/4] #1567 update yaml config description Signed-off-by: yudong.cai --- core/conf/demo/server_config.yaml | 8 ++++---- core/conf/server_cpu_config.template | 8 ++++---- core/conf/server_gpu_config.template | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/conf/demo/server_config.yaml b/core/conf/demo/server_config.yaml index ef0e15c029..52991431e2 100644 --- a/core/conf/demo/server_config.yaml +++ b/core/conf/demo/server_config.yaml @@ -107,10 +107,10 @@ cache_config: # use_blas_threshold | A Milvus performance tuning parameter. This value will be | Integer | 1100 | # | compared with 'nq' to decide if OpenBLAS should be used. | | | # | If nq >= use_blas_threshold, OpenBLAS will be used, search | | | -# | response times will be stable but the search speed will be | | | -# | slower; if nq < use_blas_threshold, AVX will be used, | | | -# | search speed will be faster but search response times will | | | -# | fluctuate. | | | +# | response time will be stable but the search speed will be | | | +# | slower; if nq < use_blas_threshold, AVX or SSE will be | | | +# | used, search speed will be faster but search response time | | | +# | will fluctuate. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ # gpu_search_threshold | A Milvus performance tuning parameter. This value will be | Integer | 1000 | # | compared with 'nq' to decide if the search computation will| | | diff --git a/core/conf/server_cpu_config.template b/core/conf/server_cpu_config.template index 083a47aa25..2a3d52e119 100644 --- a/core/conf/server_cpu_config.template +++ b/core/conf/server_cpu_config.template @@ -107,10 +107,10 @@ cache_config: # use_blas_threshold | A Milvus performance tuning parameter. This value will be | Integer | 1100 | # | compared with 'nq' to decide if OpenBLAS should be used. | | | # | If nq >= use_blas_threshold, OpenBLAS will be used, search | | | -# | response times will be stable but the search speed will be | | | -# | slower; if nq < use_blas_threshold, AVX will be used, | | | -# | search speed will be faster but search response times will | | | -# | fluctuate. | | | +# | response time will be stable but the search speed will be | | | +# | slower; if nq < use_blas_threshold, AVX or SSE will be | | | +# | used, search speed will be faster but search response time | | | +# | will fluctuate. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ # gpu_search_threshold | A Milvus performance tuning parameter. This value will be | Integer | 1000 | # | compared with 'nq' to decide if the search computation will| | | diff --git a/core/conf/server_gpu_config.template b/core/conf/server_gpu_config.template index f0455b1f31..593d830c38 100644 --- a/core/conf/server_gpu_config.template +++ b/core/conf/server_gpu_config.template @@ -107,10 +107,10 @@ cache_config: # use_blas_threshold | A Milvus performance tuning parameter. This value will be | Integer | 1100 | # | compared with 'nq' to decide if OpenBLAS should be used. | | | # | If nq >= use_blas_threshold, OpenBLAS will be used, search | | | -# | response times will be stable but the search speed will be | | | -# | slower; if nq < use_blas_threshold, AVX will be used, | | | -# | search speed will be faster but search response times will | | | -# | fluctuate. | | | +# | response time will be stable but the search speed will be | | | +# | slower; if nq < use_blas_threshold, AVX or SSE will be | | | +# | used, search speed will be faster but search response time | | | +# | will fluctuate. | | | #----------------------+------------------------------------------------------------+------------+-----------------+ # gpu_search_threshold | A Milvus performance tuning parameter. This value will be | Integer | 1000 | # | compared with 'nq' to decide if the search computation will| | |