fixed code quality issues

mindspore/ccsrc/minddata/dataset/api/data_helper.cc

@@ -15,10 +15,6 @@
  */
 #include "minddata/dataset/include/dataset/data_helper.h"
 
-#include <algorithm>
-#include <iostream>
-#include <map>
-
 #include "minddata/dataset/util/json_helper.h"
 #include "include/api/status.h"
 

mindspore/ccsrc/minddata/dataset/core/tensor_helpers.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <string>
-#include <vector>
 #include "minddata/dataset/core/tensor_helpers.h"
 #include "minddata/dataset/util/log_adapter.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/engine/consumers/pull_based_tree_consumer.cc

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <algorithm>
-#include <unordered_map>
-#include <vector>
 #include "minddata/dataset/engine/consumers/pull_based_tree_consumer.h"
 
 namespace mindspore::dataset {

mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.cc

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <vector>
 #include "minddata/dataset/engine/consumers/python_tree_consumer.h"
 
 namespace mindspore::dataset {

mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.cc

@@ -15,8 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/barrier_op.h"
 
-#include <utility>
-
 #include "minddata/dataset/include/dataset/constants.h"
 #include "minddata/dataset/engine/db_connector.h"
 #include "minddata/dataset/core/config_manager.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.cc

@@ -15,10 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/cache_merge_op.h"
 
-#include <chrono>
-#include <functional>
-#include <iomanip>
-#include <utility>
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/include/dataset/constants.h"
 #include "minddata/dataset/core/global_context.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc

@@ -60,9 +60,9 @@ void ConcatOp::Print(std::ostream &out, bool show_all) const {
 // This definition is added to pass the cyclomatic complexity rule of <= 20 units
 // The NOLINT directive is to disable cpplint check.
 // Clang format and cpplint give conflicting recommendations on this line below.
-#define f(fv, sv, shard_index)                                                     \
-  ((fv == -1 && sv == -1) || (fv < sv && shard_index >= fv && shard_index < sv) || \
-   (fv > sv && (shard_index >= fv || shard_index < sv)))  // NOLINT
+#define f(fv, sv, shard_index)                                                                     \
+  (((fv) == -1 && (sv) == -1) || ((fv) < (sv) && (shard_index) >= (fv) && (shard_index) < (sv)) || \
+   ((fv) > (sv) && ((shard_index) >= (fv) || (shard_index) < (sv))))  // NOLINT
 
 Status ConcatOp::Verify(int32_t id, const TensorRow &new_row) {
   if (id == 0) {

mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/cpu_map_job.cc

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <memory>
-#include <vector>
-#include <utility>
 #include <set>
 #include <string>
 #include "minddata/dataset/engine/datasetops/map_op/cpu_map_job.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/gpu_map_job.cc

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <memory>
-#include <vector>
 #include "minddata/dataset/engine/datasetops/map_op/gpu_map_job.h"
 
 namespace mindspore {

mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op/map_op.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "minddata/dataset/engine/datasetops/map_op/map_op.h"
-#include <algorithm>
 #include <cstring>
 #include <memory>
 #include <vector>

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc

@@ -17,7 +17,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <set>
 #include <utility>
 
 #include "minddata/dataset/core/config_manager.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/clue_op.h"
 
-#include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/csv_op.h"
 
-#include <algorithm>
 #include <fstream>
 #include <iomanip>
 #include <stdexcept>

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/image_folder_op.h"
 #include <fstream>
-#include <unordered_set>
 #include "utils/ms_utils.h"
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/core/tensor_shape.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc

@@ -17,8 +17,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <iomanip>
-#include <set>
 #include <nlohmann/json.hpp>
 
 #include "utils/file_utils.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mappable_leaf_op.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 #include "minddata/dataset/engine/datasetops/source/mappable_leaf_op.h"
-#include <unordered_set>
 #include "utils/ms_utils.h"
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc

@@ -16,8 +16,6 @@
 #include "minddata/dataset/engine/datasetops/source/mnist_op.h"
 
 #include <fstream>
-#include <iomanip>
-#include <set>
 #include "utils/ms_utils.h"
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/core/tensor_shape.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/nonmappable_leaf_op.cc

@@ -15,14 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/nonmappable_leaf_op.h"
 
-#include <algorithm>
-
-#include <memory>
-#include <mutex>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/engine/datasetops/source/io_block.h"
 #include "minddata/dataset/engine/db_connector.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h"
 
-#include <algorithm>
 #include <limits>
 #include <memory>
 

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.cc

@@ -15,8 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/sampler/python_sampler.h"
 
-#include <memory>
-
 namespace mindspore {
 namespace dataset {
 

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h"
 
-#include <algorithm>
 #include <limits>
 #include <memory>
 #include "minddata/dataset/util/random.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h"
 
-#include <algorithm>
 #include <memory>
 #include <vector>
 

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_sampler.cc

@@ -15,10 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/source/sampler/subset_sampler.h"
 
-#include <algorithm>
-#include <memory>
-#include <string>
-
 namespace mindspore {
 namespace dataset {
 // Constructor.

mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc

@@ -17,7 +17,6 @@
 
 #include <algorithm>
 #include <fstream>
-#include <iomanip>
 
 #include "utils/file_utils.h"
 #include "minddata/dataset/core/config_manager.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc

@@ -15,8 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/take_op.h"
 
-#include <algorithm>
-
 #include "utils/ms_utils.h"
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/engine/db_connector.h"

mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.cc

@@ -15,8 +15,6 @@
  */
 #include "minddata/dataset/engine/datasetops/zip_op.h"
 
-#include <algorithm>
-
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/engine/db_connector.h"
 #include "minddata/dataset/include/dataset/constants.h"

mindspore/ccsrc/minddata/dataset/engine/ir/cache/dataset_cache_impl.cc

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <memory>
 
 #include "minddata/dataset/engine/ir/cache/dataset_cache_impl.h"
 #include "minddata/dataset/engine/datasetops/cache_lookup_op.h"

mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <memory>
 
 #include "minddata/dataset/engine/ir/cache/pre_built_dataset_cache.h"
 #include "minddata/dataset/engine/datasetops/cache_lookup_op.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/clue_node.cc

@@ -16,13 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"
 
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "minddata/dataset/engine/datasetops/source/clue_op.h"
 
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/csv_node.cc

@@ -16,12 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"
 
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "minddata/dataset/engine/datasetops/source/csv_op.h"
 
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/generator_node.cc

@@ -16,11 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/source/generator_node.h"
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "minddata/dataset/engine/datasetops/repeat_op.h"
 #include "minddata/dataset/engine/datasetops/source/generator_op.h"
 #include "minddata/dataset/engine/opt/pass.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc

@@ -16,12 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"
 
-#include <map>
-#include <memory>
-#include <stack>
-#include <string>
-#include <vector>
-
 #include "minddata/dataset/engine/datasetops/source/mindrecord_op.h"
 #include "minddata/dataset/engine/datasetops/source/sampler/mind_record_sampler.h"
 #include "minddata/dataset/engine/ir/datasetops/cache_lookup_node.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/random_node.cc

@@ -16,11 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/source/random_node.h"
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "minddata/dataset/engine/datasetops/source/random_data_op.h"
 #include "minddata/dataset/engine/opt/pass.h"
 #include "minddata/dataset/util/random.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/text_file_node.cc

@@ -16,12 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
 
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include "minddata/dataset/engine/datasetops/source/text_file_op.h"
 
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/zip_node.cc

@@ -16,11 +16,6 @@
 
 #include "minddata/dataset/engine/ir/datasetops/zip_node.h"
 
-#include <memory>
-#include <string>
-#include <vector>
-#include <algorithm>
-
 #include "minddata/dataset/engine/datasetops/zip_op.h"
 #include "minddata/dataset/engine/opt/pass.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.cc

@@ -13,11 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h"
 
 #include "minddata/dataset/engine/ir/datasetops/map_node.h"

mindspore/ccsrc/minddata/dataset/engine/opt/post/auto_worker_pass.cc

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <cmath>
-#include <algorithm>
-
 #include "minddata/dataset/engine/ir/datasetops/batch_node.h"
 #include "minddata/dataset/engine/ir/datasetops/dataset_node.h"
 #include "minddata/dataset/engine/ir/datasetops/map_node.h"

mindspore/ccsrc/minddata/dataset/engine/opt/post/generator_node_pass.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include "minddata/dataset/engine/opt/post/generator_node_pass.h"
 #include "minddata/dataset/engine/ir/datasetops/source/generator_node.h"
 

mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_validation_pass.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <memory>
 #include "minddata/dataset/engine/opt/pre/cache_validation_pass.h"
 
 #include "minddata/dataset/engine/ir/datasetops/batch_node.h"

mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <string>
 #include "minddata/dataset/include/dataset/datasets.h"
 #include "minddata/dataset/engine/opt/pre/deep_copy_pass.h"
 #include "minddata/dataset/engine/ir/datasetops/root_node.h"

mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <string>
 #include "minddata/dataset/include/dataset/datasets.h"
 #include "minddata/dataset/engine/opt/pre/input_validation_pass.h"
 

mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 #include "minddata/dataset/engine/perf/connector_size.h"
-#include <algorithm>
 #include <fstream>
-#include <memory>
-#include <string>
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/engine/execution_tree.h"
 #include "minddata/dataset/util/path.h"

mindspore/ccsrc/minddata/dataset/engine/runtime_context.cc

@@ -15,8 +15,6 @@
  */
 
 #include "minddata/dataset/engine/runtime_context.h"
-#include <memory>
-#include <utility>
 namespace mindspore::dataset {
 void RuntimeContext::AssignConsumer(std::shared_ptr<TreeConsumer> tree_consumer) {
   tree_consumer_ = std::move(tree_consumer);

mindspore/ccsrc/minddata/dataset/include/dataset/json_fwd.hpp

@@ -17,11 +17,7 @@
 #ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
 #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
 
-#include <cstdint>  // int64_t, uint64_t
-#include <map>      // map
-#include <memory>   // allocator
-#include <string>   // string
-#include <vector>   // vector
+#include <string>
 
 /*!
 @brief namespace for Niels Lohmann

mindspore/ccsrc/minddata/dataset/kernels/c_func_op.cc

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <memory>
-#include <vector>
-
 #include "minddata/dataset/kernels/c_func_op.h"
 #include "minddata/dataset/kernels/tensor_op.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/kernels/data/compose_op.cc

@@ -15,8 +15,6 @@
  */
 #include "minddata/dataset/kernels/data/compose_op.h"
 
-#include <vector>
-
 #include "minddata/dataset/core/tensor.h"
 #include "minddata/dataset/kernels/tensor_op.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/kernels/data/random_apply_op.cc

@@ -15,9 +15,6 @@
  */
 #include "minddata/dataset/kernels/data/random_apply_op.h"
 
-#include <memory>
-#include <vector>
-
 #include "minddata/dataset/core/tensor.h"
 #include "minddata/dataset/kernels/tensor_op.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/kernels/data/random_choice_op.cc

@@ -15,9 +15,6 @@
  */
 #include "minddata/dataset/kernels/data/random_choice_op.h"
 
-#include <memory>
-#include <vector>
-
 #include "minddata/dataset/core/tensor.h"
 #include "minddata/dataset/kernels/tensor_op.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/kernels/image/auto_contrast_op.cc

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <vector>
 
 #include "minddata/dataset/kernels/image/auto_contrast_op.h"
 #include "minddata/dataset/kernels/image/image_utils.h"

mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.cc

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <utility>
 #include "minddata/dataset/kernels/image/bounding_box_augment_op.h"
 #include "minddata/dataset/kernels/image/bounding_box.h"
 #include "minddata/dataset/kernels/image/resize_op.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_affine_op.cc

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 #include <cmath>
-#include <random>
-#include <vector>
 
 #include "minddata/dataset/kernels/image/random_affine_op.h"
 

mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <random>
-#include <utility>
-
 #include "minddata/dataset/util/status.h"
 #include "minddata/dataset/kernels/image/bounding_box.h"
 #include "minddata/dataset/kernels/image/image_utils.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.cc

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#include <algorithm>
-#include <utility>
-
 #include "minddata/dataset/kernels/image/random_crop_with_bbox_op.h"
 #include "minddata/dataset/kernels/image/bounding_box.h"
 #include "minddata/dataset/kernels/image/image_utils.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <utility>
 #include "minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h"
 #include "minddata/dataset/kernels/image/bounding_box.h"
 #include "minddata/dataset/kernels/image/image_utils.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_posterize_op.cc

@@ -16,7 +16,6 @@
 
 #include "minddata/dataset/kernels/image/random_posterize_op.h"
 
-#include <random>
 #include <opencv2/imgcodecs.hpp>
 
 #include "minddata/dataset/util/random.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_select_subpolicy_op.cc

@@ -15,8 +15,6 @@
  */
 #include "minddata/dataset/kernels/image/random_select_subpolicy_op.h"
 
-#include <vector>
-
 #include "minddata/dataset/core/tensor.h"
 #include "minddata/dataset/kernels/tensor_op.h"
 #include "minddata/dataset/util/status.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_solarize_op.cc

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <vector>
 
 #include "minddata/dataset/kernels/image/random_solarize_op.h"
 #include "minddata/dataset/kernels/image/solarize_op.h"

mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include <utility>
-
 #include "minddata/dataset/util/status.h"
 #include "minddata/dataset/kernels/image/bounding_box.h"
 #include "minddata/dataset/kernels/image/image_utils.h"

mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.cc

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 */
-#include <utility>
 #include "minddata/dataset/kernels/image/uniform_aug_op.h"
 #include "minddata/dataset/util/random.h"
 

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/affine_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/affine_ir.h"
 
 #include "minddata/dataset/kernels/image/affine_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/center_crop_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/center_crop_ir.h"
 
 #include "minddata/dataset/kernels/image/center_crop_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/crop_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/crop_ir.h"
 
 #include "minddata/dataset/kernels/image/crop_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/decode_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/decode_ir.h"
 
 #include "minddata/dataset/kernels/image/decode_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/normalize_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/normalize_ir.h"
 
 #include "minddata/dataset/kernels/image/normalize_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/resize_ir.h"
 
 #include "minddata/dataset/kernels/image/resize_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/resize_preserve_ar_ir.h"
 
 #include "minddata/dataset/kernels/image/resize_preserve_ar_op.h"

mindspore/ccsrc/minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
-
 #include "minddata/dataset/kernels/ir/vision/rgb_to_gray_ir.h"
 
 #include "minddata/dataset/kernels/image/rgb_to_gray_op.h"

mindspore/ccsrc/minddata/dataset/plugin/plugin_loader.cc

@@ -13,12 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <algorithm>
 #include <numeric>
-#include <set>
-#include <string>
-#include <vector>
-
 #include "minddata/dataset/plugin/plugin_loader.h"
 #include "minddata/dataset/plugin/shared_lib_util.h"
 #include "mindspore/core/utils/log_adapter.h"

mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <string>
-
 #include "minddata/dataset/kernels/data/data_utils.h"
 #include "minddata/dataset/text/kernels/lookup_op.h"
 

mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.cc

@@ -16,11 +16,6 @@
 
 #include "minddata/dataset/text/kernels/ngram_op.h"
 
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
 namespace mindspore {
 namespace dataset {
 

mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc

@@ -16,13 +16,6 @@
 
 #include "minddata/dataset/text/kernels/to_number_op.h"
 
-#include <algorithm>
-#include <limits>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <vector>
-
 #include "minddata/dataset/core/data_type.h"
 #include "minddata/dataset/core/tensor.h"
 #include "minddata/dataset/core/tensor_shape.h"

mindspore/ccsrc/minddata/dataset/text/kernels/tokenizer_op.cc

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 #include "minddata/dataset/text/kernels/tokenizer_op.h"
-#include <memory>
-#include <string>
-#include <string_view>
-#include <vector>
 #include "minddata/dataset/text/kernels/data_utils.h"
 
 namespace mindspore {

mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.cc

@@ -15,9 +15,7 @@
  */
 #include "minddata/dataset/text/kernels/unicode_char_tokenizer_op.h"
 #include <memory>
-#include <string>
 #include <string_view>
-#include <utility>
 #include <vector>
 
 #include "cppjieba/Unicode.hpp"

mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.cc

@@ -15,7 +15,6 @@
  */
 #include "minddata/dataset/text/kernels/unicode_script_tokenizer_op.h"
 #include <memory>
-#include <string>
 #include <string_view>
 #include <utility>
 #include <vector>

mindspore/ccsrc/minddata/dataset/util/json_helper.cc

@@ -15,10 +15,6 @@
  */
 #include "minddata/dataset/util/json_helper.h"
 
-#include <algorithm>
-#include <fstream>
-#include <iostream>
-#include <map>
 #include <nlohmann/json.hpp>
 
 #include "minddata/dataset/util/log_adapter.h"

mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <thread>
-
 #include "minddata/mindrecord/include/shard_index_generator.h"
 
 #include "utils/file_utils.h"

mindspore/lite/minddata/wrapper/MDToDApi.cc

@@ -53,6 +53,7 @@ using mindspore::Status;
 using mindspore::dataset::BorderType;
 using mindspore::dataset::InterpolationMode;
 
+namespace mindspore {
 class MDToDApi {
  public:
   std::shared_ptr<mindspore::dataset::AlbumOp> _iter;
@@ -461,3 +462,4 @@ extern "C" int MDToDApi_UpdateNoOfFaces(MDToDApi *pMDToDApi, int32_t noOfFaces)
   }
   return 0;
 }
+}  // namespace mindspore

mindspore/lite/minddata/wrapper/MDToDApi.h

@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
+namespace mindspore {
 class MDToDApi;
 
 typedef struct MDToDBuff {
@@ -57,6 +58,7 @@ typedef struct MDToDResult {
   MDToDBuff_t imageQualitiesBuff;
   MDToDBuff_t faceEmbeddingsBuff;
 } MDToDResult_t;
+}  // namespace mindspore
 
 using (*MDToDApi_pathTest_t)(const char *path) = int;
 using (*MDToDApi_testAlbum_t)() = int;