diff --git a/configs/advanced/knowhere.yaml b/configs/advanced/knowhere.yaml deleted file mode 100644 index 9a8c55f7ef..0000000000 --- a/configs/advanced/knowhere.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the LF AI & Data foundation under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -knowhere: - # Default value: auto - # Valid values: [auto, avx512, avx2, sse] - # This configuration is only used by querynode and indexnode, it selects CPU instruction set for Searching and Index-building. - simdType: auto diff --git a/configs/milvus.yaml b/configs/milvus.yaml index ce3948efae..ae784ed14f 100644 --- a/configs/milvus.yaml +++ b/configs/milvus.yaml @@ -175,3 +175,9 @@ msgChannel: common: defaultPartitionName: "_default" # default partition name for a collection defaultIndexName: "_default_idx" # default index name + +knowhere: + # Default value: auto + # Valid values: [auto, avx512, avx2, sse] + # This configuration is only used by querynode and indexnode, it selects CPU instruction set for Searching and Index-building. + simdType: auto diff --git a/internal/indexnode/param_table.go b/internal/indexnode/param_table.go index ec9ec0e1f8..c0e811e5d1 100644 --- a/internal/indexnode/param_table.go +++ b/internal/indexnode/param_table.go @@ -63,18 +63,12 @@ func (pt *ParamTable) InitAlias(alias string) { // Init is used to initialize configuration items. func (pt *ParamTable) Init() { pt.BaseTable.Init() - if err := pt.LoadYaml("advanced/knowhere.yaml"); err != nil { - panic(err) - } - // TODO, load index_node.yaml /*err := pt.LoadYaml("advanced/index_node.yaml") if err != nil { panic(err) }*/ - pt.initParams() - pt.initKnowhereSimdType() } // InitOnce is used to initialize configuration items, and it will only be called once. @@ -94,6 +88,7 @@ func (pt *ParamTable) initParams() { pt.initMetaRootPath() pt.initIndexRootPath() pt.initRoleName() + pt.initKnowhereSimdType() } func (pt *ParamTable) initMinIOAddress() { diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index 9b97e8d291..5fd624b61f 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -865,7 +865,7 @@ func TestProxy(t *testing.T) { }) assert.NoError(t, err) assert.Equal(t, commonpb.ErrorCode_Success, resp.Status.ErrorCode) - assert.Equal(t, 1, len(resp.CollectionNames)) + assert.Equal(t, 1, len(resp.CollectionNames), resp.CollectionNames) }) wg.Add(1) diff --git a/internal/querynode/param_table.go b/internal/querynode/param_table.go index 8adf77a3c0..b79a4cbd36 100644 --- a/internal/querynode/param_table.go +++ b/internal/querynode/param_table.go @@ -108,9 +108,6 @@ func (p *ParamTable) Init() { if err := p.LoadYaml("advanced/query_node.yaml"); err != nil { panic(err) } - if err := p.LoadYaml("advanced/knowhere.yaml"); err != nil { - panic(err) - } p.initCacheSize() p.initInContainer()