From 17fda2692261afd9c536803dddf0ad2202f2c18f Mon Sep 17 00:00:00 2001
From: "xiaojun.lin" <xiaojun.lin@zilliz.com>
Date: Mon, 25 Nov 2019 16:17:16 +0800
Subject: [PATCH] fix issue-509

---
 CHANGELOG.md                     |  1 +
 core/src/wrapper/ConfAdapter.cpp | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53e427dcb9..8012630e0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - \#440 - Server cannot startup with gpu_resource_config.enable=false in GPU version
 - \#458 - Index data is not compatible between 0.5 and 0.6
 - \#486 - gpu no usage during index building
+- \#509 - IVF_PQ index build trapped into dead loop caused by invalid params
 
 ## Feature
 - \#12 - Pure CPU version for Milvus
diff --git a/core/src/wrapper/ConfAdapter.cpp b/core/src/wrapper/ConfAdapter.cpp
index aa4b3c12b8..cf9f1a0474 100644
--- a/core/src/wrapper/ConfAdapter.cpp
+++ b/core/src/wrapper/ConfAdapter.cpp
@@ -22,6 +22,7 @@
 
 #include <cmath>
 #include <memory>
+#include <vector>
 
 // TODO(lxj): add conf checker
 
@@ -121,6 +122,13 @@ IVFSQConfAdapter::Match(const TempMetaConf& metaconf) {
     return conf;
 }
 
+#define MatchSubQuantizer(c)                           \
+    if (!(conf->d % c)) {                              \
+        WRAPPER_LOG_DEBUG << "PQ m = " << conf->d / c; \
+        conf->m = conf->d / c;                         \
+        return conf;                                   \
+    }
+
 knowhere::Config
 IVFPQConfAdapter::Match(const TempMetaConf& metaconf) {
     auto conf = std::make_shared<knowhere::IVFPQCfg>();
@@ -129,18 +137,18 @@ IVFPQConfAdapter::Match(const TempMetaConf& metaconf) {
     conf->metric_type = metaconf.metric_type;
     conf->gpu_id = metaconf.gpu_id;
     conf->nbits = 8;
-
-    if (!(conf->d % 4))
-        conf->m = conf->d / 4;  // compression radio = 16
-    else if (!(conf->d % 2))
-        conf->m = conf->d / 2;  // compression radio = 8
-    else if (!(conf->d % 3))
-        conf->m = conf->d / 3;  // compression radio = 12
-    else
-        conf->m = conf->d;  // same as SQ8, compression radio = 4
-
     MatchBase(conf);
-    return conf;
+
+    /*
+     * Faiss 1.6
+     * Only 1, 2, 3, 4, 6, 8, 10, 12, 16, 20, 24, 28, 32 dims per sub-quantizer are currently supporte with
+     * no precomputed codes. Precomputed codes supports any number of dimensions, but will involve memory overheads.
+     */
+    static std::vector<int64_t> support_sub_quantizer{32, 28, 24, 20, 16, 12, 10, 8, 6, 4, 3, 2, 1};
+    for (const auto& c : support_sub_quantizer) {
+        // compression radio = dim / c * 4
+        MatchSubQuantizer(c)
+    }
 }
 
 knowhere::Config