MS-635 coding style check

Former-commit-id: 06afc01551073cd4ef3c2dc9dace407e441458a7
pull/191/head
xiaojun.lin 2019-10-11 19:49:48 +08:00
parent 5bcb660110
commit 7bc9039f2c
4 changed files with 7 additions and 14 deletions

View File

@ -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);
}

View File

@ -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) {

View File

@ -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;

View File

@ -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 {