From a7932b0365bfdd0a1538a27ccc9d9d3e0d2e051b Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Sat, 28 Mar 2020 13:08:42 +0800 Subject: [PATCH] #1781 fix search hang with SQ8H (#1783) Signed-off-by: yudong.cai --- CHANGELOG.md | 1 + core/src/db/engine/ExecutionEngineImpl.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93e32ec3..064beba3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Please mark all change in change log and use the issue from GitHub - \#1735 Fix search out of memory with ivf_flat - \#1747 Expected error status if search with partition_tag not existed - \#1756 Fix memory exhausted during searching +- \#1781 Fix search hang with SQ8H ## Feature - \#1603 BinaryFlat add 2 Metric: Substructure and Superstructure diff --git a/core/src/db/engine/ExecutionEngineImpl.cpp b/core/src/db/engine/ExecutionEngineImpl.cpp index ace87022..d9f3788e 100644 --- a/core/src/db/engine/ExecutionEngineImpl.cpp +++ b/core/src/db/engine/ExecutionEngineImpl.cpp @@ -551,11 +551,11 @@ ExecutionEngineImpl::CopyToGpu(uint64_t device_id, bool hybrid) { */ ENGINE_LOG_DEBUG << "CPU to GPU" << device_id << " start"; auto gpu_cache_mgr = cache::GpuCacheMgr::GetInstance(device_id); - gpu_cache_mgr->Lock(); - gpu_cache_mgr->Reserve(index_->Size()); + // gpu_cache_mgr->Lock(); + // gpu_cache_mgr->Reserve(index_->Size()); index_ = knowhere::cloner::CopyCpuToGpu(index_, device_id, knowhere::Config()); - gpu_cache_mgr->InsertItem(location_, std::static_pointer_cast(index_)); - gpu_cache_mgr->Unlock(); + // gpu_cache_mgr->InsertItem(location_, std::static_pointer_cast(index_)); + // gpu_cache_mgr->Unlock(); ENGINE_LOG_DEBUG << "CPU to GPU" << device_id << " finished"; } catch (std::exception& e) { ENGINE_LOG_ERROR << e.what(); -- GitLab