Merge branch 'fix_hybrid' into 'branch-0.5.0'

MS-652 UPDATE LINT

See merge request megasearch/milvus!718

Former-commit-id: e00518ca76ade9816a5a2e76e073d109e63176f3
pull/191/head
jinhai 2019-10-14 19:54:48 +08:00
commit d9767274f5
1 changed files with 2 additions and 1 deletions

View File

@ -27,6 +27,7 @@
namespace knowhere {
#ifdef CUSTOMIZATION
IndexModelPtr
IVFSQHybrid::Train(const DatasetPtr& dataset, const Config& config) {
auto build_cfg = std::dynamic_pointer_cast<IVFSQCfg>(config);
@ -91,7 +92,7 @@ IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) {
auto gpu_index = faiss::gpu::index_cpu_to_gpu(res->faiss_res.get(), device_id, &index_composition, &option);
std::shared_ptr<faiss::Index> device_index = std::shared_ptr<faiss::Index>(gpu_index);;
std::shared_ptr<faiss::Index> device_index = std::shared_ptr<faiss::Index>(gpu_index);
auto new_idx = std::make_shared<IVFSQHybrid>(device_index, device_id, res);
return new_idx;
} else {