diff --git a/internal/core/src/utils/tools.h b/internal/core/src/index/knowhere/utils/Utils.h similarity index 99% rename from internal/core/src/utils/tools.h rename to internal/core/src/index/knowhere/utils/Utils.h index b99ddda6ef..63f50c6b1c 100644 --- a/internal/core/src/utils/tools.h +++ b/internal/core/src/index/knowhere/utils/Utils.h @@ -10,9 +10,12 @@ // or implied. See the License for the specific language governing permissions and limitations under the License #pragma once + #include #include "exceptions/EasyAssert.h" + namespace milvus { + inline int64_t upper_align(int64_t value, int64_t align) { Assert(align > 0); diff --git a/internal/core/src/query/SearchOnGrowing.cpp b/internal/core/src/query/SearchOnGrowing.cpp index f41dfebfc5..f2c80a8c21 100644 --- a/internal/core/src/query/SearchOnGrowing.cpp +++ b/internal/core/src/query/SearchOnGrowing.cpp @@ -15,7 +15,7 @@ #include "segcore/Reduce.h" #include -#include "utils/tools.h" +#include "utils/Utils.h" #include "query/SearchBruteForce.h" #include "query/SearchOnIndex.h" diff --git a/internal/core/src/segcore/ConcurrentVector.h b/internal/core/src/segcore/ConcurrentVector.h index 4d7686d0c9..763dfdac15 100644 --- a/internal/core/src/segcore/ConcurrentVector.h +++ b/internal/core/src/segcore/ConcurrentVector.h @@ -20,7 +20,7 @@ #include #include #include "exceptions/EasyAssert.h" -#include "utils/tools.h" +#include "utils/Utils.h" #include #include "common/Types.h" #include "common/Span.h" diff --git a/internal/core/src/segcore/SegmentGrowingImpl.cpp b/internal/core/src/segcore/SegmentGrowingImpl.cpp index 1e8e35495c..78ea9e0bb0 100644 --- a/internal/core/src/segcore/SegmentGrowingImpl.cpp +++ b/internal/core/src/segcore/SegmentGrowingImpl.cpp @@ -27,7 +27,7 @@ #include "query/generated/ExecPlanNodeVisitor.h" #include "segcore/Reduce.h" #include "segcore/SegmentGrowingImpl.h" -#include "utils/tools.h" +#include "utils/Utils.h" namespace milvus::segcore { diff --git a/internal/core/src/utils/Utils.h b/internal/core/src/utils/Utils.h new file mode 100644 index 0000000000..63f50c6b1c --- /dev/null +++ b/internal/core/src/utils/Utils.h @@ -0,0 +1,33 @@ +// Copyright (C) 2019-2020 Zilliz. All rights reserved. +// +// Licensed 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 + +#pragma once + +#include +#include "exceptions/EasyAssert.h" + +namespace milvus { + +inline int64_t +upper_align(int64_t value, int64_t align) { + Assert(align > 0); + auto groups = (value + align - 1) / align; + return groups * align; +} + +inline int64_t +upper_div(int64_t value, int64_t align) { + Assert(align > 0); + auto groups = (value + align - 1) / align; + return groups; +} + +} // namespace milvus diff --git a/internal/core/unittest/test_expr.cpp b/internal/core/unittest/test_expr.cpp index 4532468f6e..35b27fa393 100644 --- a/internal/core/unittest/test_expr.cpp +++ b/internal/core/unittest/test_expr.cpp @@ -22,7 +22,7 @@ #include "query/generated/ExecExprVisitor.h" #include "segcore/SegmentGrowingImpl.h" #include "test_utils/DataGen.h" -#include "utils/tools.h" +#include "utils/Utils.h" using namespace milvus; diff --git a/internal/core/unittest/test_span.cpp b/internal/core/unittest/test_span.cpp index 82806a93f2..4cd5f90477 100644 --- a/internal/core/unittest/test_span.cpp +++ b/internal/core/unittest/test_span.cpp @@ -13,7 +13,7 @@ #include "segcore/SegmentGrowing.h" #include "test_utils/DataGen.h" -#include "utils/tools.h" +#include "utils/Utils.h" const int64_t ROW_COUNT = 100 * 1000;