Merge pull request #312 from cydrain/caiyd_rename_indextype

#275 rename c++ sdk IndexType
This commit is contained in:
Jin Hai 2019-11-13 15:13:03 +08:00 committed by GitHub
commit 224ad14085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 16 deletions

View File

@ -13,6 +13,7 @@ Please mark all change in change log and use the ticket from JIRA.
- \#226 - Experimental shards middleware for Milvus
## Improvement
- \#275 - Rename C++ SDK IndexType
- \#284 - Change C++ SDK to shared library
- \#260 - C++ SDK README

View File

@ -41,7 +41,7 @@ constexpr int64_t NQ = 5;
constexpr int64_t TOP_K = 10;
constexpr int64_t NPROBE = 32;
constexpr int64_t SEARCH_TARGET = 5000; // change this value, result is different
constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::gpu_ivfsq8;
constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::IVFSQ8;
constexpr int32_t N_LIST = 15000;
constexpr int32_t PARTITION_COUNT = 5;
constexpr int32_t TARGET_PARTITION = 3;

View File

@ -41,7 +41,7 @@ constexpr int64_t TOP_K = 10;
constexpr int64_t NPROBE = 32;
constexpr int64_t SEARCH_TARGET = 5000; // change this value, result is different
constexpr int64_t ADD_VECTOR_LOOP = 5;
constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::gpu_ivfsq8;
constexpr milvus::IndexType INDEX_TYPE = milvus::IndexType::IVFSQ8;
constexpr int32_t N_LIST = 15000;
milvus::TableSchema

View File

@ -89,14 +89,16 @@ Utils::MetricTypeName(const milvus::MetricType& metric_type) {
std::string
Utils::IndexTypeName(const milvus::IndexType& index_type) {
switch (index_type) {
case milvus::IndexType::cpu_idmap:
return "cpu idmap";
case milvus::IndexType::gpu_ivfflat:
return "gpu ivflat";
case milvus::IndexType::gpu_ivfsq8:
return "gpu ivfsq8";
case milvus::IndexType::mix_nsg:
return "mix nsg";
case milvus::IndexType::FLAT:
return "FLAT";
case milvus::IndexType::IVFFLAT:
return "IVFFLAT";
case milvus::IndexType::IVFSQ8:
return "IVFSQ8";
case milvus::IndexType::NSG:
return "NSG";
case milvus::IndexType::IVFSQ8H:
return "IVFSQ8H";
default:
return "Unknown index type";
}

View File

@ -31,12 +31,12 @@ namespace milvus {
* @brief Index Type
*/
enum class IndexType {
invalid = 0,
cpu_idmap,
gpu_ivfflat,
gpu_ivfsq8,
mix_nsg,
ivfsq8h,
INVALID = 0,
FLAT = 1,
IVFFLAT = 2,
IVFSQ8 = 3,
NSG = 4,
IVFSQ8H = 5,
};
enum class MetricType {