diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc index 753fc02bdd..f8aff33e31 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc @@ -60,6 +60,5 @@ Status DecodeOp::OutputType(const std::vector &inputs, std::vector UniqueOperation::Build() { return std::make_shared(); } #endif - } // namespace transforms } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/data/transforms_ir.h b/mindspore/ccsrc/minddata/dataset/kernels/ir/data/transforms_ir.h index 5f9c38445c..bd95890139 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/data/transforms_ir.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/data/transforms_ir.h @@ -26,7 +26,6 @@ namespace mindspore { namespace dataset { - // Char arrays storing name of corresponding classes (in alphabetical order) constexpr char kComposeOperation[] = "Compose"; constexpr char kDuplicateOperation[] = "Duplicate"; diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/tensor_operation.h b/mindspore/ccsrc/minddata/dataset/kernels/ir/tensor_operation.h index 186f1c3424..bfd3d9f19a 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/tensor_operation.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/tensor_operation.h @@ -25,7 +25,6 @@ namespace mindspore { namespace dataset { - // Abstract class to represent a dataset in the data pipeline. class TensorOperation : public std::enable_shared_from_this { public: diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.cc index 1c668f7e38..b17a85ab60 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.cc @@ -17,7 +17,6 @@ namespace mindspore { namespace dataset { - /* ####################################### Validator Functions ############################################ */ Status ValidateProbability(const std::string &op_name, const float probability) { if (probability < 0.0 || probability > 1.0) { diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.h b/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.h index b45e395806..a005abb7d6 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/validators.h @@ -27,7 +27,6 @@ namespace mindspore { namespace dataset { - // Helper function to validate probability Status ValidateProbability(const std::string &op_name, const float probability); diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vision_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vision_ir.cc index e799277e07..00fbde7c28 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vision_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vision_ir.cc @@ -1210,6 +1210,8 @@ Status RandomSelectSubpolicyOperation::ValidateParams() { std::string err_msg = "RandomSelectSubpolicy: transform in policy" + transform_pos + " must not be null"; MS_LOG(ERROR) << err_msg; RETURN_STATUS_SYNTAX_ERROR(err_msg); + } else { + RETURN_IF_NOT_OK(policy_[i][j].first->ValidateParams()); } if (policy_[i][j].second < 0.0 || policy_[i][j].second > 1.0) { std::string transform_pos = "[" + std::to_string(i) + "]" + "[" + std::to_string(j) + "]"; diff --git a/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.cc b/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.cc index 7ad2cf5560..3a7d9e9353 100644 --- a/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.cc @@ -47,10 +47,8 @@ namespace mindspore { namespace dataset { - // Transform operations for text. namespace text { - /* ####################################### Derived TensorOperation classes ################################# */ // (In alphabetical order) @@ -421,7 +419,6 @@ std::shared_ptr WhitespaceTokenizerOperation::Build() { return tensor_op; } #endif - } // namespace text } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.h b/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.h index 615f8789e4..c06970f644 100644 --- a/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.h +++ b/mindspore/ccsrc/minddata/dataset/text/ir/kernels/text_ir.h @@ -27,13 +27,11 @@ namespace mindspore { namespace dataset { - class Vocab; class SentencePieceVocab; // Transform operations for text namespace text { - // Char arrays storing name of corresponding classes (in alphabetical order) constexpr char kBasicTokenizerOperation[] = "BasicTokenizer"; constexpr char kBertTokenizerOperation[] = "BertTokenizer"; diff --git a/mindspore/ccsrc/minddata/dataset/text/ir/validators.h b/mindspore/ccsrc/minddata/dataset/text/ir/validators.h index c13d2ae8a5..fc6e061914 100644 --- a/mindspore/ccsrc/minddata/dataset/text/ir/validators.h +++ b/mindspore/ccsrc/minddata/dataset/text/ir/validators.h @@ -24,7 +24,6 @@ namespace mindspore { namespace dataset { - // Helper function to validate tokenizer directory parameter Status ValidateTokenizerDirParam(const std::string &tokenizer_name, const std::string &tokenizer_file); diff --git a/tests/ut/cpp/dataset/c_api_vision_random_subselect_policy_test.cc b/tests/ut/cpp/dataset/c_api_vision_random_subselect_policy_test.cc index dade6f8edd..f9a47ae3da 100644 --- a/tests/ut/cpp/dataset/c_api_vision_random_subselect_policy_test.cc +++ b/tests/ut/cpp/dataset/c_api_vision_random_subselect_policy_test.cc @@ -357,6 +357,5 @@ TEST_F(MindDataTestPipeline, TestRandomSelectSubpolicyFail4) { // Create an iterator over the result of the above dataset std::shared_ptr iter = ds->CreateIterator(); // Expect failure: Invalid RandomSelectSubpolicy input - // EXPECT_EQ(iter, nullptr); - // FIXME - Code bug; this case wrongly succeeds. + EXPECT_EQ(iter, nullptr); }