提交 118c8c90 编写于 作者: X xiaojun.lin

MS-635 coding style check


Former-commit-id: 6803034828abc15f882b05cad19425a4b86db10c
上级 cf8931a9
...@@ -231,17 +231,14 @@ IVFSQHybrid::LoadQuantizer(const Config& conf) { ...@@ -231,17 +231,14 @@ IVFSQHybrid::LoadQuantizer(const Config& conf) {
void void
IVFSQHybrid::SetQuantizer(const QuantizerPtr& q) { IVFSQHybrid::SetQuantizer(const QuantizerPtr& q) {
} }
void void
IVFSQHybrid::UnsetQuantizer() { IVFSQHybrid::UnsetQuantizer() {
} }
void void
IVFSQHybrid::LoadData(const knowhere::QuantizerPtr& q, const Config& conf) { IVFSQHybrid::LoadData(const knowhere::QuantizerPtr& q, const Config& conf) {
} }
IndexModelPtr IndexModelPtr
...@@ -260,11 +257,7 @@ IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) { ...@@ -260,11 +257,7 @@ IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) {
} }
void void
IVFSQHybrid::search_impl(int64_t n, IVFSQHybrid::search_impl(int64_t n, const float* data, int64_t k, float* distances, int64_t* labels,
const float* data,
int64_t k,
float* distances,
int64_t* labels,
const Config& cfg) { const Config& cfg) {
GPUIVF::search_impl(n, data, k, distances, labels, cfg); GPUIVF::search_impl(n, data, k, distances, labels, cfg);
} }
......
...@@ -160,8 +160,7 @@ INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest, ...@@ -160,8 +160,7 @@ INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest,
#ifdef CUSTOMIZATION #ifdef CUSTOMIZATION
std::make_tuple("IVFSQHybrid", ParameterType::ivfsq), std::make_tuple("IVFSQHybrid", ParameterType::ivfsq),
#endif #endif
std::make_tuple("GPUIVFSQ", ParameterType::ivfsq)) std::make_tuple("GPUIVFSQ", ParameterType::ivfsq)));
);
void void
AssertAnns(const knowhere::DatasetPtr& result, const int& nq, const int& k) { AssertAnns(const knowhere::DatasetPtr& result, const int& nq, const int& k) {
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
// specific language governing permissions and limitations // specific language governing permissions and limitations
// under the License. // under the License.
#include "wrapper/VecIndex.h"
#include "VecImpl.h"
#include "knowhere/common/Exception.h" #include "knowhere/common/Exception.h"
#include "knowhere/index/vector_index/IndexGPUIVF.h" #include "knowhere/index/vector_index/IndexGPUIVF.h"
#include "knowhere/index/vector_index/IndexGPUIVFPQ.h" #include "knowhere/index/vector_index/IndexGPUIVFPQ.h"
...@@ -26,8 +28,6 @@ ...@@ -26,8 +28,6 @@
#include "knowhere/index/vector_index/IndexIVFSQHybrid.h" #include "knowhere/index/vector_index/IndexIVFSQHybrid.h"
#include "knowhere/index/vector_index/IndexKDT.h" #include "knowhere/index/vector_index/IndexKDT.h"
#include "knowhere/index/vector_index/IndexNSG.h" #include "knowhere/index/vector_index/IndexNSG.h"
#include "wrapper/VecIndex.h"
#include "VecImpl.h"
#include "utils/Log.h" #include "utils/Log.h"
#include <cuda.h> #include <cuda.h>
...@@ -161,7 +161,8 @@ GetVecIndexFactory(const IndexType& type, const Config& cfg) { ...@@ -161,7 +161,8 @@ GetVecIndexFactory(const IndexType& type, const Config& cfg) {
VecIndexPtr VecIndexPtr
LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary) { LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary) {
auto index = GetVecIndexFactory(index_type); auto index = GetVecIndexFactory(index_type);
if (index == nullptr) return nullptr; if (index == nullptr)
return nullptr;
// else // else
index->Load(index_binary); index->Load(index_binary);
return index; return index;
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "cache/DataObj.h"
#include "knowhere/common/BinarySet.h" #include "knowhere/common/BinarySet.h"
#include "knowhere/common/Config.h" #include "knowhere/common/Config.h"
#include "knowhere/index/vector_index/Quantizer.h" #include "knowhere/index/vector_index/Quantizer.h"
#include "cache/DataObj.h"
#include "utils/Status.h" #include "utils/Status.h"
namespace milvus { namespace milvus {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册