MS-565 rename knowhere files

Former-commit-id: e601c526082d4392a7f02ae97f4b83cd7146f449

cpp/src/core/CMakeLists.txt

@@ -93,7 +93,7 @@ endif()
 set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)
 
 if(BUILD_UNIT_TEST STREQUAL "ON")
-    add_subdirectory(test)
+#    add_subdirectory(test)
 endif()
 
 config_summary()

cpp/src/core/knowhere/CMakeLists.txt

@@ -29,26 +29,26 @@ if(NOT TARGET SPTAGLibStatic)
 endif()
 
 set(external_srcs
-        knowhere/adapter/sptag.cpp
-        knowhere/adapter/structure.cpp
-        knowhere/adapter/arrow.cpp
-        knowhere/common/exception.cpp
-        knowhere/common/timer.cpp
+        knowhere/adapter/SptagAdapter.cpp
+        knowhere/adapter/Structure.cpp
+        knowhere/adapter/ArrowAdapter.cpp
+        knowhere/common/Exception.cpp
+        knowhere/common/Timer.cpp
         )
 
 set(index_srcs
-        knowhere/index/preprocessor/normalize.cpp
-        knowhere/index/vector_index/cpu_kdt_rng.cpp
-        knowhere/index/vector_index/idmap.cpp
-        knowhere/index/vector_index/ivf.cpp
-        knowhere/index/vector_index/gpu_ivf.cpp
-        knowhere/index/vector_index/kdt_parameters.cpp
-        knowhere/index/vector_index/nsg_index.cpp
-        knowhere/index/vector_index/nsg/nsg.cpp
-        knowhere/index/vector_index/nsg/nsg_io.cpp
-        knowhere/index/vector_index/nsg/utils.cpp
-        knowhere/index/vector_index/cloner.cpp
-        knowhere/index/vector_index/FaissGpuResourceMgr.cpp
+        knowhere/index/preprocessor/Normalize.cpp
+        knowhere/index/vector_index/IndexKDT.cpp
+        knowhere/index/vector_index/IndexIDMAP.cpp
+        knowhere/index/vector_index/IndexIVF.cpp
+        knowhere/index/vector_index/IndexGPUIVF.cpp
+        knowhere/index/vector_index/utils/KDTParameterMgr.cpp
+        knowhere/index/vector_index/IndexNSG.cpp
+        knowhere/index/vector_index/nsg/NSG.cpp
+        knowhere/index/vector_index/nsg/NSGIO.cpp
+        knowhere/index/vector_index/nsg/NSGHelper.cpp
+        knowhere/index/vector_index/utils/Cloner.cpp
+        knowhere/index/vector_index/utils/FaissGpuResourceMgr.cpp
         )
 
 set(depend_libs

cpp/src/core/knowhere/knowhere/adapter/arrow.cpp → cpp/src/core/knowhere/knowhere/adapter/ArrowAdapter.cpp

@@ -16,7 +16,7 @@
 // under the License.
 
 
-#include "arrow.h"
+#include "ArrowAdapter.h"
 
 namespace zilliz {
 namespace knowhere {

cpp/src/core/knowhere/knowhere/adapter/arrow.h → cpp/src/core/knowhere/knowhere/adapter/ArrowAdapter.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "knowhere/common/array.h"
+#include "knowhere/common/Array.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/adapter/sptag.cpp → cpp/src/core/knowhere/knowhere/adapter/SptagAdapter.cpp

@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "knowhere/index/vector_index/definitions.h"
-#include "sptag.h"
-#include "structure.h"
+#include "knowhere/index/vector_index/utils/Definitions.h"
+#include "SptagAdapter.h"
+#include "Structure.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/adapter/sptag.h → cpp/src/core/knowhere/knowhere/adapter/SptagAdapter.h

@@ -22,7 +22,7 @@
 
 #include <SPTAG/AnnService/inc/Core/VectorIndex.h>
 
-#include "knowhere/common/dataset.h"
+#include "knowhere/common/Dataset.h"
 
 namespace zilliz {
 namespace knowhere {

cpp/src/core/knowhere/knowhere/adapter/structure.cpp → cpp/src/core/knowhere/knowhere/adapter/Structure.cpp

@@ -16,7 +16,7 @@
 // under the License.
 
 
-#include "structure.h"
+#include "Structure.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/adapter/structure.h → cpp/src/core/knowhere/knowhere/adapter/Structure.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <memory>
-#include "knowhere/common/dataset.h"
+#include "knowhere/common/Dataset.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/array.h → cpp/src/core/knowhere/knowhere/common/Array.h

@@ -18,8 +18,9 @@
 
 #pragma once
 
-#include "arrow/array.h"
-#include "schema.h"
+#include <arrow/array.h>
+
+#include "Schema.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/binary_set.h → cpp/src/core/knowhere/knowhere/common/BinarySet.h

@@ -23,7 +23,7 @@
 #include <vector>
 #include <memory>
 
-#include "id.h"
+#include "Id.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/buffer.h → cpp/src/core/knowhere/knowhere/common/Buffer.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "arrow/buffer.h"
+#include <arrow/buffer.h>
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/dataset.h → cpp/src/core/knowhere/knowhere/common/Dataset.h

@@ -21,12 +21,12 @@
 #include <vector>
 #include <memory>
 
-#include "array.h"
-#include "buffer.h"
-#include "tensor.h"
-#include "schema.h"
-#include "config.h"
-#include "knowhere/adapter/arrow.h"
+#include "Array.h"
+#include "Buffer.h"
+#include "Tensor.h"
+#include "Schema.h"
+#include "Config.h"
+#include "knowhere/adapter/ArrowAdapter.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/exception.cpp → cpp/src/core/knowhere/knowhere/common/Exception.cpp

@@ -18,7 +18,7 @@
 
 #include <cstdio>
 
-#include "exception.h"
+#include "Exception.h"
 #include "Log.h"
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/Log.h

@@ -22,6 +22,7 @@
 
 namespace zilliz {
 namespace knowhere {
+
 #define KNOWHERE_DOMAIN_NAME "[KNOWHERE] "
 #define KNOWHERE_ERROR_TEXT "KNOWHERE Error:"
 
@@ -31,5 +32,6 @@ namespace knowhere {
 #define KNOWHERE_LOG_WARNING LOG(WARNING) << KNOWHERE_DOMAIN_NAME
 #define KNOWHERE_LOG_ERROR LOG(ERROR) << KNOWHERE_DOMAIN_NAME
 #define KNOWHERE_LOG_FATAL LOG(FATAL) << KNOWHERE_DOMAIN_NAME
+
 } // namespace knowhere
 } // namespace zilliz
\ No newline at end of file

cpp/src/core/knowhere/knowhere/common/schema.h → cpp/src/core/knowhere/knowhere/common/Schema.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "arrow/type.h"
+#include <arrow/type.h>
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/tensor.h → cpp/src/core/knowhere/knowhere/common/Tensor.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "arrow/tensor.h"
+#include <arrow/tensor.h>
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/common/timer.cpp → cpp/src/core/knowhere/knowhere/common/Timer.cpp

@@ -18,7 +18,7 @@
 
 #include <iostream> // TODO(linxj): using Log instead
 
-#include "timer.h"
+#include "Timer.h"
 
 namespace zilliz {
 namespace knowhere {

cpp/src/core/knowhere/knowhere/index/index.h → cpp/src/core/knowhere/knowhere/index/Index.h

@@ -20,11 +20,11 @@
 
 #include <memory>
 
-#include "knowhere/common/binary_set.h"
-#include "knowhere/common/dataset.h"
-#include "index_type.h"
-#include "index_model.h"
-#include "knowhere/index/preprocessor/preprocessor.h"
+#include "knowhere/common/BinarySet.h"
+#include "knowhere/common/Dataset.h"
+#include "IndexType.h"
+#include "IndexModel.h"
+#include "knowhere/index/preprocessor/Preprocessor.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/index_model.h → cpp/src/core/knowhere/knowhere/index/IndexModel.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <memory>
-#include "knowhere/common/binary_set.h"
+#include "knowhere/common/BinarySet.h"
 
 namespace zilliz {
 namespace knowhere {

cpp/src/core/knowhere/knowhere/index/preprocessor/preprocessor.h → cpp/src/core/knowhere/knowhere/index/preprocessor/Preprocessor.h

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include "knowhere/common/dataset.h"
+#include "knowhere/common/Dataset.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/gpu_ivf.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/IndexGPUIVF.cpp

@@ -26,10 +26,10 @@
 #include <faiss/index_io.h>
 
 
-#include "knowhere/common/exception.h"
-#include "cloner.h"
-#include "knowhere/adapter/faiss_adopt.h"
-#include "gpu_ivf.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/index/vector_index/utils/Cloner.h"
+#include "knowhere/adapter/VectorAdapter.h"
+#include "IndexGPUIVF.h"
 
 #include <algorithm>
 
@@ -169,7 +169,7 @@ VectorIndexPtr GPUIVF::CopyGpuToCpu(const Config &config) {
 
 VectorIndexPtr GPUIVF::Clone() {
     auto cpu_idx = CopyGpuToCpu(Config());
-    return ::zilliz::knowhere::CopyCpuToGpu(cpu_idx, gpu_id_, Config());
+    return ::zilliz::knowhere::cloner::CopyCpuToGpu(cpu_idx, gpu_id_, Config());
 }
 
 VectorIndexPtr GPUIVF::CopyGpuToGpu(const int64_t &device_id, const Config &config) {

cpp/src/core/knowhere/knowhere/index/vector_index/gpu_ivf.h → cpp/src/core/knowhere/knowhere/index/vector_index/IndexGPUIVF.h

@@ -19,8 +19,8 @@
 #pragma once
 
 
-#include "ivf.h"
-#include "FaissGpuResourceMgr.h"
+#include "IndexIVF.h"
+#include "knowhere/index/vector_index/utils/FaissGpuResourceMgr.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/idmap.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/IndexIDMAP.cpp

@@ -23,9 +23,9 @@
 #include <faiss/gpu/GpuAutoTune.h>
 
 
-#include "knowhere/common/exception.h"
-#include "knowhere/adapter/faiss_adopt.h"
-#include "idmap.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/adapter/VectorAdapter.h"
+#include "IndexIDMAP.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/idmap.h → cpp/src/core/knowhere/knowhere/index/vector_index/IndexIDMAP.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "ivf.h"
-#include "gpu_ivf.h"
+#include "IndexIVF.h"
+#include "IndexGPUIVF.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/ivf.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/IndexIVF.cpp

@@ -23,14 +23,13 @@
 #include <faiss/IVFlib.h>
 #include <faiss/AuxIndexStructures.h>
 #include <faiss/index_io.h>
-#include <faiss/gpu/StandardGpuResources.h>
 #include <faiss/gpu/GpuAutoTune.h>
 
 
-#include "knowhere/common/exception.h"
-#include "ivf.h"
-#include "knowhere/adapter/faiss_adopt.h"
-#include "gpu_ivf.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/adapter/VectorAdapter.h"
+#include "IndexIVF.h"
+#include "IndexGPUIVF.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/ivf.h → cpp/src/core/knowhere/knowhere/index/vector_index/IndexIVF.h

@@ -25,7 +25,7 @@
 #include <faiss/AuxIndexStructures.h>
 #include <faiss/Index.h>
 
-#include "vector_index.h"
+#include "VectorIndex.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/cpu_kdt_rng.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/IndexKDT.cpp

@@ -24,12 +24,12 @@
 
 #undef mkdir
 
-#include "cpu_kdt_rng.h"
-#include "definitions.h"
+#include "IndexKDT.h"
+#include "knowhere/index/vector_index/utils/Definitions.h"
 //#include "knowhere/index/preprocessor/normalize.h"
-#include "kdt_parameters.h"
-#include "knowhere/adapter/sptag.h"
-#include "knowhere/common/exception.h"
+#include "knowhere/index/vector_index/utils/KDTParameterMgr.h"
+#include "knowhere/adapter/SptagAdapter.h"
+#include "knowhere/common/Exception.h"
 
 
 namespace zilliz {
@@ -117,7 +117,7 @@ CPUKDTRNG::Add(const DatasetPtr &origin, const Config &add_config) {
 
 void
 CPUKDTRNG::SetParameters(const Config &config) {
-    for (auto &para : KDTParameterManagement::GetInstance().GetKDTParameters()) {
+    for (auto &para : KDTParameterMgr::GetInstance().GetKDTParameters()) {
         auto value = config.get_with_default(para.first, para.second);
         index_ptr_->SetParameter(para.first, value);
     }

cpp/src/core/knowhere/knowhere/index/vector_index/cpu_kdt_rng.h → cpp/src/core/knowhere/knowhere/index/vector_index/IndexKDT.h

@@ -20,8 +20,8 @@
 
 #include <cstdint>
 #include <memory>
-#include "vector_index.h"
-#include "knowhere/index/index_model.h"
+#include "VectorIndex.h"
+#include "knowhere/index/IndexModel.h"
 #include <SPTAG/AnnService/inc/Core/VectorIndex.h>
 
 

cpp/src/core/knowhere/knowhere/index/vector_index/nsg_index.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/IndexNSG.cpp

@@ -16,15 +16,15 @@
 // under the License.
 
 
-#include "nsg_index.h"
-#include "knowhere/index/vector_index/nsg/nsg.h"
-#include "knowhere/index/vector_index/nsg/nsg_io.h"
-#include "idmap.h"
-#include "ivf.h"
-#include "gpu_ivf.h"
-#include "knowhere/adapter/faiss_adopt.h"
-#include "knowhere/common/exception.h"
-#include "knowhere/common/timer.h"
+#include "IndexNSG.h"
+#include "knowhere/index/vector_index/nsg/NSG.h"
+#include "knowhere/index/vector_index/nsg/NSGIO.h"
+#include "IndexIDMAP.h"
+#include "IndexIVF.h"
+#include "IndexGPUIVF.h"
+#include "knowhere/adapter/VectorAdapter.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/common/Timer.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg_index.h → cpp/src/core/knowhere/knowhere/index/vector_index/IndexNSG.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "vector_index.h"
+#include "VectorIndex.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/vector_index.h → cpp/src/core/knowhere/knowhere/index/vector_index/VectorIndex.h

@@ -21,10 +21,10 @@
 
 #include <memory>
 
-#include "knowhere/common/config.h"
-#include "knowhere/common/dataset.h"
-#include "knowhere/index/index.h"
-#include "knowhere/index/preprocessor/preprocessor.h"
+#include "knowhere/common/Config.h"
+#include "knowhere/common/Dataset.h"
+#include "knowhere/index/Index.h"
+#include "knowhere/index/preprocessor/Preprocessor.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/nsg.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/nsg/NSG.cpp

@@ -22,10 +22,10 @@
 #include <stack>
 #include <omp.h>
 
-#include "nsg.h"
-#include "knowhere/common/exception.h"
-#include "knowhere/common/timer.h"
-#include "utils.h"
+#include "NSG.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/common/Timer.h"
+#include "NSGHelper.h"
 
 // TODO: enable macro
 //#include <gperftools/profiler.h>

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/nsg.h → cpp/src/core/knowhere/knowhere/index/vector_index/nsg/NSG.h

@@ -23,7 +23,7 @@
 #include <mutex>
 
 #include <boost/dynamic_bitset.hpp>
-#include "neighbor.h"
+#include "Neighbor.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/utils.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/nsg/NSGHelper.cpp

@@ -19,7 +19,7 @@
 #include <cstring>
 #include <fstream>
 
-#include "utils.h"
+#include "NSGHelper.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/utils.h → cpp/src/core/knowhere/knowhere/index/vector_index/nsg/NSGHelper.h

@@ -23,8 +23,8 @@
 
 #include <faiss/AutoTune.h>
 
-#include "nsg.h"
-#include "knowhere/common/config.h"
+#include "NSG.h"
+#include "knowhere/common/Config.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/nsg_io.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/nsg/NSGIO.cpp

@@ -18,7 +18,7 @@
 
 #include <cstring>
 
-#include "nsg_io.h"
+#include "NSGIO.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/nsg_io.h → cpp/src/core/knowhere/knowhere/index/vector_index/nsg/NSGIO.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "nsg.h"
-#include "knowhere/index/vector_index/ivf.h"
+#include "NSG.h"
+#include "knowhere/index/vector_index/IndexIVF.h"
 
 
 namespace zilliz {

cpp/src/core/knowhere/knowhere/index/vector_index/nsg/index_io.h

-// Licensed to the Apache Software Foundation (ASF) 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.
-
-
-#pragma once
-
-#include "nsg.h"
-
-namespace zilliz {
-namespace knowhere {
-namespace algo {
-
-void read_from_file(NsgIndex* index, const char *filename);
-void write_to_file(NsgIndex* index, const char *filename);
-
-}
-}
-}

cpp/src/core/knowhere/knowhere/index/vector_index/cloner.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/utils/Cloner.cpp

@@ -16,15 +16,16 @@
 // under the License.
 
 
-#include "knowhere/common/exception.h"
-#include "cloner.h"
-#include "ivf.h"
-#include "gpu_ivf.h"
-#include "idmap.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/index/vector_index/IndexIVF.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
+#include "knowhere/index/vector_index/IndexIDMAP.h"
+#include "Cloner.h"
 
 
 namespace zilliz {
 namespace knowhere {
+namespace cloner {
 
 VectorIndexPtr CopyGpuToCpu(const VectorIndexPtr &index, const Config &config) {
     if (auto device_index = std::dynamic_pointer_cast<GPUIndex>(index)) {
@@ -52,5 +53,6 @@ VectorIndexPtr CopyCpuToGpu(const VectorIndexPtr &index, const int64_t &device_i
     }
 }
 
+} // cloner
 }
 }

cpp/src/core/knowhere/knowhere/index/vector_index/cloner.h → cpp/src/core/knowhere/knowhere/index/vector_index/utils/Cloner.h

@@ -18,11 +18,12 @@
 
 #pragma once
 
-#include "vector_index.h"
+#include "knowhere/index/vector_index/VectorIndex.h"
 
 
 namespace zilliz {
 namespace knowhere {
+namespace cloner {
 
 // TODO(linxj): rename CopyToGpu
 extern VectorIndexPtr
@@ -31,5 +32,6 @@ CopyCpuToGpu(const VectorIndexPtr &index, const int64_t &device_id, const Config
 extern VectorIndexPtr
 CopyGpuToCpu(const VectorIndexPtr &index, const Config &config);
 
-}
-}
\ No newline at end of file
+} // cloner
+} // knowhere
+} // zilliz
\ No newline at end of file

cpp/src/core/knowhere/knowhere/index/vector_index/definitions.h → cpp/src/core/knowhere/knowhere/index/vector_index/utils/Definitions.h

@@ -18,15 +18,15 @@
 
 #pragma once
 
-#include <string>
-
 
 namespace zilliz {
 namespace knowhere {
+namespace definition {
 
 #define META_ROWS ("rows")
 #define META_DIM ("dimension")
 #define META_K ("k")
 
-} // namespace knowhere
-} // namespace zilliz
+} // definition
+} // knowhere
+} // zilliz

cpp/src/core/knowhere/knowhere/index/vector_index/kdt_parameters.cpp → cpp/src/core/knowhere/knowhere/index/vector_index/utils/KDTParameterMgr.cpp

@@ -18,18 +18,18 @@
 
 #include <mutex>
 
-#include "kdt_parameters.h"
+#include "KDTParameterMgr.h"
 
 
 namespace zilliz {
 namespace knowhere {
 
 const std::vector<KDTParameter> &
-KDTParameterManagement::GetKDTParameters() {
+KDTParameterMgr::GetKDTParameters() {
     return kdt_parameters_;
 }
 
-KDTParameterManagement::KDTParameterManagement() {
+KDTParameterMgr::KDTParameterMgr() {
     kdt_parameters_ = std::vector<KDTParameter>{
         {"KDTNumber", "1"},
         {"NumTopDimensionKDTSplit", "5"},

cpp/src/core/knowhere/knowhere/index/vector_index/kdt_parameters.h → cpp/src/core/knowhere/knowhere/index/vector_index/utils/KDTParameterMgr.h

@@ -27,22 +27,22 @@ namespace knowhere {
 
 using KDTParameter = std::pair<std::string, std::string>;
 
-class KDTParameterManagement {
+class KDTParameterMgr {
  public:
     const std::vector<KDTParameter> &
     GetKDTParameters();
 
  public:
-    static KDTParameterManagement &
+    static KDTParameterMgr &
     GetInstance() {
-        static KDTParameterManagement instance;
+        static KDTParameterMgr instance;
         return instance;
     }
 
-    KDTParameterManagement(const KDTParameterManagement &) = delete;
-    KDTParameterManagement &operator=(const KDTParameterManagement &) = delete;
+    KDTParameterMgr(const KDTParameterMgr &) = delete;
+    KDTParameterMgr &operator=(const KDTParameterMgr &) = delete;
  private:
-    KDTParameterManagement();
+    KDTParameterMgr();
 
  private:
     std::vector<KDTParameter> kdt_parameters_;

cpp/src/core/test/test_idmap.cpp

@@ -21,10 +21,10 @@
 #include <iostream>
 #include <sstream>
 
-#include "knowhere/index/vector_index/idmap.h"
-#include "knowhere/adapter/structure.h"
-#include "knowhere/index/vector_index/cloner.h"
-#include "knowhere/common/exception.h"
+#include "knowhere/index/vector_index/IndexIDMAP.h"
+#include "knowhere/adapter/Structure.h"
+#include "knowhere/index/vector_index/utils/Cloner.h"
+#include "knowhere/common/Exception.h"
 
 #include "utils.h"
 

cpp/src/core/test/test_ivf.cpp

@@ -25,12 +25,12 @@
 #include <faiss/gpu/GpuAutoTune.h>
 #include <faiss/gpu/GpuIndexIVFFlat.h>
 
-#include "knowhere/index/vector_index/gpu_ivf.h"
-#include "knowhere/index/vector_index/ivf.h"
-#include "knowhere/adapter/structure.h"
-#include "knowhere/index/vector_index/cloner.h"
-#include "knowhere/common/exception.h"
-#include "knowhere/common/timer.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
+#include "knowhere/index/vector_index/IndexIVF.h"
+#include "knowhere/adapter/Structure.h"
+#include "knowhere/index/vector_index/utils/Cloner.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/common/Timer.h"
 
 #include "utils.h"
 

cpp/src/core/test/test_kdt.cpp

@@ -20,12 +20,12 @@
 
 #include <iostream>
 #include <sstream>
-#include "knowhere/common/exception.h"
+#include "knowhere/common/Exception.h"
 
-#include "knowhere/index/vector_index/cpu_kdt_rng.h"
-#include "knowhere/index/vector_index/definitions.h"
-#include "knowhere/adapter/sptag.h"
-#include "knowhere/adapter/structure.h"
+#include "knowhere/index/vector_index/IndexKDT.h"
+#include "knowhere/index/vector_index/utils/Definitions.h"
+#include "knowhere/adapter/SptagAdapter.h"
+#include "knowhere/adapter/Structure.h"
 
 #include "utils.h"
 

cpp/src/core/test/utils.h

@@ -23,7 +23,7 @@
 #include <cstdio>
 #include <fstream>
 
-#include "knowhere/adapter/structure.h"
+#include "knowhere/adapter/Structure.h"
 #include "knowhere/common/Log.h"
 
 class DataGen  {

cpp/src/db/engine/ExecutionEngineImpl.cpp

@@ -25,7 +25,7 @@
 
 #include "src/wrapper/vec_index.h"
 #include "src/wrapper/vec_impl.h"
-#include "knowhere/common/exception.h"
+#include "knowhere/common/Exception.h"
 
 #include <stdexcept>
 

cpp/src/scheduler/SchedInst.cpp

@@ -19,7 +19,7 @@
 #include "SchedInst.h"
 #include "server/ServerConfig.h"
 #include "ResourceFactory.h"
-#include "knowhere/index/vector_index/gpu_ivf.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
 #include "Utils.h"
 
 

cpp/src/wrapper/KnowhereResource.cpp

@@ -17,7 +17,7 @@
 
 
 #include "KnowhereResource.h"
-#include "knowhere/index/vector_index/FaissGpuResourceMgr.h"
+#include "knowhere/index/vector_index/utils/FaissGpuResourceMgr.h"
 #include "server/ServerConfig.h"
 
 #include <map>

cpp/src/wrapper/data_transfer.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "knowhere/adapter/structure.h"
+#include "knowhere/adapter/Structure.h"
 
 
 namespace zilliz {

cpp/src/wrapper/vec_impl.cpp

@@ -17,10 +17,10 @@
 
 
 #include "utils/Log.h"
-#include "knowhere/index/vector_index/idmap.h"
-#include "knowhere/index/vector_index/gpu_ivf.h"
-#include "knowhere/common/exception.h"
-#include "knowhere/index/vector_index/cloner.h"
+#include "knowhere/index/vector_index/IndexIDMAP.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
+#include "knowhere/common/Exception.h"
+#include "knowhere/index/vector_index/utils/Cloner.h"
 
 #include "vec_impl.h"
 #include "data_transfer.h"
@@ -153,7 +153,7 @@ IndexType VecIndexImpl::GetType() {
 
 VecIndexPtr VecIndexImpl::CopyToGpu(const int64_t &device_id, const Config &cfg) {
     // TODO(linxj): exception handle
-    auto gpu_index = zilliz::knowhere::CopyCpuToGpu(index_, device_id, cfg);
+    auto gpu_index = zilliz::knowhere::cloner::CopyCpuToGpu(index_, device_id, cfg);
     auto new_index = std::make_shared<VecIndexImpl>(gpu_index, ConvertToGpuIndexType(type));
     new_index->dim = dim;
     return new_index;
@@ -161,7 +161,7 @@ VecIndexPtr VecIndexImpl::CopyToGpu(const int64_t &device_id, const Config &cfg)
 
 VecIndexPtr VecIndexImpl::CopyToCpu(const Config &cfg) {
     // TODO(linxj): exception handle
-    auto cpu_index = zilliz::knowhere::CopyGpuToCpu(index_, cfg);
+    auto cpu_index = zilliz::knowhere::cloner::CopyGpuToCpu(index_, cfg);
     auto new_index = std::make_shared<VecIndexImpl>(cpu_index, ConvertToCpuIndexType(type));
     new_index->dim = dim;
     return new_index;

cpp/src/wrapper/vec_impl.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "knowhere/index/vector_index/vector_index.h"
+#include "knowhere/index/vector_index/VectorIndex.h"
 
 #include "vec_index.h"
 

cpp/src/wrapper/vec_index.cpp

@@ -15,12 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "knowhere/index/vector_index/ivf.h"
-#include "knowhere/index/vector_index/idmap.h"
-#include "knowhere/index/vector_index/gpu_ivf.h"
-#include "knowhere/index/vector_index/cpu_kdt_rng.h"
-#include "knowhere/index/vector_index/nsg_index.h"
-#include "knowhere/common/exception.h"
+#include "knowhere/index/vector_index/IndexIVF.h"
+#include "knowhere/index/vector_index/IndexIDMAP.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
+#include "knowhere/index/vector_index/IndexKDT.h"
+#include "knowhere/index/vector_index/IndexNSG.h"
+#include "knowhere/common/Exception.h"
 
 #include "vec_index.h"
 #include "vec_impl.h"

cpp/src/wrapper/vec_index.h

@@ -23,8 +23,8 @@
 
 #include "utils/Error.h"
 
-#include "knowhere/common/config.h"
-#include "knowhere/common/binary_set.h"
+#include "knowhere/common/Config.h"
+#include "knowhere/common/BinarySet.h"
 
 
 namespace zilliz {

cpp/unittest/db/utils.cpp

@@ -26,7 +26,8 @@
 #include "db/DBFactory.h"
 #include "db/Options.h"
 #include "server/ServerConfig.h"
-#include "knowhere/index/vector_index/gpu_ivf.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
+#include "knowhere/index/vector_index/utils/FaissGpuResourceMgr.h"
 
 INITIALIZE_EASYLOGGINGPP
 

cpp/unittest/wrapper/wrapper_test.cpp

@@ -20,7 +20,8 @@
 #include "utils/easylogging++.h"
 
 #include "src/wrapper/vec_index.h"
-#include "knowhere/index/vector_index/gpu_ivf.h"
+#include "knowhere/index/vector_index/IndexGPUIVF.h"
+#include "knowhere/index/vector_index/utils/FaissGpuResourceMgr.h"
 
 #include "utils.h"