From 42f1cc9e48973f6d6926891fcfd562f9325d6aec Mon Sep 17 00:00:00 2001 From: shenwei41 Date: Fri, 17 Sep 2021 17:36:38 +0800 Subject: [PATCH] fix move profiling --- mindspore/ccsrc/minddata/dataset/api/audio.cc | 1 - .../minddata/dataset/audio/ir/kernels/allpass_biquad_ir.cc | 1 - .../minddata/dataset/audio/ir/kernels/amplitude_to_db_ir.cc | 1 - .../ccsrc/minddata/dataset/audio/ir/kernels/angle_ir.cc | 2 -- .../minddata/dataset/audio/ir/kernels/band_biquad_ir.cc | 1 - .../minddata/dataset/audio/ir/kernels/bandpass_biquad_ir.cc | 1 - .../dataset/audio/ir/kernels/bandreject_biquad_ir.cc | 1 - .../minddata/dataset/audio/ir/kernels/bass_biquad_ir.cc | 1 - .../ccsrc/minddata/dataset/audio/ir/kernels/biquad_ir.cc | 1 - .../minddata/dataset/audio/ir/kernels/complex_norm_ir.cc | 3 --- .../ccsrc/minddata/dataset/audio/ir/kernels/contrast_ir.cc | 1 - .../ccsrc/minddata/dataset/audio/ir/kernels/dc_shift_ir.cc | 2 -- .../minddata/dataset/audio/ir/kernels/equalizer_biquad_ir.cc | 1 - .../dataset/audio/ir/kernels/frequency_masking_ir.cc | 2 -- .../minddata/dataset/audio/ir/kernels/highpass_biquad_ir.cc | 1 - .../ccsrc/minddata/dataset/audio/ir/kernels/lfilter_ir.cc | 1 - .../minddata/dataset/audio/ir/kernels/mu_law_decoding_ir.cc | 3 --- .../minddata/dataset/audio/ir/kernels/time_masking_ir.cc | 1 - .../minddata/dataset/audio/ir/kernels/time_stretch_ir.cc | 1 - mindspore/ccsrc/minddata/dataset/audio/ir/kernels/vol_ir.cc | 1 - mindspore/ccsrc/minddata/dataset/audio/ir/validators.cc | 2 -- .../minddata/dataset/audio/kernels/allpass_biquad_op.cc | 1 - .../minddata/dataset/audio/kernels/amplitude_to_db_op.cc | 2 -- mindspore/ccsrc/minddata/dataset/audio/kernels/angle_op.cc | 2 -- .../ccsrc/minddata/dataset/audio/kernels/audio_utils.cc | 1 - .../ccsrc/minddata/dataset/audio/kernels/band_biquad_op.cc | 2 -- .../minddata/dataset/audio/kernels/bandpass_biquad_op.cc | 1 - .../minddata/dataset/audio/kernels/bandreject_biquad_op.cc | 1 - .../ccsrc/minddata/dataset/audio/kernels/bass_biquad_op.cc | 1 - .../ccsrc/minddata/dataset/audio/kernels/complex_norm_op.cc | 2 -- .../ccsrc/minddata/dataset/audio/kernels/contrast_op.cc | 2 -- .../ccsrc/minddata/dataset/audio/kernels/dc_shift_op.cc | 2 -- .../minddata/dataset/audio/kernels/equalizer_biquad_op.cc | 1 - mindspore/ccsrc/minddata/dataset/audio/kernels/fade_op.cc | 1 - .../minddata/dataset/audio/kernels/frequency_masking_op.cc | 1 - .../minddata/dataset/audio/kernels/highpass_biquad_op.cc | 1 - mindspore/ccsrc/minddata/dataset/audio/kernels/lfilter_op.cc | 1 - .../minddata/dataset/audio/kernels/lowpass_biquad_op.cc | 2 -- .../minddata/dataset/audio/kernels/mu_law_decoding_op.cc | 2 -- .../ccsrc/minddata/dataset/audio/kernels/time_masking_op.cc | 1 - .../ccsrc/minddata/dataset/audio/kernels/time_stretch_op.cc | 1 - mindspore/ccsrc/minddata/dataset/audio/kernels/vol_op.cc | 2 -- mindspore/ccsrc/minddata/dataset/engine/cache/cache_hw.cc | 1 - .../minddata/dataset/engine/datasetops/device_queue_op.cc | 4 +--- .../minddata/dataset/engine/datasetops/source/sbu_op.cc | 1 - .../minddata/dataset/engine/datasetops/source/usps_op.cc | 1 - mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc | 1 - .../dataset/engine/ir/datasetops/source/cityscapes_node.cc | 2 -- .../dataset/engine/ir/datasetops/source/div2k_node.cc | 1 - .../dataset/engine/ir/datasetops/source/flickr_node.cc | 2 -- .../minddata/dataset/engine/ir/datasetops/source/sbu_node.cc | 1 - .../dataset/engine/ir/datasetops/source/usps_node.cc | 2 -- mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc | 2 -- mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc | 1 - .../ccsrc/minddata/dataset/kernels/data/type_cast_op.cc | 1 - .../ccsrc/minddata/dataset/kernels/image/adjust_gamma_op.cc | 1 - .../ccsrc/minddata/dataset/kernels/image/gaussian_blur_op.cc | 1 - .../ccsrc/minddata/dataset/kernels/image/image_utils.cc | 5 ++--- mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h | 1 + .../dataset/kernels/image/random_crop_and_resize_op.cc | 5 +++++ .../ccsrc/minddata/dataset/kernels/image/random_crop_op.cc | 5 +++++ .../ccsrc/minddata/dataset/kernels/image/resize_cubic_op.cc | 3 +-- .../ccsrc/minddata/dataset/kernels/image/resize_cubic_op.h | 2 +- .../ccsrc/minddata/dataset/kernels/image/rgb_to_bgr_op.cc | 2 -- .../ccsrc/minddata/dataset/kernels/image/slice_patches_op.cc | 2 -- .../minddata/dataset/kernels/ir/vision/adjust_gamma_ir.cc | 2 -- .../ccsrc/minddata/dataset/kernels/ir/vision/affine_ir.cc | 1 - .../minddata/dataset/kernels/ir/vision/center_crop_ir.cc | 1 - .../ccsrc/minddata/dataset/kernels/ir/vision/decode_ir.cc | 1 - .../minddata/dataset/kernels/ir/vision/gaussian_blur_ir.cc | 3 --- .../minddata/dataset/kernels/ir/vision/horizontal_flip_ir.cc | 3 --- .../ccsrc/minddata/dataset/kernels/ir/vision/normalize_ir.cc | 1 - .../minddata/dataset/kernels/ir/vision/random_affine_ir.cc | 1 - .../ccsrc/minddata/dataset/kernels/ir/vision/resize_ir.cc | 1 - .../dataset/kernels/ir/vision/resize_preserve_ar_ir.cc | 1 - .../minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.cc | 3 --- .../minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.cc | 1 - .../minddata/dataset/kernels/ir/vision/slice_patches_ir.cc | 1 - .../minddata/dataset/kernels/ir/vision/vertical_flip_ir.cc | 3 --- mindspore/dataset/engine/datasets.py | 5 +++-- mindspore/dataset/utils/browse_dataset.py | 1 + mindspore/dataset/vision/c_transforms.py | 4 ++-- mindspore/dataset/vision/validators.py | 1 + mindspore/mindrecord/tools/cifar10.py | 2 +- mindspore/mindrecord/tools/cifar100.py | 2 +- 85 files changed, 25 insertions(+), 119 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/api/audio.cc b/mindspore/ccsrc/minddata/dataset/api/audio.cc index 61752919ff9..e12261c5141 100755 --- a/mindspore/ccsrc/minddata/dataset/api/audio.cc +++ b/mindspore/ccsrc/minddata/dataset/api/audio.cc @@ -42,7 +42,6 @@ namespace mindspore { namespace dataset { - namespace audio { // AllpassBiquad Transform Operation. struct AllpassBiquad::Data { diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/allpass_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/allpass_biquad_ir.cc index b760aae4844..9d800942456 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/allpass_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/allpass_biquad_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // AllpassBiquadOperation AllpassBiquadOperation::AllpassBiquadOperation(int32_t sample_rate, float central_freq, float Q) : sample_rate_(sample_rate), central_freq_(central_freq), Q_(Q) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/amplitude_to_db_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/amplitude_to_db_ir.cc index 61313e7fac1..ff4da6eeea8 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/amplitude_to_db_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/amplitude_to_db_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // AmplitudeToDBOperation AmplitudeToDBOperation::AmplitudeToDBOperation(ScaleType stype, float ref_value, float amin, float top_db) : stype_(stype), ref_value_(ref_value), amin_(amin), top_db_(top_db) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/angle_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/angle_ir.cc index 131a440e279..ccad3ef896a 100755 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/angle_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/angle_ir.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { namespace audio { - // AngleOperation AngleOperation::AngleOperation() {} @@ -31,7 +30,6 @@ std::shared_ptr AngleOperation::Build() { std::shared_ptr tensor_op = std::make_shared(); return tensor_op; } - } // namespace audio } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/band_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/band_biquad_ir.cc index 2757a7bda1c..f47cac13e07 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/band_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/band_biquad_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // BandBiquadOperation BandBiquadOperation::BandBiquadOperation(int32_t sample_rate, float central_freq, float Q, bool noise) : sample_rate_(sample_rate), central_freq_(central_freq), Q_(Q), noise_(noise) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandpass_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandpass_biquad_ir.cc index 062cfd2a43a..54039d2c59f 100755 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandpass_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandpass_biquad_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // BandpassBiquadOperation BandpassBiquadOperation::BandpassBiquadOperation(int32_t sample_rate, float central_freq, float Q, bool const_skirt_gain) diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandreject_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandreject_biquad_ir.cc index f66c65030da..6d7fec60140 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandreject_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bandreject_biquad_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // BandrejectBiquadOperation BandrejectBiquadOperation::BandrejectBiquadOperation(int32_t sample_rate, float central_freq, float Q) : sample_rate_(sample_rate), central_freq_(central_freq), Q_(Q) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bass_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bass_biquad_ir.cc index 83766e50a6a..2b639dfa054 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bass_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/bass_biquad_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // BassBiquadOperation BassBiquadOperation::BassBiquadOperation(int32_t sample_rate, float gain, float central_freq, float Q) : sample_rate_(sample_rate), gain_(gain), central_freq_(central_freq), Q_(Q) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/biquad_ir.cc index b84bb816475..844388eee8d 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/biquad_ir.cc @@ -47,7 +47,6 @@ Status BiquadOperation::to_json(nlohmann::json *out_json) { *out_json = args; return Status::OK(); } - } // namespace audio } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/complex_norm_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/complex_norm_ir.cc index 4321c6c82d3..9ef42c7577f 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/complex_norm_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/complex_norm_ir.cc @@ -21,9 +21,7 @@ namespace mindspore { namespace dataset { - namespace audio { - ComplexNormOperation::ComplexNormOperation(float power) : power_(power) {} ComplexNormOperation::~ComplexNormOperation() = default; @@ -46,7 +44,6 @@ std::shared_ptr ComplexNormOperation::Build() { } std::string ComplexNormOperation::Name() const { return kComplexNormOperation; } - } // namespace audio } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/contrast_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/contrast_ir.cc index 6f47b0f4b21..5620955c2af 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/contrast_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/contrast_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // ContrastOperation ContrastOperation::ContrastOperation(float enhancement_amount) : enhancement_amount_(enhancement_amount) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/dc_shift_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/dc_shift_ir.cc index 9870e322165..d1ae3eb45cf 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/dc_shift_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/dc_shift_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - // DCShiftOperation DCShiftOperation::DCShiftOperation(float shift, float limiter_gain) : shift_(shift), limiter_gain_(limiter_gain) {} @@ -43,7 +42,6 @@ Status DCShiftOperation::to_json(nlohmann::json *out_json) { *out_json = args; return Status::OK(); } - } // namespace audio } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/equalizer_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/equalizer_biquad_ir.cc index c17c2bd2505..fe67785af59 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/equalizer_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/equalizer_biquad_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { - namespace audio { EqualizerBiquadOperation::EqualizerBiquadOperation(int32_t sample_rate, float center_freq, float gain, float Q) : sample_rate_(sample_rate), center_freq_(center_freq), gain_(gain), Q_(Q) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/frequency_masking_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/frequency_masking_ir.cc index a1d0b57179d..5d146b57f07 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/frequency_masking_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/frequency_masking_ir.cc @@ -20,9 +20,7 @@ namespace mindspore { namespace dataset { - namespace audio { - FrequencyMaskingOperation::FrequencyMaskingOperation(bool iid_masks, int32_t frequency_mask_param, int32_t mask_start, float mask_value) : iid_masks_(iid_masks), diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/highpass_biquad_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/highpass_biquad_ir.cc index 6bbc0a100db..9259e8282f1 100755 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/highpass_biquad_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/highpass_biquad_ir.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - namespace audio { // HighpassBiquadOperation HighpassBiquadOperation::HighpassBiquadOperation(int32_t sample_rate, float cutoff_freq, float Q) diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/lfilter_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/lfilter_ir.cc index 285ba4d19b4..d26469ea17e 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/lfilter_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/lfilter_ir.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - namespace audio { // LFilterOperation LFilterOperation::LFilterOperation(std::vector a_coeffs, std::vector b_coeffs, bool clamp) diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/mu_law_decoding_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/mu_law_decoding_ir.cc index 8d507fcc8aa..bd6820d41a1 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/mu_law_decoding_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/mu_law_decoding_ir.cc @@ -20,9 +20,7 @@ namespace mindspore { namespace dataset { - namespace audio { - MuLawDecodingOperation::MuLawDecodingOperation(int quantization_channels) : quantization_channels_(quantization_channels) {} @@ -46,7 +44,6 @@ std::shared_ptr MuLawDecodingOperation::Build() { } std::string MuLawDecodingOperation::Name() const { return kMuLawDecodingOperation; } - } // namespace audio } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_masking_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_masking_ir.cc index bfc092db0c7..72086cd7f30 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_masking_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_masking_ir.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { namespace audio { - TimeMaskingOperation::TimeMaskingOperation(bool iid_masks, int32_t time_mask_param, int32_t mask_start, float mask_value) : iid_masks_(iid_masks), time_mask_param_(time_mask_param), mask_start_(mask_start), mask_value_(mask_value) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_stretch_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_stretch_ir.cc index 4a94c4c6693..5e4bb4c68f2 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_stretch_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/time_stretch_ir.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { namespace audio { - // TimeStretchOperation TimeStretchOperation::TimeStretchOperation(float hop_length, int n_freq, float fixed_rate) : hop_length_(hop_length), n_freq_(n_freq), fixed_rate_(fixed_rate) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/vol_ir.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/vol_ir.cc index 6fe751ffd8d..fe1b161dc58 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/vol_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/kernels/vol_ir.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { namespace audio { - // Vol VolOperation::VolOperation(float gain, GainType gain_type) : gain_(gain), gain_type_(gain_type) {} diff --git a/mindspore/ccsrc/minddata/dataset/audio/ir/validators.cc b/mindspore/ccsrc/minddata/dataset/audio/ir/validators.cc index e3f8c127b54..d5039246ea7 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/ir/validators.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/ir/validators.cc @@ -17,7 +17,6 @@ namespace mindspore { namespace dataset { - Status ValidateIntScalarNonNegative(const std::string &op_name, const std::string &scalar_name, int32_t scalar) { RETURN_IF_NOT_OK(ValidateScalar(op_name, scalar_name, scalar, {0}, false)); return Status::OK(); @@ -31,6 +30,5 @@ Status ValidateFloatScalarNotNan(const std::string &op_name, const std::string & } return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/allpass_biquad_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/allpass_biquad_op.cc index b1b4625e066..f59d8e7d895 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/allpass_biquad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/allpass_biquad_op.cc @@ -20,7 +20,6 @@ namespace mindspore { namespace dataset { - Status AllpassBiquadOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/amplitude_to_db_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/amplitude_to_db_op.cc index 8a202f497c4..1dc2e2df798 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/amplitude_to_db_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/amplitude_to_db_op.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - Status AmplitudeToDBOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); if (input->shape().Rank() < 2) { @@ -50,6 +49,5 @@ Status AmplitudeToDBOp::Compute(const std::shared_ptr &input, std::share return AmplitudeToDB(input_tensor, output, multiplier, amin, db_multiplier, top_db); } } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/angle_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/angle_op.cc index 9dc313f606a..37a9c38453e 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/angle_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/angle_op.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - Status AngleOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); // if If the last dimension is not 2, then it's not a complex number @@ -59,6 +58,5 @@ Status AngleOp::OutputType(const std::vector &inputs, std::vector &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); @@ -56,6 +55,5 @@ Status BandBiquadOp::Compute(const std::shared_ptr &input, std::shared_p static_cast(a0), static_cast(a1), static_cast(a2)); } } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/bandpass_biquad_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/bandpass_biquad_op.cc index ab0fa546f3a..916ac018d10 100755 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/bandpass_biquad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/bandpass_biquad_op.cc @@ -20,7 +20,6 @@ namespace mindspore { namespace dataset { - Status BandpassBiquadOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/bandreject_biquad_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/bandreject_biquad_op.cc index 0e9244af2b1..c159825d3ba 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/bandreject_biquad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/bandreject_biquad_op.cc @@ -20,7 +20,6 @@ namespace mindspore { namespace dataset { - Status BandrejectBiquadOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); // check input type and input shape diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/bass_biquad_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/bass_biquad_op.cc index d05a7ff2471..8b3cd76464b 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/bass_biquad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/bass_biquad_op.cc @@ -20,7 +20,6 @@ namespace mindspore { namespace dataset { - Status BassBiquadOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/complex_norm_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/complex_norm_op.cc index d9e32a333a4..214a77ca5e0 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/complex_norm_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/complex_norm_op.cc @@ -19,7 +19,6 @@ namespace mindspore { namespace dataset { - // constructor ComplexNormOp::ComplexNormOp(float power) : power_(power) {} @@ -53,6 +52,5 @@ Status ComplexNormOp::OutputType(const std::vector &inputs, std::vecto } void ComplexNormOp::Print(std::ostream &out) const { out << "ComplexNormOp: power " << power_; } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/contrast_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/contrast_op.cc index 9f8c48dbc3e..1a36d80ffa5 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/contrast_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/contrast_op.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { - Status ContrastOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); @@ -54,6 +53,5 @@ Status ContrastOp::OutputType(const std::vector &inputs, std::vector &input, std::shared_ptr *output) { IO_CHECK(input, output); // input <..., time>. @@ -50,6 +49,5 @@ Status DCShiftOp::OutputType(const std::vector &inputs, std::vector &input, std::shared_ptr *output) { diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/fade_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/fade_op.cc index bb3e1fe71cf..9052443df30 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/fade_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/fade_op.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - constexpr int32_t FadeOp::kFadeInLen = 0; constexpr int32_t FadeOp::kFadeOutLen = 0; constexpr FadeShape FadeOp::kFadeShape = FadeShape::kLinear; diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/frequency_masking_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/frequency_masking_op.cc index b1b5bbed06a..4fd1c107edc 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/frequency_masking_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/frequency_masking_op.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { - // constructor FrequencyMaskingOp::FrequencyMaskingOp(bool iid_masks, int32_t frequency_mask_param, int32_t mask_start, float mask_value) diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/highpass_biquad_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/highpass_biquad_op.cc index 41c6cef58cf..5fe52fc11bf 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/highpass_biquad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/highpass_biquad_op.cc @@ -20,7 +20,6 @@ namespace mindspore { namespace dataset { - Status HighpassBiquadOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/lfilter_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/lfilter_op.cc index 2db48e3517b..d41a0249851 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/lfilter_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/lfilter_op.cc @@ -20,7 +20,6 @@ namespace mindspore { namespace dataset { - Status LFilterOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); TensorShape input_shape = input->shape(); diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/lowpass_biquad_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/lowpass_biquad_op.cc index a39c907deb1..b7c9c8ed8bd 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/lowpass_biquad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/lowpass_biquad_op.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - const float LowpassBiquadOp::kQ = 0.707; // constructor @@ -55,6 +54,5 @@ Status LowpassBiquadOp::Compute(const std::shared_ptr &input, std::share static_cast(a0), static_cast(a1), static_cast(a2)); } } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/mu_law_decoding_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/mu_law_decoding_op.cc index ccc82a28072..9e0b5451938 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/mu_law_decoding_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/mu_law_decoding_op.cc @@ -19,7 +19,6 @@ namespace mindspore { namespace dataset { - // constructor MuLawDecodingOp::MuLawDecodingOp(int quantization_channels) : quantization_channels_(quantization_channels) {} @@ -49,6 +48,5 @@ Status MuLawDecodingOp::OutputType(const std::vector &inputs, std::vec } return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/time_masking_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/time_masking_op.cc index c93c1198e53..41571e9c5a0 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/time_masking_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/time_masking_op.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { - // constructor TimeMaskingOp::TimeMaskingOp(bool iid_masks, int32_t time_mask_param, int32_t mask_start, float mask_value) : time_mask_param_(time_mask_param), mask_start_(mask_start), iid_masks_(iid_masks), mask_value_(mask_value) { diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/time_stretch_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/time_stretch_op.cc index 05a14891b00..cd239fe5a39 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/time_stretch_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/time_stretch_op.cc @@ -23,7 +23,6 @@ namespace mindspore { namespace dataset { - const float TimeStretchOp::kHopLength = std::numeric_limits::quiet_NaN(); const int TimeStretchOp::kNFreq = 201; const float TimeStretchOp::kFixedRate = std::numeric_limits::quiet_NaN(); diff --git a/mindspore/ccsrc/minddata/dataset/audio/kernels/vol_op.cc b/mindspore/ccsrc/minddata/dataset/audio/kernels/vol_op.cc index e3f5cfb4b6b..1628083fd0b 100644 --- a/mindspore/ccsrc/minddata/dataset/audio/kernels/vol_op.cc +++ b/mindspore/ccsrc/minddata/dataset/audio/kernels/vol_op.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - Status VolOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); std::shared_ptr input_tensor; @@ -50,6 +49,5 @@ Status VolOp::OutputType(const std::vector &inputs, std::vectorPost(); +#ifndef ENABLE_SECURITY uint64_t batch_start_time = 0; int32_t push_cost = 0; -#ifndef ENABLE_SECURITY int32_t connector_size = 0; int32_t connector_capacity = 0; -#endif -#ifndef ENABLE_SECURITY std::shared_ptr profiling_node; bool isProfilingEnable = tree_->GetProfilingManager()->IsProfilingEnable(); if (isProfilingEnable) { diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sbu_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sbu_op.cc index 4bf452af614..5249508e0cd 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sbu_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sbu_op.cc @@ -229,6 +229,5 @@ Status SBUOp::ReplaceAll(std::string *str, const std::string &from, const std::s } return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/usps_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/usps_op.cc index a0dd0b4ed83..bb8b97beea3 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/usps_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/usps_op.cc @@ -347,6 +347,5 @@ Status USPSOp::ComputeColMap() { } return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc index e82316fe354..affa7711b21 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc @@ -140,7 +140,6 @@ Status LocalNode::AddAdjacent(const std::shared_ptr &node, const std::shar Status LocalNode::GetEdgeByAdjNodeId(const NodeIdType &adj_node_id, EdgeIdType *out_edge_id) { auto itr = adjacent_nodes_.find(adj_node_id); - if (itr != adjacent_nodes_.end()) { (*out_edge_id) = itr->second; } else { diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/cityscapes_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/cityscapes_node.cc index 23779faea41..0e927a612e0 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/cityscapes_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/cityscapes_node.cc @@ -25,7 +25,6 @@ namespace mindspore { namespace dataset { - // Constructor for CityscapesNode CityscapesNode::CityscapesNode(const std::string &dataset_dir, const std::string &usage, const std::string &quality_mode, const std::string &task, bool decode, @@ -114,7 +113,6 @@ Status CityscapesNode::GetDatasetSize(const std::shared_ptr & std::shared_ptr sampler_rt = nullptr; RETURN_IF_NOT_OK(sampler_->SamplerBuild(&sampler_rt)); sample_size = sampler_rt->CalculateNumSamples(num_rows); - if (sample_size == -1) { RETURN_IF_NOT_OK(size_getter->DryRun(shared_from_this(), &sample_size)); } diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/div2k_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/div2k_node.cc index ca56bbed1fc..ecc7784abb8 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/div2k_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/div2k_node.cc @@ -26,7 +26,6 @@ namespace mindspore { namespace dataset { - // Constructor for DIV2KNode DIV2KNode::DIV2KNode(const std::string &dataset_dir, const std::string &usage, const std::string &downgrade, int32_t scale, bool decode, const std::shared_ptr &sampler, diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/flickr_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/flickr_node.cc index 1944824a98f..f13454c3a8b 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/flickr_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/flickr_node.cc @@ -30,7 +30,6 @@ namespace mindspore { namespace dataset { - // Constructor for FlickrNode FlickrNode::FlickrNode(const std::string &dataset_dir, const std::string &annotation_file, bool decode, std::shared_ptr sampler, std::shared_ptr cache) @@ -126,7 +125,6 @@ Status FlickrNode::GetDatasetSize(const std::shared_ptr &size std::shared_ptr sampler_rt = nullptr; RETURN_IF_NOT_OK(sampler_->SamplerBuild(&sampler_rt)); sample_size = sampler_rt->CalculateNumSamples(num_rows); - if (sample_size == -1) { RETURN_IF_NOT_OK(size_getter->DryRun(shared_from_this(), &sample_size)); } diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/sbu_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/sbu_node.cc index 397b5c41bb1..22431018966 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/sbu_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/sbu_node.cc @@ -26,7 +26,6 @@ namespace mindspore { namespace dataset { - SBUNode::SBUNode(const std::string &dataset_dir, bool decode, const std::shared_ptr &sampler, const std::shared_ptr &cache) : MappableSourceNode(std::move(cache)), dataset_dir_(dataset_dir), decode_(decode), sampler_(sampler) {} diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/usps_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/usps_node.cc index 016096fb476..85347f56c83 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/usps_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/usps_node.cc @@ -27,7 +27,6 @@ namespace mindspore { namespace dataset { - USPSNode::USPSNode(std::string dataset_dir, std::string usage, int32_t num_samples, ShuffleMode shuffle, int32_t num_shards, int32_t shard_id, std::shared_ptr cache) : NonMappableSourceNode(std::move(cache)), @@ -168,6 +167,5 @@ Status USPSNode::MakeSimpleProducer() { num_samples_ = 0; return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc index 1f6d67aef6d..4a0e6c26ef7 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc @@ -25,7 +25,6 @@ namespace mindspore { namespace dataset { - constexpr auto kUnknownErrorString = "Unknown error occurred"; TdtPlugin::TdtPlugin(const std::string &channel_name, int32_t device_id) { @@ -240,6 +239,5 @@ void TdtPlugin::ReportErrorMessage() { MS_LOG(ERROR) << "Ascend error occurred, error message:\n" << error_message; } } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc index 64b77ea8ccd..c7af32a5a0a 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc @@ -37,6 +37,5 @@ Status OneHotOp::OutputShape(const std::vector &inputs, std::vector if (!outputs.empty()) return Status::OK(); return Status(StatusCode::kMDUnexpectedError, "OneHot: invalid input shape."); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc index bd49545121b..5fc1072cf87 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc @@ -34,6 +34,5 @@ Status TypeCastOp::OutputType(const std::vector &inputs, std::vector &input, std::shared_ptr *output) { diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/gaussian_blur_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/gaussian_blur_op.cc index a837ac40b33..8d590038a9d 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/gaussian_blur_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/gaussian_blur_op.cc @@ -24,7 +24,6 @@ namespace mindspore { namespace dataset { - Status GaussianBlurOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); RETURN_IF_NOT_OK(ValidateImageRank("GaussianBlur", input->Rank())); diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc index d8f6d35ef0d..94efa3a7dcf 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc @@ -489,9 +489,9 @@ Status ConvertColor(const std::shared_ptr &input, std::shared_ptrmat().data) { RETURN_STATUS_UNEXPECTED("[Internal ERROR] ConvertColor: load image failed."); } - if (input_cv->Rank() == 3) { + if (input_cv->Rank() == DEFAULT_IMAGE_RANK) { int num_channels = input_cv->shape()[CHANNEL_INDEX]; - if (num_channels != 3 && num_channels != 4) { + if (num_channels != DEFAULT_IMAGE_CHANNELS && num_channels != MAX_IMAGE_CHANNELS) { RETURN_STATUS_UNEXPECTED("ConvertColor: number of channels of image should be 3 or 4, but got:" + std::to_string(num_channels)); } @@ -991,7 +991,6 @@ Status AdjustGamma(const std::shared_ptr &input, std::shared_ptr *itr = std::min(std::max((*itr), 0.0f), 1.0f); } *output = input; - } else { std::shared_ptr input_cv = CVTensor::AsCVTensor(input); if (!input_cv->mat().data) { diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h index 38306286703..15088791a8d 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h @@ -42,6 +42,7 @@ #define DEFAULT_IMAGE_RANK 3 // images are hwc channels in general #define MAX_BIT_VALUE 255 // max bit value after decode is 256 #define MIN_IMAGE_CHANNELS 1 // image ops support minimum of 1 channel +#define MAX_IMAGE_CHANNELS 4 // image ops support maximum of 4 channel #define MIN_IMAGE_DIMENSION 2 // images are at least 2 dimensional namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc index 3b9107dac5d..9980e426b21 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc @@ -49,6 +49,11 @@ Status RandomCropAndResizeOp::Compute(const TensorRow &input, TensorRow *output) IO_CHECK_VECTOR(input, output); if (input.size() != 1) { for (size_t i = 0; i < input.size() - 1; i++) { + if (input[i]->Rank() != 2 && input[i]->Rank() != 3) { + std::string err_msg = "RandomCropAndResizeOp: image shape is not or , but got rank:" + + std::to_string(input[i]->Rank()); + RETURN_STATUS_UNEXPECTED(err_msg); + } if (input[i]->shape()[0] != input[i + 1]->shape()[0] || input[i]->shape()[1] != input[i + 1]->shape()[1]) { RETURN_STATUS_UNEXPECTED("RandomCropAndResizeOp: The width and height of the image need to be the same size."); } diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc index 72d19cc5a47..cf7b3ed8f1b 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc @@ -122,6 +122,11 @@ Status RandomCropOp::Compute(const TensorRow &input, TensorRow *output) { IO_CHECK_VECTOR(input, output); if (input.size() != 1) { for (size_t i = 0; i < input.size() - 1; i++) { + if (input[i]->Rank() != 2 && input[i]->Rank() != 3) { + std::string err_msg = + "RandomCropOp: image shape is not or , but got rank:" + std::to_string(input[i]->Rank()); + RETURN_STATUS_UNEXPECTED(err_msg); + } if (input[i]->shape()[0] != input[i + 1]->shape()[0] || input[i]->shape()[1] != input[i + 1]->shape()[1]) { RETURN_STATUS_UNEXPECTED("RandomCropOp: The width and height of the image need to be the same size."); } diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.cc index e8c9db1d5c7..d1e4c99fdb8 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.cc @@ -17,7 +17,6 @@ namespace mindspore { namespace dataset { - // using 8 bits for result constexpr uint8_t PrecisionBits = 22; @@ -202,7 +201,7 @@ Status ImagingVerticalInterp(LiteMat &output, LiteMat input, int offset, int ker } bool ImageInterpolation(LiteMat input, LiteMat &output, int x_size, int y_size, struct interpolation *interp, - int rect[4]) { + const int rect[4]) { int horizontal_interp, vertical_interp, horiz_kernel, vert_kernel, rect_y0, rect_y1; std::vector horiz_region, vert_region; std::vector horiz_coeff, vert_coeff; diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.h index 86b65074e92..4c246a00b0d 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_cubic_op.h @@ -47,7 +47,7 @@ Status ImagingVerticalInterp(LiteMat &output, LiteMat input, int offset, int ker /// \brief Mainly logic of Cubic interpolation bool ImageInterpolation(LiteMat input, LiteMat &output, int x_size, int y_size, struct interpolation *interp, - int rect[4]); + const int rect[4]); /// \brief Apply cubic interpolation on input image and obtain the output image /// \param[in] input Input image diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/rgb_to_bgr_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/rgb_to_bgr_op.cc index 020f7f9ac65..8fbb89e6f18 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/rgb_to_bgr_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/rgb_to_bgr_op.cc @@ -22,7 +22,6 @@ namespace mindspore { namespace dataset { - Status RgbToBgrOp::Compute(const std::shared_ptr &input, std::shared_ptr *output) { IO_CHECK(input, output); auto input_type = input->type(); @@ -32,6 +31,5 @@ Status RgbToBgrOp::Compute(const std::shared_ptr &input, std::shared_ptr return RgbToBgr(input, output); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/slice_patches_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/slice_patches_op.cc index 41512e3d2b6..3fdc9fd8d54 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/slice_patches_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/slice_patches_op.cc @@ -19,7 +19,6 @@ namespace mindspore { namespace dataset { - const int32_t SlicePatchesOp::kDefNumH = 1; const int32_t SlicePatchesOp::kDefNumW = 1; const uint8_t SlicePatchesOp::kDefFillV = 0; @@ -44,6 +43,5 @@ Status SlicePatchesOp::Compute(const TensorRow &input, TensorRow *output) { (void)std::copy(out.begin(), out.end(), std::back_inserter(*output)); return Status::OK(); } - } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.cc index 726173ffbc9..b550ae51c95 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/adjust_gamma_ir.cc @@ -23,9 +23,7 @@ namespace mindspore { namespace dataset { - namespace vision { - #ifndef ENABLE_ANDROID // AdjustGammaOperation diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/affine_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/affine_ir.cc index f8b1d6a6d32..0c4e11fce85 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/affine_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/affine_ir.cc @@ -104,7 +104,6 @@ Status AffineOperation::from_json(nlohmann::json op_params, std::shared_ptr(degrees, translation, scale, shear, interpolation, fill_value); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/center_crop_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/center_crop_ir.cc index 174c1bf9dbd..8980b5f02fb 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/center_crop_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/center_crop_ir.cc @@ -60,7 +60,6 @@ Status CenterCropOperation::from_json(nlohmann::json op_params, std::shared_ptr< *operation = std::make_shared(size); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/decode_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/decode_ir.cc index cbc457ed167..260eac53c0d 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/decode_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/decode_ir.cc @@ -45,7 +45,6 @@ Status DecodeOperation::from_json(nlohmann::json op_params, std::shared_ptr(rgb); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.cc index 88eaaed382b..cb58f42b80e 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/gaussian_blur_ir.cc @@ -20,9 +20,7 @@ namespace mindspore { namespace dataset { - namespace vision { - GaussianBlurOperation::GaussianBlurOperation(const std::vector kernel_size, const std::vector sigma) : kernel_size_(kernel_size), sigma_(sigma) {} @@ -72,7 +70,6 @@ Status GaussianBlurOperation::from_json(nlohmann::json op_params, std::shared_pt *operation = std::make_shared(kernel_size, sigma); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.cc index 6b7965e03fb..4b41b8ac452 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/horizontal_flip_ir.cc @@ -21,9 +21,7 @@ namespace mindspore { namespace dataset { - namespace vision { - #ifndef ENABLE_ANDROID // VerticalFlipOperation @@ -45,7 +43,6 @@ Status HorizontalFlipOperation::from_json(nlohmann::json op_params, std::shared_ return Status::OK(); } #endif - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/normalize_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/normalize_ir.cc index ecd0b73f202..3bb87b72f38 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/normalize_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/normalize_ir.cc @@ -55,7 +55,6 @@ Status NormalizeOperation::from_json(nlohmann::json op_params, std::shared_ptr(mean, std); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/random_affine_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/random_affine_ir.cc index 247957ab7cb..47d3ebcdc28 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/random_affine_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/random_affine_ir.cc @@ -179,7 +179,6 @@ Status RandomAffineOperation::from_json(nlohmann::json op_params, std::shared_pt interpolation, fill_value); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_ir.cc index 6fb5825b2e9..644d97806cd 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_ir.cc @@ -79,7 +79,6 @@ Status ResizeOperation::from_json(nlohmann::json op_params, std::shared_ptr(size, interpolation); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.cc index 00894caf691..43ceaababb1 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.cc @@ -65,7 +65,6 @@ Status ResizePreserveAROperation::from_json(nlohmann::json op_params, std::share *operation = std::make_shared(height, width, img_orientation); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.cc index 1295acb837d..bc5373b1de0 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_bgr_ir.cc @@ -19,9 +19,7 @@ namespace mindspore { namespace dataset { - namespace vision { - RgbToBgrOperation::RgbToBgrOperation() = default; // RGB2BGROperation @@ -37,7 +35,6 @@ Status RgbToBgrOperation::from_json(nlohmann::json op_params, std::shared_ptr(); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.cc index b041ecbc902..16fb2c03171 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.cc @@ -39,7 +39,6 @@ Status RgbToGrayOperation::from_json(nlohmann::json op_params, std::shared_ptr(); return Status::OK(); } - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/slice_patches_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/slice_patches_ir.cc index 0edaa28ba53..11220781f19 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/slice_patches_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/slice_patches_ir.cc @@ -21,7 +21,6 @@ namespace mindspore { namespace dataset { - namespace vision { // SlicePatchesOperation SlicePatchesOperation::SlicePatchesOperation(int32_t num_height, int32_t num_width, SliceMode slice_mode, diff --git a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vertical_flip_ir.cc b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vertical_flip_ir.cc index 42989e66b42..23e69f877b2 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vertical_flip_ir.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/ir/vision/vertical_flip_ir.cc @@ -21,9 +21,7 @@ namespace mindspore { namespace dataset { - namespace vision { - #ifndef ENABLE_ANDROID // VerticalFlipOperation @@ -46,7 +44,6 @@ Status VerticalFlipOperation::from_json(nlohmann::json op_params, std::shared_pt } #endif - } // namespace vision } // namespace dataset } // namespace mindspore diff --git a/mindspore/dataset/engine/datasets.py b/mindspore/dataset/engine/datasets.py index 29db9855aa8..bdaf7c3cc0a 100644 --- a/mindspore/dataset/engine/datasets.py +++ b/mindspore/dataset/engine/datasets.py @@ -2426,6 +2426,7 @@ def wait_pid(): # waitpid may be failed for some reasons so we ignore this error pass + # Dataset need _watch_dog thread to monitoring fork multi-processing, # and thread can't be a member function otherwise python won't collect and release resources. def _watch_dog(eot, pids): @@ -3692,7 +3693,7 @@ class SamplerFn: if multi_process is True: try: self.eof = multiprocessing.Event() - except: + except Exception: raise RuntimeError("Init multiprocessing.Event() failed, This might be caused by insufficient shm," + " and the recommended shm size is at least 5 GB.") else: @@ -3710,7 +3711,7 @@ class SamplerFn: if multi_process is True: try: worker = _GeneratorWorkerMp(dataset, self.eof, max_rowsize, queue_size) - except: + except Exception: raise RuntimeError("Init multiprocessing.Queue() failed, This might be caused by insufficient shm," + " and the recommended shm size is at least 5 GB.") worker.daemon = True diff --git a/mindspore/dataset/utils/browse_dataset.py b/mindspore/dataset/utils/browse_dataset.py index 7d9a0070550..330c5204691 100644 --- a/mindspore/dataset/utils/browse_dataset.py +++ b/mindspore/dataset/utils/browse_dataset.py @@ -20,6 +20,7 @@ import importlib import numpy as np from mindspore import log as logger + def imshow_det_bbox(image, bboxes, labels, diff --git a/mindspore/dataset/vision/c_transforms.py b/mindspore/dataset/vision/c_transforms.py index 367f852b2b1..ba2f7ef2a5e 100644 --- a/mindspore/dataset/vision/c_transforms.py +++ b/mindspore/dataset/vision/c_transforms.py @@ -48,10 +48,10 @@ from PIL import Image import mindspore._c_dataengine as cde from .utils import Inter, Border, ImageBatchFormat, ConvertMode, SliceMode -from .validators import check_prob, check_crop, check_center_crop, check_resize_interpolation, check_random_resize_crop, \ +from .validators import check_prob, check_crop, check_center_crop, check_resize_interpolation, \ check_mix_up_batch_c, check_normalize_c, check_normalizepad_c, check_random_crop, check_random_color_adjust, \ check_random_rotation, check_range, check_resize, check_rescale, check_pad, check_cutout, \ - check_uniform_augment_cpp, check_convert_color, \ + check_uniform_augment_cpp, check_convert_color, check_random_resize_crop, \ check_bounding_box_augment_cpp, check_random_select_subpolicy_op, check_auto_contrast, check_random_affine, \ check_random_solarize, check_soft_dvpp_decode_random_crop_resize_jpeg, check_positive_degrees, FLOAT_MAX_INTEGER, \ check_cut_mix_batch_c, check_posterize, check_gaussian_blur, check_rotate, check_slice_patches, check_adjust_gamma diff --git a/mindspore/dataset/vision/validators.py b/mindspore/dataset/vision/validators.py index 55c30acdd25..0bc86c248ff 100644 --- a/mindspore/dataset/vision/validators.py +++ b/mindspore/dataset/vision/validators.py @@ -965,6 +965,7 @@ def check_gaussian_blur(method): return new_method + def check_convert_color(method): """Wrapper method to check the parameters of convertcolor.""" diff --git a/mindspore/mindrecord/tools/cifar10.py b/mindspore/mindrecord/tools/cifar10.py index 028762299ad..0802d805ed3 100644 --- a/mindspore/mindrecord/tools/cifar10.py +++ b/mindspore/mindrecord/tools/cifar10.py @@ -66,7 +66,7 @@ def restricted_loads(s): raise RuntimeError("Not a valid Cifar10 Dataset.") except UnicodeDecodeError: raise RuntimeError("Not a valid Cifar10 Dataset.") - except: + except Exception: raise RuntimeError("Unexpected error while Unpickling Cifar10 Dataset.") diff --git a/mindspore/mindrecord/tools/cifar100.py b/mindspore/mindrecord/tools/cifar100.py index 205c8667df3..076463df050 100644 --- a/mindspore/mindrecord/tools/cifar100.py +++ b/mindspore/mindrecord/tools/cifar100.py @@ -65,7 +65,7 @@ def restricted_loads(s): raise RuntimeError("Not a valid Cifar100 Dataset.") except UnicodeDecodeError: raise RuntimeError("Not a valid Cifar100 Dataset.") - except: + except Exception: raise RuntimeError("Unexpected error while Unpickling Cifar100 Dataset.")