Fix CI warning, use CONST_POINTER in node build

Signed-off-by: alex-yuyue <yue.yu1@huawei.com>
pull/10801/head
alex-yuyue 4 years ago
parent 5fd77356c9
commit 6d1529983f

@ -93,7 +93,7 @@ Status BatchNode::ValidateParams() {
return Status::OK();
}
Status BatchNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status BatchNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
#ifdef ENABLE_PYTHON
// if col_order_ isn't empty, then a project node needs to be attached after batch node. (same as map)
// this means project_node needs to be the parent of batch_node. this means *node_ops = [project_node, batch_node]

@ -60,7 +60,7 @@ class BatchNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -82,7 +82,7 @@ void BucketBatchByLengthNode::Print(std::ostream &out) const {
out << ")";
}
Status BucketBatchByLengthNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status BucketBatchByLengthNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
bucket_boundaries_.insert(bucket_boundaries_.begin(), 0);
node_ops->push_back(std::make_shared<BucketBatchByLengthOp>(
column_names_, bucket_boundaries_, bucket_batch_sizes_, element_length_function_, pad_info_,

@ -55,7 +55,7 @@ class BucketBatchByLengthNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -54,7 +54,7 @@ void BuildSentenceVocabNode::Print(std::ostream &out) const {
}
// Function to build BuildSentenceVocabNode
Status BuildSentenceVocabNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status BuildSentenceVocabNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
std::shared_ptr<BuildSentencePieceVocabOp> build_sentence_piece_vocab_op;
build_sentence_piece_vocab_op = std::make_shared<BuildSentencePieceVocabOp>(
vocab_, col_names_, vocab_size_, character_coverage_, model_type_, params_, connector_que_size_);

@ -53,7 +53,7 @@ class BuildSentenceVocabNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -50,7 +50,7 @@ void BuildVocabNode::Print(std::ostream &out) const {
}
// Function to build BuildVocabNode
Status BuildVocabNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status BuildVocabNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
std::shared_ptr<BuildVocabOp> build_vocab_op;
build_vocab_op = std::make_shared<BuildVocabOp>(vocab_, columns_, freq_range_, top_k_, special_tokens_,
special_first_, num_workers_, connector_que_size_);

@ -52,7 +52,7 @@ class BuildVocabNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -72,7 +72,7 @@ Status ConcatNode::ValidateParams() {
return Status::OK();
}
Status ConcatNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status ConcatNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
if (children_flag_and_nums_.empty() || children_start_end_index_.empty()) {
node_ops->push_back(std::make_shared<ConcatOp>(connector_que_size_));
} else {

@ -53,7 +53,7 @@ class ConcatNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -148,7 +148,7 @@ class DatasetNode : public std::enable_shared_from_this<DatasetNode> {
/// \brief Pure virtual function to convert a DatasetNode class into a runtime dataset object
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
virtual Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) = 0;
virtual Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) = 0;
/// \brief base virtual function for derived class to implement parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -41,7 +41,7 @@ std::shared_ptr<DatasetNode> EpochCtrlNode::Copy() {
void EpochCtrlNode::Print(std::ostream &out) const { out << Name() + "(epoch:" + std::to_string(num_epochs_) + ")"; }
// Function to build the EpochCtrlOp
Status EpochCtrlNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status EpochCtrlNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
node_ops->push_back(std::make_shared<EpochCtrlOp>(num_epochs_));
return Status::OK();
}

@ -52,7 +52,7 @@ class EpochCtrlNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -43,7 +43,7 @@ void FilterNode::Print(std::ostream &out) const {
out << Name() + "(<predicate>," + "input_cols:" + PrintColumns(input_columns_) + ")";
}
Status FilterNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status FilterNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
node_ops->push_back(std::make_shared<FilterOp>(input_columns_, num_workers_, connector_que_size_, predicate_));
return Status::OK();
}

@ -50,7 +50,7 @@ class FilterNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -54,7 +54,7 @@ void MapNode::Print(std::ostream &out) const {
<< operations_.size() << ",...)";
}
Status MapNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status MapNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
std::vector<std::shared_ptr<TensorOp>> tensor_ops;
// Build tensorOp from tensorOperation vector

@ -52,7 +52,7 @@ class MapNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -52,7 +52,7 @@ Status ProjectNode::ValidateParams() {
return Status::OK();
}
Status ProjectNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status ProjectNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
node_ops->push_back(std::make_shared<ProjectOp>(columns_));
return Status::OK();
}

@ -49,7 +49,7 @@ class ProjectNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -57,7 +57,7 @@ Status RenameNode::ValidateParams() {
return Status::OK();
}
Status RenameNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status RenameNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
node_ops->push_back(std::make_shared<RenameOp>(input_columns_, output_columns_, connector_que_size_));
return Status::OK();
}

@ -50,7 +50,7 @@ class RenameNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -37,7 +37,7 @@ std::shared_ptr<DatasetNode> RepeatNode::Copy() {
void RepeatNode::Print(std::ostream &out) const { out << Name() + "(count:" + std::to_string(repeat_count_) + ")"; }
Status RepeatNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status RepeatNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
node_ops->push_back(std::make_shared<RepeatOp>(repeat_count_));
return Status::OK();
}

@ -51,7 +51,7 @@ class RepeatNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Parameters validation
/// \return Status Status::OK() if all the parameters are valid

@ -40,7 +40,7 @@ std::shared_ptr<DatasetNode> RootNode::Copy() {
void RootNode::Print(std::ostream &out) const { out << Name(); }
Status RootNode::Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) {
Status RootNode::Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) {
// root node doesn't build a runtime Op. this function should return Status::Error when called.
std::string err_msg = "Root node doesn't build a runtime Op";
MS_LOG(ERROR) << err_msg;

@ -52,7 +52,7 @@ class RootNode : public DatasetNode {
/// \brief a base class override function to create the required runtime dataset op objects for this class
/// \param node_ops - A vector containing shared pointer to the Dataset Ops that this object will create
/// \return Status Status::OK() if build successfully
Status Build(std::vector<std::shared_ptr<DatasetOp>> *node_ops) override;
Status Build(std::vector<std::shared_ptr<DatasetOp>> *const node_ops) override;
/// \brief Getter of number of epochs
int32_t num_epochs() { return num_epochs_; }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save