diff options
author | Geir Storli <geirst@verizonmedia.com> | 2020-06-19 12:13:29 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2020-06-19 12:13:29 +0000 |
commit | c56ffa5e2735b6e3873aa18edc5e54a9128f3108 (patch) | |
tree | b64c3bbc9cee9bd5b0900bfe51cac5a4686c08f6 /searchlib/src | |
parent | cdc65c6b2b0734fb97b7f466ba0139ce6406559c (diff) |
Wire flag to enable multi-threaded indexing for a hnsw index.
Diffstat (limited to 'searchlib/src')
-rw-r--r-- | searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp | 9 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/configconverter.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp index 3728b87c6df..b94186626c2 100644 --- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp +++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp @@ -297,11 +297,14 @@ AttributeManagerTest::testConfigConvert() a.index.hnsw.enabled = true; a.index.hnsw.maxlinkspernode = 32; a.index.hnsw.neighborstoexploreatinsert = 300; + a.index.hnsw.multithreadedindexing = true; auto out = ConfigConverter::convert(a); EXPECT_TRUE(out.hnsw_index_params().has_value()); - EXPECT_EQUAL(32u, out.hnsw_index_params().value().max_links_per_node()); - EXPECT_EQUAL(300u, out.hnsw_index_params().value().neighbors_to_explore_at_insert()); - EXPECT_TRUE(out.hnsw_index_params().value().distance_metric() == dm_out); + const auto& params = out.hnsw_index_params().value(); + EXPECT_EQUAL(32u, params.max_links_per_node()); + EXPECT_EQUAL(300u, params.neighbors_to_explore_at_insert()); + EXPECT_TRUE(params.distance_metric() == dm_out); + EXPECT_TRUE(params.multi_threaded_indexing()); } { // hnsw index params (disabled) CACA a; diff --git a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp index f6c39b9570d..f435f79bf65 100644 --- a/searchlib/src/vespa/searchlib/attribute/configconverter.cpp +++ b/searchlib/src/vespa/searchlib/attribute/configconverter.cpp @@ -90,7 +90,7 @@ ConfigConverter::convert(const AttributesConfig::Attribute & cfg) if (cfg.index.hnsw.enabled) { retval.set_hnsw_index_params(HnswIndexParams(cfg.index.hnsw.maxlinkspernode, cfg.index.hnsw.neighborstoexploreatinsert, - dm)); + dm, cfg.index.hnsw.multithreadedindexing)); } if (retval.basicType().type() == BasicType::Type::TENSOR) { if (!cfg.tensortype.empty()) { |