chore: enable modernize-use-override and fix existing violations (#419)
Add modernize-use-override to .clang-tidy and apply fixes across src/ and tests/: replace redundant virtual with override, annotate missing override on derived methods, and drop redundant virtual on already-overridden methods.
This commit is contained in:
@@ -39,38 +39,38 @@ class KmeansCluster : public IndexCluster {
|
||||
KmeansCluster(bool batch) : batch_(batch) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~KmeansCluster(void) {}
|
||||
~KmeansCluster(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
virtual int init(const IndexMeta &meta, const ailego::Params ¶ms);
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override;
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void);
|
||||
int cleanup(void) override;
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void);
|
||||
int reset(void) override;
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms);
|
||||
int update(const ailego::Params ¶ms) override;
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k);
|
||||
void suggest(uint32_t k) override;
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats);
|
||||
int mount(IndexFeatures::Pointer feats) override;
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
protected:
|
||||
//! Test if it is valid
|
||||
@@ -169,23 +169,23 @@ class KmeansCentroidFeatures : public IndexFeatures {
|
||||
feature_dimension_(meta.dimension()),
|
||||
data_type_(meta.data_type()) {}
|
||||
|
||||
virtual size_t count(void) const {
|
||||
size_t count(void) const override {
|
||||
return centroids_.size();
|
||||
}
|
||||
|
||||
virtual size_t dimension(void) const {
|
||||
size_t dimension(void) const override {
|
||||
return feature_dimension_;
|
||||
}
|
||||
|
||||
virtual const void *element(size_t i) const {
|
||||
const void *element(size_t i) const override {
|
||||
return centroids_[i].feature();
|
||||
}
|
||||
|
||||
virtual IndexMeta::DataType data_type(void) const {
|
||||
IndexMeta::DataType data_type(void) const override {
|
||||
return data_type_;
|
||||
}
|
||||
|
||||
virtual size_t element_size(void) const {
|
||||
size_t element_size(void) const override {
|
||||
return feature_size_;
|
||||
}
|
||||
|
||||
|
||||
@@ -29,38 +29,38 @@ class OptKmeansAlgorithm : public IndexCluster {
|
||||
OptKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~OptKmeansAlgorithm(void) {}
|
||||
~OptKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms);
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override;
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats);
|
||||
int mount(IndexFeatures::Pointer feats) override;
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k);
|
||||
void suggest(uint32_t k) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) = 0;
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override = 0;
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void);
|
||||
int cleanup(void) override;
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void);
|
||||
int reset(void) override;
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms);
|
||||
int update(const ailego::Params ¶ms) override;
|
||||
|
||||
protected:
|
||||
//! Update parameters
|
||||
@@ -498,11 +498,11 @@ class NumericalKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NumericalKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NumericalKmeansAlgorithm(void) {}
|
||||
~NumericalKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
void update_centroids(
|
||||
@@ -631,11 +631,11 @@ class NibbleKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NibbleKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NibbleKmeansAlgorithm(void) {}
|
||||
~NibbleKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
//! update centroids
|
||||
@@ -765,11 +765,11 @@ class NumericalInnerProductKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NumericalInnerProductKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NumericalInnerProductKmeansAlgorithm(void) {}
|
||||
~NumericalInnerProductKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
void update_centroids(
|
||||
@@ -899,11 +899,11 @@ class NibbleInnerProductKmeansAlgorithm : public OptKmeansAlgorithm {
|
||||
NibbleInnerProductKmeansAlgorithm(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~NibbleInnerProductKmeansAlgorithm(void) {}
|
||||
~NibbleInnerProductKmeansAlgorithm(void) override {}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
protected:
|
||||
//! update centroids
|
||||
@@ -1026,38 +1026,38 @@ class OptKmeansCluster : public IndexCluster {
|
||||
OptKmeansCluster(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~OptKmeansCluster(void) {}
|
||||
~OptKmeansCluster(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
virtual int init(const IndexMeta &meta, const ailego::Params ¶ms);
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override;
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void);
|
||||
int cleanup(void) override;
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void);
|
||||
int reset(void) override;
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms);
|
||||
int update(const ailego::Params ¶ms) override;
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k);
|
||||
void suggest(uint32_t k) override;
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats);
|
||||
int mount(IndexFeatures::Pointer feats) override;
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
protected:
|
||||
//! Members
|
||||
|
||||
@@ -28,40 +28,40 @@ class StratifiedCluster : public IndexCluster {
|
||||
StratifiedCluster(void) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~StratifiedCluster(void) {}
|
||||
~StratifiedCluster(void) override {}
|
||||
|
||||
//! Initialize Cluster
|
||||
virtual int init(const IndexMeta &meta, const ailego::Params ¶ms) {
|
||||
int init(const IndexMeta &meta, const ailego::Params ¶ms) override {
|
||||
meta_ = meta;
|
||||
this->update_params(params);
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Cleanup Cluster
|
||||
virtual int cleanup(void) {
|
||||
int cleanup(void) override {
|
||||
features_.reset();
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Reset Cluster
|
||||
virtual int reset(void) {
|
||||
int reset(void) override {
|
||||
features_.reset();
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Update Cluster
|
||||
virtual int update(const ailego::Params ¶ms) {
|
||||
int update(const ailego::Params ¶ms) override {
|
||||
this->update_params(params);
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Suggest dividing to K clusters
|
||||
virtual void suggest(uint32_t k) {
|
||||
void suggest(uint32_t k) override {
|
||||
cluster_count_ = k;
|
||||
}
|
||||
|
||||
//! Mount features
|
||||
virtual int mount(IndexFeatures::Pointer feats) {
|
||||
int mount(IndexFeatures::Pointer feats) override {
|
||||
if (!feats) {
|
||||
return IndexError_InvalidArgument;
|
||||
}
|
||||
@@ -73,17 +73,17 @@ class StratifiedCluster : public IndexCluster {
|
||||
}
|
||||
|
||||
//! Cluster
|
||||
virtual int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int cluster(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Classify
|
||||
virtual int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s);
|
||||
int classify(IndexThreads::Pointer threads,
|
||||
IndexCluster::CentroidList ¢s) override;
|
||||
|
||||
//! Label
|
||||
virtual int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out);
|
||||
int label(IndexThreads::Pointer threads,
|
||||
const IndexCluster::CentroidList ¢s,
|
||||
std::vector<uint32_t> *out) override;
|
||||
|
||||
protected:
|
||||
//! Test if it is valid
|
||||
|
||||
@@ -37,25 +37,25 @@ class LabelFilteredIndexHolder : public IndexHolder {
|
||||
: holder_(holder), elems_(elems) {}
|
||||
|
||||
//! Destructor
|
||||
virtual ~Iterator(void) {}
|
||||
~Iterator(void) override {}
|
||||
|
||||
//! Retrieve pointer of data
|
||||
virtual const void *data(void) const override {
|
||||
const void *data(void) const override {
|
||||
return holder_->element((*elems_)[index_]);
|
||||
}
|
||||
|
||||
//! Test if the iterator is valid
|
||||
virtual bool is_valid(void) const override {
|
||||
bool is_valid(void) const override {
|
||||
return index_ < elems_->size();
|
||||
}
|
||||
|
||||
//! Retrieve primary key
|
||||
virtual uint64_t key(void) const override {
|
||||
uint64_t key(void) const override {
|
||||
return (*elems_)[index_];
|
||||
}
|
||||
|
||||
//! Next iterator
|
||||
virtual void next(void) override {
|
||||
void next(void) override {
|
||||
++index_;
|
||||
}
|
||||
|
||||
@@ -73,32 +73,32 @@ class LabelFilteredIndexHolder : public IndexHolder {
|
||||
: holder_(holder), elems_(&items) {}
|
||||
|
||||
//! Retrieve count of elements in holder (-1 indicates unknown)
|
||||
virtual size_t count(void) const override {
|
||||
size_t count(void) const override {
|
||||
return elems_->size();
|
||||
}
|
||||
|
||||
//! Retrieve dimension
|
||||
virtual size_t dimension(void) const override {
|
||||
size_t dimension(void) const override {
|
||||
return holder_->dimension();
|
||||
}
|
||||
|
||||
//! Retrieve type information
|
||||
virtual IndexMeta::DataType data_type(void) const override {
|
||||
IndexMeta::DataType data_type(void) const override {
|
||||
return holder_->data_type();
|
||||
}
|
||||
|
||||
//! Retrieve element size in bytes
|
||||
virtual size_t element_size(void) const override {
|
||||
size_t element_size(void) const override {
|
||||
return holder_->element_size();
|
||||
}
|
||||
|
||||
//! Retrieve if it can multi-pass
|
||||
virtual bool multipass(void) const override {
|
||||
bool multipass(void) const override {
|
||||
return true;
|
||||
}
|
||||
|
||||
//! Create a new iterator
|
||||
virtual IndexHolder::Iterator::Pointer create_iterator(void) override {
|
||||
IndexHolder::Iterator::Pointer create_iterator(void) override {
|
||||
return IndexHolder::Iterator::Pointer(
|
||||
new LabelFilteredIndexHolder::Iterator(holder_, elems_));
|
||||
}
|
||||
|
||||
@@ -28,51 +28,51 @@ class FakeClusterTrainer : public IndexTrainer {
|
||||
: meta_(imeta), bundle_(bundle) {}
|
||||
|
||||
//! Destructor
|
||||
~FakeClusterTrainer(void) {}
|
||||
~FakeClusterTrainer(void) override {}
|
||||
|
||||
protected:
|
||||
//! Initialize Trainer
|
||||
virtual int init(const IndexMeta &, const ailego::Params &) override {
|
||||
int init(const IndexMeta &, const ailego::Params &) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Cleanup Trainer
|
||||
virtual int cleanup(void) override {
|
||||
int cleanup(void) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Train the data
|
||||
virtual int train(IndexHolder::Pointer) override {
|
||||
int train(IndexHolder::Pointer) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Train the data
|
||||
virtual int train(IndexThreads::Pointer, IndexHolder::Pointer) override {
|
||||
int train(IndexThreads::Pointer, IndexHolder::Pointer) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Load index from file path or dir
|
||||
virtual int load(IndexStorage::Pointer) override {
|
||||
int load(IndexStorage::Pointer) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Dump index into file path or dir
|
||||
virtual int dump(const IndexDumper::Pointer &) override {
|
||||
int dump(const IndexDumper::Pointer &) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Retrieve Index Meta
|
||||
virtual const IndexMeta &meta(void) const override {
|
||||
const IndexMeta &meta(void) const override {
|
||||
return meta_;
|
||||
}
|
||||
|
||||
//! Retrieve statistics
|
||||
virtual const IndexTrainer::Stats &stats(void) const override {
|
||||
const IndexTrainer::Stats &stats(void) const override {
|
||||
return stats_;
|
||||
}
|
||||
|
||||
//! Retrieve the output indexes
|
||||
virtual IndexBundle::Pointer indexes(void) const override {
|
||||
IndexBundle::Pointer indexes(void) const override {
|
||||
return bundle_;
|
||||
}
|
||||
|
||||
@@ -88,29 +88,29 @@ class FakeClusterTrainer : public IndexTrainer {
|
||||
class Int8QuantizerReformer4IP : public IndexReformer {
|
||||
public:
|
||||
//! Initialize Reformer
|
||||
virtual int init(const ailego::Params &) override {
|
||||
int init(const ailego::Params &) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Cleanup Reformer
|
||||
virtual int cleanup(void) override {
|
||||
int cleanup(void) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Load index from container
|
||||
virtual int load(IndexStorage::Pointer) override {
|
||||
int load(IndexStorage::Pointer) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Unload index
|
||||
virtual int unload(void) override {
|
||||
int unload(void) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Transform query
|
||||
virtual int transform(const void * /*query*/,
|
||||
const IndexQueryMeta & /*qmeta*/, std::string * /*out*/,
|
||||
IndexQueryMeta * /*ometa*/) const override {
|
||||
int transform(const void * /*query*/, const IndexQueryMeta & /*qmeta*/,
|
||||
std::string * /*out*/,
|
||||
IndexQueryMeta * /*ometa*/) const override {
|
||||
#if 0
|
||||
size_t dim = qmeta.dimension();
|
||||
out->resize(IndexMeta::ElementSizeof(
|
||||
@@ -140,9 +140,8 @@ class Int8QuantizerReformer4IP : public IndexReformer {
|
||||
}
|
||||
|
||||
//! Transform queries
|
||||
virtual int transform(const void *query, const IndexQueryMeta &qmeta,
|
||||
uint32_t count, std::string *oquery,
|
||||
IndexQueryMeta *ometa) const override {
|
||||
int transform(const void *query, const IndexQueryMeta &qmeta, uint32_t count,
|
||||
std::string *oquery, IndexQueryMeta *ometa) const override {
|
||||
size_t dim = qmeta.dimension();
|
||||
oquery->resize(count *
|
||||
IndexMeta::ElementSizeof(IndexMeta::DataType::DT_INT8, dim));
|
||||
@@ -172,9 +171,8 @@ class Int8QuantizerReformer4IP : public IndexReformer {
|
||||
}
|
||||
|
||||
//! Normalize results
|
||||
virtual int normalize(const void * /*query*/,
|
||||
const IndexQueryMeta & /*qmeta*/,
|
||||
IndexDocumentList & /*result*/) const override {
|
||||
int normalize(const void * /*query*/, const IndexQueryMeta & /*qmeta*/,
|
||||
IndexDocumentList & /*result*/) const override {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
@@ -184,36 +182,35 @@ class Int8QuantizerReformer4IP : public IndexReformer {
|
||||
class Int4QuantizerReformer4IP : public IndexReformer {
|
||||
public:
|
||||
//! Initialize Reformer
|
||||
virtual int init(const ailego::Params &) override {
|
||||
int init(const ailego::Params &) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Cleanup Reformer
|
||||
virtual int cleanup(void) override {
|
||||
int cleanup(void) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Load index from container
|
||||
virtual int load(IndexStorage::Pointer) override {
|
||||
int load(IndexStorage::Pointer) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Unload index
|
||||
virtual int unload(void) override {
|
||||
int unload(void) override {
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! Transform query
|
||||
virtual int transform(const void * /*query*/,
|
||||
const IndexQueryMeta & /*qmeta*/, std::string * /*out*/,
|
||||
IndexQueryMeta * /*ometa*/) const override {
|
||||
int transform(const void * /*query*/, const IndexQueryMeta & /*qmeta*/,
|
||||
std::string * /*out*/,
|
||||
IndexQueryMeta * /*ometa*/) const override {
|
||||
return IndexError_NotImplemented;
|
||||
}
|
||||
|
||||
//! Transform queries
|
||||
virtual int transform(const void *query, const IndexQueryMeta &qmeta,
|
||||
uint32_t count, std::string *oquery,
|
||||
IndexQueryMeta *ometa) const override {
|
||||
int transform(const void *query, const IndexQueryMeta &qmeta, uint32_t count,
|
||||
std::string *oquery, IndexQueryMeta *ometa) const override {
|
||||
if (qmeta.dimension() & 0x1) {
|
||||
LOG_ERROR("Unsuuport dim=%u for transform", qmeta.dimension());
|
||||
return IndexError_Unsupported;
|
||||
@@ -251,9 +248,8 @@ class Int4QuantizerReformer4IP : public IndexReformer {
|
||||
}
|
||||
|
||||
//! Normalize results
|
||||
virtual int normalize(const void * /*query*/,
|
||||
const IndexQueryMeta & /*qmeta*/,
|
||||
IndexDocumentList & /*result*/) const override {
|
||||
int normalize(const void * /*query*/, const IndexQueryMeta & /*qmeta*/,
|
||||
IndexDocumentList & /*result*/) const override {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user