Commit 118c8c90 authored by xiaojun.lin's avatar xiaojun.lin
Browse files

MS-635 coding style check 


Former-commit-id: 6803034828abc15f882b05cad19425a4b86db10c
parent cf8931a9

cpp/src/core/knowhere/knowhere/index/vector_index/IndexIVFSQHybrid.cpp

+1 −8
Original line number Diff line number Diff line
@@ -231,17 +231,14 @@ IVFSQHybrid::LoadQuantizer(const Config& conf) { 


void

IVFSQHybrid::SetQuantizer(const QuantizerPtr& q) {



}



void

IVFSQHybrid::UnsetQuantizer() {



}



void

IVFSQHybrid::LoadData(const knowhere::QuantizerPtr& q, const Config& conf) {



}



IndexModelPtr
@@ -260,11 +257,7 @@ IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) { 
}



void

IVFSQHybrid::search_impl(int64_t n,

                         const float* data,

                         int64_t k,

                         float* distances,

                         int64_t* labels,

IVFSQHybrid::search_impl(int64_t n, const float* data, int64_t k, float* distances, int64_t* labels,

                         const Config& cfg) {

    GPUIVF::search_impl(n, data, k, distances, labels, cfg);

}

cpp/src/core/unittest/test_ivf.cpp

+1 −2
Original line number Diff line number Diff line
@@ -160,8 +160,7 @@ INSTANTIATE_TEST_CASE_P(IVFParameters, IVFTest, 
#ifdef CUSTOMIZATION

                               std::make_tuple("IVFSQHybrid", ParameterType::ivfsq),

#endif

                               std::make_tuple("GPUIVFSQ", ParameterType::ivfsq))

                               );

                               std::make_tuple("GPUIVFSQ", ParameterType::ivfsq)));



void

AssertAnns(const knowhere::DatasetPtr& result, const int& nq, const int& k) {

cpp/src/wrapper/VecIndex.cpp

+4 −3
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
// specific language governing permissions and limitations

// under the License.



#include "wrapper/VecIndex.h"

#include "VecImpl.h"

#include "knowhere/common/Exception.h"

#include "knowhere/index/vector_index/IndexGPUIVF.h"

#include "knowhere/index/vector_index/IndexGPUIVFPQ.h"
@@ -26,8 +28,6 @@ 
#include "knowhere/index/vector_index/IndexIVFSQHybrid.h"

#include "knowhere/index/vector_index/IndexKDT.h"

#include "knowhere/index/vector_index/IndexNSG.h"

#include "wrapper/VecIndex.h"

#include "VecImpl.h"

#include "utils/Log.h"



#include <cuda.h>
@@ -161,7 +161,8 @@ GetVecIndexFactory(const IndexType& type, const Config& cfg) { 
VecIndexPtr

LoadVecIndex(const IndexType& index_type, const knowhere::BinarySet& index_binary) {

    auto index = GetVecIndexFactory(index_type);

    if (index == nullptr) return nullptr;

    if (index == nullptr)

        return nullptr;

    // else

    index->Load(index_binary);

    return index;

cpp/src/wrapper/VecIndex.h

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#include <memory>

#include <string>



#include "cache/DataObj.h"

#include "knowhere/common/BinarySet.h"

#include "knowhere/common/Config.h"

#include "knowhere/index/vector_index/Quantizer.h"

#include "cache/DataObj.h"

#include "utils/Status.h"



namespace milvus {