From 1c35cfe5cbee343879490b14ebda7756b5cb8399 Mon Sep 17 00:00:00 2001 From: Peilin Wang Date: Mon, 26 Apr 2021 17:34:50 -0400 Subject: [PATCH] fix ci alarms --- .../datasetops/bucket_batch_by_length_op.cc | 17 +++++++++-------- .../datasetops/bucket_batch_by_length_op.h | 15 ++++++++------- .../dataset/text/kernels/to_number_op.cc | 12 ++++++------ .../dataset/text/kernels/to_number_op.h | 12 ++++++------ mindspore/core/abstract/prim_others.cc | 6 +++--- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc index f6a81ff1c2..96ee58b74d 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc @@ -29,8 +29,9 @@ namespace py = pybind11; namespace mindspore { namespace dataset { -BucketBatchByLengthOp::Builder::Builder(std::vector length_dependent_columns, - std::vector bucket_boundaries, std::vector bucket_batch_sizes) +BucketBatchByLengthOp::Builder::Builder(const std::vector &length_dependent_columns, + const std::vector &bucket_boundaries, + const std::vector &bucket_batch_sizes) : builder_length_dependent_columns_(length_dependent_columns), builder_bucket_boundaries_(bucket_boundaries), builder_bucket_batch_sizes_(bucket_batch_sizes), @@ -41,7 +42,7 @@ BucketBatchByLengthOp::Builder::Builder(std::vector length_dependen builder_op_connector_size_ = config_manager->op_connector_size(); } -Status BucketBatchByLengthOp::Builder::SanityCheck() { +Status BucketBatchByLengthOp::Builder::SanityCheck() const { std::string error_message; if (builder_length_dependent_columns_.empty()) { @@ -66,7 +67,7 @@ Status BucketBatchByLengthOp::Builder::Build(std::shared_ptr( builder_length_dependent_columns_, builder_bucket_boundaries_, builder_bucket_batch_sizes_, @@ -76,10 +77,10 @@ Status BucketBatchByLengthOp::Builder::Build(std::shared_ptr length_dependent_columns, - std::vector bucket_boundaries, - std::vector bucket_batch_sizes, - std::shared_ptr element_length_function, PadInfo pad_info, +BucketBatchByLengthOp::BucketBatchByLengthOp(const std::vector &length_dependent_columns, + const std::vector &bucket_boundaries, + const std::vector &bucket_batch_sizes, + std::shared_ptr element_length_function, const PadInfo &pad_info, bool pad_to_bucket_boundary, bool drop_remainder, int32_t op_connector_size) : PipelineOp(op_connector_size), diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h index 2c2c515154..2e968b3abe 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright 2020-2021 Huawei Technologies Co., Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,8 +38,8 @@ class BucketBatchByLengthOp : public PipelineOp { public: class Builder { public: - Builder(std::vector length_dependent_columns, std::vector bucket_boundaries, - std::vector bucket_batch_sizes); + Builder(const std::vector &length_dependent_columns, const std::vector &bucket_boundaries, + const std::vector &bucket_batch_sizes); ~Builder() = default; @@ -86,7 +86,7 @@ class BucketBatchByLengthOp : public PipelineOp { Status Build(std::shared_ptr *new_bucket_batch_by_length_op); private: - Status SanityCheck(); + Status SanityCheck() const; std::vector builder_length_dependent_columns_; std::vector builder_bucket_boundaries_; @@ -98,9 +98,10 @@ class BucketBatchByLengthOp : public PipelineOp { int32_t builder_op_connector_size_; }; - BucketBatchByLengthOp(std::vector length_dependent_columns, std::vector bucket_boundaries, - std::vector bucket_batch_sizes, std::shared_ptr element_length_function, - PadInfo pad_info, bool pad_to_bucket_boundary, bool drop_remainder, int32_t op_connector_size); + BucketBatchByLengthOp(const std::vector &length_dependent_columns, + const std::vector &bucket_boundaries, const std::vector &bucket_batch_sizes, + std::shared_ptr element_length_function, const PadInfo &pad_info, + bool pad_to_bucket_boundary, bool drop_remainder, int32_t op_connector_size); // Destructor ~BucketBatchByLengthOp() = default; diff --git a/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc index 8e06a25a3f..c70b670c08 100644 --- a/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright 2020-2021 Huawei Technologies Co., Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,7 +91,7 @@ Status ToNumberOp::OutputShape(const std::vector &input_shapes, std } template -Status ToNumberOp::ToSignedIntegral(const std::shared_ptr &input, std::shared_ptr *output) { +Status ToNumberOp::ToSignedIntegral(const std::shared_ptr &input, std::shared_ptr *output) const { std::vector casted; for (auto it = input->begin(); it != input->end(); ++it) { @@ -128,7 +128,7 @@ Status ToNumberOp::ToSignedIntegral(const std::shared_ptr &input, std::s } template -Status ToNumberOp::ToUnsignedIntegral(const std::shared_ptr &input, std::shared_ptr *output) { +Status ToNumberOp::ToUnsignedIntegral(const std::shared_ptr &input, std::shared_ptr *output) const { std::vector casted; for (auto it = input->begin(); it != input->end(); ++it) { @@ -174,7 +174,7 @@ Status ToNumberOp::ToUnsignedIntegral(const std::shared_ptr &input, std: return Status::OK(); } -Status ToNumberOp::ToFloat16(const std::shared_ptr &input, std::shared_ptr *output) { +Status ToNumberOp::ToFloat16(const std::shared_ptr &input, std::shared_ptr *output) const { // special case, float16 does not exist in c++, no native support for // casting, so cast to float first then use this method, which use Eigen. std::shared_ptr temp; @@ -184,7 +184,7 @@ Status ToNumberOp::ToFloat16(const std::shared_ptr &input, std::shared_p return Status::OK(); } -Status ToNumberOp::ToFloat(const std::shared_ptr &input, std::shared_ptr *output) { +Status ToNumberOp::ToFloat(const std::shared_ptr &input, std::shared_ptr *output) const { std::vector casted; for (auto it = input->begin(); it != input->end(); ++it) { @@ -222,7 +222,7 @@ Status ToNumberOp::ToFloat(const std::shared_ptr &input, std::shared_ptr return Status::OK(); } -Status ToNumberOp::ToDouble(const std::shared_ptr &input, std::shared_ptr *output) { +Status ToNumberOp::ToDouble(const std::shared_ptr &input, std::shared_ptr *output) const { std::vector casted; for (auto it = input->begin(); it != input->end(); ++it) { diff --git a/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h index d13c5e9236..ef1978df87 100644 --- a/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h @@ -1,5 +1,5 @@ /** - * Copyright 2020 Huawei Technologies Co., Ltd + * Copyright 2020-2021 Huawei Technologies Co., Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,16 +61,16 @@ class ToNumberOp : public TensorOp { private: template - Status ToSignedIntegral(const std::shared_ptr &input, std::shared_ptr *output); + Status ToSignedIntegral(const std::shared_ptr &input, std::shared_ptr *output) const; template - Status ToUnsignedIntegral(const std::shared_ptr &input, std::shared_ptr *output); + Status ToUnsignedIntegral(const std::shared_ptr &input, std::shared_ptr *output) const; - Status ToFloat16(const std::shared_ptr &input, std::shared_ptr *output); + Status ToFloat16(const std::shared_ptr &input, std::shared_ptr *output) const; - Status ToFloat(const std::shared_ptr &input, std::shared_ptr *output); + Status ToFloat(const std::shared_ptr &input, std::shared_ptr *output) const; - Status ToDouble(const std::shared_ptr &input, std::shared_ptr *output); + Status ToDouble(const std::shared_ptr &input, std::shared_ptr *output) const; DataType cast_to_type_; }; diff --git a/mindspore/core/abstract/prim_others.cc b/mindspore/core/abstract/prim_others.cc index 7a15d3a067..e107e3f4e5 100644 --- a/mindspore/core/abstract/prim_others.cc +++ b/mindspore/core/abstract/prim_others.cc @@ -1,5 +1,5 @@ /** - * Copyright 2019 Huawei Technologies Co., Ltd + * Copyright 2019-2021 Huawei Technologies Co., Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -530,7 +530,7 @@ AbstractBasePtr InferImplExpandDims(const AnalysisEnginePtr &, const PrimitivePt std::vector shape; std::vector x_shape = x->shape()->shape(); - shape.insert(shape.end(), x_shape.begin(), x_shape.end()); + (void)shape.insert(shape.end(), x_shape.begin(), x_shape.end()); auto axis = primitive->GetAttr("axis"); auto value = GetValue(axis); if (value < -(SizeToInt(x_shape.size()) + 1) || value > SizeToInt(x_shape.size())) { @@ -540,7 +540,7 @@ AbstractBasePtr InferImplExpandDims(const AnalysisEnginePtr &, const PrimitivePt if (value < 0) { value = value + SizeToInt(x_shape.size()) + 1; } - shape.insert(shape.begin() + value, 1); + (void)shape.insert(shape.begin() + value, 1); auto ret = std::make_shared(x->element(), std::make_shared(shape)); return ret;