Merge branch 'fix_testivf' into 'branch-0.5.0'

MS-648 fix ivf test

See merge request megasearch/milvus!711

Former-commit-id: 1f623de80f8e4c2668f2a30c7a069433c9d333a6
pull/191/head
peng.xu 2019-10-14 16:00:11 +08:00
commit 25894b28ee
1 changed files with 2 additions and 6 deletions

View File

@ -79,12 +79,8 @@ IVFSQHybrid::CopyGpuToCpu(const Config& config) {
VectorIndexPtr
IVFSQHybrid::CopyCpuToGpu(const int64_t& device_id, const Config& config) {
if (auto res = FaissGpuResourceMgr::GetInstance().GetRes(device_id)) {
auto p = CopyCpuToGpuWithQuantizer(device_id, config);
return p.first;
} else {
KNOWHERE_THROW_MSG("CopyCpuToGpu Error, can't get gpu_resource");
}
auto p = CopyCpuToGpuWithQuantizer(device_id, config);
return p.first;
}
void