mirror of https://github.com/milvus-io/milvus.git
Merge branch 'branch-0.5.0' into 'branch-0.5.0'
solve cpplint See merge request megasearch/milvus!688 Former-commit-id: ecd1da1744a2b0e7ccb0743aa195e7b23478064dpull/191/head
commit
c884b9fde2
|
@ -164,7 +164,7 @@ IVFSQHybrid::SetQuantizer(const QuantizerPtr& q) {
|
|||
|
||||
faiss::gpu::GpuIndexFlat* is_gpu_flat_index = dynamic_cast<faiss::gpu::GpuIndexFlat*>(ivf_index->quantizer);
|
||||
if (is_gpu_flat_index == nullptr) {
|
||||
// delete ivf_index->quantizer;
|
||||
// delete ivf_index->quantizer;
|
||||
ivf_index->quantizer = ivf_quantizer->quantizer;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ class IVFSQHybrid : public GPUIVFSQ {
|
|||
LoadImpl(const BinarySet& index_binary) override;
|
||||
|
||||
protected:
|
||||
int64_t gpu_mode = 0; // 0,1,2
|
||||
int64_t gpu_mode = 0; // 0,1,2
|
||||
};
|
||||
|
||||
} // namespace knowhere
|
||||
|
|
|
@ -31,18 +31,18 @@
|
|||
#include "wrapper/ConfAdapter.h"
|
||||
#include "wrapper/ConfAdapterMgr.h"
|
||||
|
||||
#include <src/scheduler/Utils.h>
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
#include <src/scheduler/Utils.h>
|
||||
#include <vector>
|
||||
|
||||
namespace milvus {
|
||||
namespace engine {
|
||||
|
||||
class CachedQuantizer : public cache::DataObj {
|
||||
public:
|
||||
explicit
|
||||
CachedQuantizer(knowhere::QuantizerPtr data)
|
||||
: data_(std::move(data)) {}
|
||||
explicit CachedQuantizer(knowhere::QuantizerPtr data) : data_(std::move(data)) {
|
||||
}
|
||||
|
||||
knowhere::QuantizerPtr
|
||||
Data() {
|
||||
|
|
|
@ -109,7 +109,7 @@ class ExecutionEngineImpl : public ExecutionEngine {
|
|||
|
||||
void
|
||||
HybridLoad() const;
|
||||
|
||||
|
||||
void
|
||||
HybridUnset() const;
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#include "TaskCreator.h"
|
||||
#include "task/Task.h"
|
||||
|
||||
#include <utility>
|
||||
#include <src/scheduler/optimizer/Optimizer.h>
|
||||
#include <utility>
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
|
|
@ -15,12 +15,14 @@
|
|||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
#include "server/Config.h"
|
||||
#include "scheduler/Utils.h"
|
||||
#include "server/Config.h"
|
||||
#include "utils/Log.h"
|
||||
|
||||
#include <cuda_runtime.h>
|
||||
#include <chrono>
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
namespace milvus {
|
||||
namespace scheduler {
|
||||
|
@ -75,7 +77,7 @@ get_gpu_pool() {
|
|||
}
|
||||
|
||||
return gpu_pool;
|
||||
};
|
||||
}
|
||||
|
||||
} // namespace scheduler
|
||||
} // namespace milvus
|
||||
|
|
|
@ -94,7 +94,7 @@ class IVFMixIndex : public VecIndexImpl {
|
|||
class IVFHybridIndex : public IVFMixIndex {
|
||||
public:
|
||||
explicit IVFHybridIndex(std::shared_ptr<knowhere::VectorIndex> index, const IndexType& type)
|
||||
: IVFMixIndex(std::move(index), type) {
|
||||
: IVFMixIndex(std::move(index), type) {
|
||||
}
|
||||
|
||||
knowhere::QuantizerPtr
|
||||
|
|
Loading…
Reference in New Issue