admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-06 10:52:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into config-bug

Browse Source
This commit is contained in:
Yhz 2020-03-09 09:23:15 +08:00
commit da469d1b3b
6 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -45,6 +45,7 @@ Please mark all change in change log and use the issue from GitHub
- \#1535 Degradation searching performance with metric_type: binary_idmap
- \#1549 Fix server/wal config setting bug
- \#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
@ -94,6 +95,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

8
core/conf/demo/server_config.yaml
View File

@ -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, SSE 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| | |

8
core/conf/server_cpu_config.template
View File

@ -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, SSE 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| | |

8
core/conf/server_gpu_config.template
View File

@ -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, SSE 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| | |

2
core/src/wrapper/ConfAdapter.cpp
View File

@ -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

2
core/unittest/wrapper/test_wrapper.cpp
View File

@ -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),