diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake index f9aff4ff6f..5c27001ead 100644 --- a/core/cmake/ThirdPartyPackages.cmake +++ b/core/cmake/ThirdPartyPackages.cmake @@ -1146,7 +1146,5 @@ if(MILVUS_FPGA_VERSION) include_directories(SYSTEM ${ARMADILLO_INCLUDE_DIR}) install(FILES ${INSTALL_DIR}/lib/libarmadillo.so - ${INSTALL_DIR}/lib/libarmadillo.so.9 - ${INSTALL_DIR}/lib/libarmadillo.so.9.900.4 DESTINATION lib) endif() diff --git a/core/src/db/engine/ExecutionEngineImpl.cpp b/core/src/db/engine/ExecutionEngineImpl.cpp index c3a4362b93..7c20de2150 100644 --- a/core/src/db/engine/ExecutionEngineImpl.cpp +++ b/core/src/db/engine/ExecutionEngineImpl.cpp @@ -624,7 +624,6 @@ ExecutionEngineImpl::CopyToFpga() { std::shared_ptr indexFpga = std::make_shared(ivfpq->index_); indexFpga->SetIndexSize(indexsize); indexFpga->CopyIndexToFpga(); - indexFpga->SetBlacklist(index_->GetBlacklist()); indexFpga->SetUids(index_->GetUids()); index_ = indexFpga; diff --git a/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.cpp b/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.cpp index 06f4431a87..9a8978d07e 100755 --- a/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.cpp +++ b/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.cpp @@ -60,7 +60,8 @@ FPGAIVFPQ::CopyIndexToFpga() { LOG_ENGINE_DEBUG_ << " copy index to fpga end"; } void -FPGAIVFPQ::QueryImpl(int64_t n, const float* data, int64_t k, float* distances, int64_t* labels, const Config& config) { +FPGAIVFPQ::QueryImpl(int64_t n, const float* data, int64_t k, float* distances, int64_t* labels, const Config& config, + faiss::ConcurrentBitsetPtr blacklist) { try { LOG_ENGINE_DEBUG_ << " run fpga search QueryImpl"; auto params = GenParams(config); diff --git a/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.h b/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.h index 879161e86d..5c212322c8 100755 --- a/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.h +++ b/core/src/index/knowhere/knowhere/index/vector_index/fpga/IndexFPGAIVFPQ.h @@ -41,7 +41,8 @@ class FPGAIVFPQ : public IVFPQ { CopyIndexToFpga(); void - QueryImpl(int64_t, const float*, int64_t, float*, int64_t*, const Config&) override; + QueryImpl(int64_t, const float*, int64_t, float*, int64_t*, const Config&, + faiss::ConcurrentBitsetPtr blacklist) override; }; using FPGAIVFPQPtr = std::shared_ptr; diff --git a/core/src/utils/CommonUtil.cpp b/core/src/utils/CommonUtil.cpp index 4aa9158048..c1bf70ce80 100644 --- a/core/src/utils/CommonUtil.cpp +++ b/core/src/utils/CommonUtil.cpp @@ -12,6 +12,9 @@ #include "utils/CommonUtil.h" #include "cache/CpuCacheMgr.h" #include "cache/GpuCacheMgr.h" +#ifdef MILVUS_FPGA_VERSION +#include "cache/FpgaCacheMgr.h" +#endif #include "config/Config.h" #include "db/Utils.h" #include "utils/Log.h"