From b2e37f1e94cb1ebc247ef6cb26782c6763702dae Mon Sep 17 00:00:00 2001 From: Yukikaze-CZR Date: Sat, 23 Nov 2019 15:37:36 +0800 Subject: [PATCH 1/4] #502 C++ SDK support IVFPQ and SPTAG --- core/src/sdk/examples/utils/Utils.cpp | 6 ++++++ core/src/sdk/include/MilvusApi.h | 3 +++ 2 files changed, 9 insertions(+) diff --git a/core/src/sdk/examples/utils/Utils.cpp b/core/src/sdk/examples/utils/Utils.cpp index fa373cd498..d3bf9eec25 100644 --- a/core/src/sdk/examples/utils/Utils.cpp +++ b/core/src/sdk/examples/utils/Utils.cpp @@ -99,6 +99,12 @@ Utils::IndexTypeName(const milvus::IndexType& index_type) { return "NSG"; case milvus::IndexType::IVFSQ8H: return "IVFSQ8H"; + case milvus::IndexType::IVFPQ: + return "IVFPQ"; + case milvus::IndexType::SPTAGKDT: + return "SPTAGKDT"; + case milvus::IndexType::SPTAGBKT: + return "SPTAGBKT"; default: return "Unknown index type"; } diff --git a/core/src/sdk/include/MilvusApi.h b/core/src/sdk/include/MilvusApi.h index 9fa98deb40..5c7736d4e2 100644 --- a/core/src/sdk/include/MilvusApi.h +++ b/core/src/sdk/include/MilvusApi.h @@ -37,6 +37,9 @@ enum class IndexType { IVFSQ8 = 3, NSG = 4, IVFSQ8H = 5, + IVFPQ = 6, + SPTAGKDT = 7, + SPTAGBKT = 8, }; enum class MetricType { From d3940919287513fdccf38c00a7007334623dd7b3 Mon Sep 17 00:00:00 2001 From: Yukikaze-CZR Date: Sat, 23 Nov 2019 15:49:33 +0800 Subject: [PATCH 2/4] #502 Changelog upgrade --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccbbe9f64e..53e427dcb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ Please mark all change in change log and use the ticket from JIRA. - \#227 - Support new index types SPTAG-KDT and SPTAG-BKT - \#346 - Support build index with multiple gpu - \#488 - Add log in scheduler/optimizer +- \#502 - C++ SDK support IVFPQ and SPTAG ## Improvement - \#255 - Add ivfsq8 test report detailed version From 7924bd874f713250efae3791323972a95a2b3127 Mon Sep 17 00:00:00 2001 From: "G.Y Feng" Date: Sat, 23 Nov 2019 18:02:36 +0800 Subject: [PATCH 3/4] Update README_CN.md add a C++ sdk link --- README_CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index 374cefa9bd..b101ea0570 100644 --- a/README_CN.md +++ b/README_CN.md @@ -15,7 +15,7 @@ Milvus 是一款开源的、针对海量特征向量的相似性搜索引擎。 若要了解 Milvus 详细介绍和整体架构，请访问 [Milvus 简介](https://www.milvus.io/docs/zh-CN/aboutmilvus/overview/)。 -Milvus 提供稳定的 [Python](https://github.com/milvus-io/pymilvus)、[Java](https://github.com/milvus-io/milvus-sdk-java) 以及 C++ 的 API 接口。 +Milvus 提供稳定的 [Python](https://github.com/milvus-io/pymilvus)、[Java](https://github.com/milvus-io/milvus-sdk-java) 以及[C++](https://github.com/milvus-io/milvus/tree/master/core/src/sdk) 的 API 接口。 通过 [版本发布说明](https://milvus.io/docs/zh-CN/release/v0.5.3/) 获取最新版本的功能和更新。 From 8bd9202527fff9a08261fd35c30cc830319c16b3 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Sat, 23 Nov 2019 19:08:19 +0800 Subject: [PATCH 4/4] fixed Helm Release Name bug --- ci/jenkins/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index d426666e9d..0eed167fb4 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -114,7 +114,7 @@ pipeline { stage("Deploy to Development") { environment { - FROMAT_SEMVER = "${env.SEMVER}".replaceAll(".", "-") + FROMAT_SEMVER = "${env.SEMVER}".replaceAll("\\.", "-") HELM_RELEASE_NAME = "${env.PIPELINE_NAME}-${env.FROMAT_SEMVER}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}".toLowerCase() } @@ -249,7 +249,7 @@ pipeline { stage("Deploy to Development") { environment { - FROMAT_SEMVER = "${env.SEMVER}".replaceAll(".", "-") + FROMAT_SEMVER = "${env.SEMVER}".replaceAll("\\.", "-") HELM_RELEASE_NAME = "${env.PIPELINE_NAME}-${env.FROMAT_SEMVER}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION}".toLowerCase() }