remove uncessary headers

staging II

clean up

further clean up

fix merge conflict with 8139

fix complie err

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

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "minddata/dataset/engine/datasetops/concat_op.h"
+
 #include <iomanip>
 #include <utility>
 
-#include "utils/ms_utils.h"
 #include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/engine/data_buffer.h"
-#include "minddata/dataset/engine/datasetops/concat_op.h"
-#include "minddata/dataset/engine/opt/pass.h"
 #include "minddata/dataset/engine/db_connector.h"
-#include "minddata/dataset/engine/execution_tree.h"
+#include "minddata/dataset/engine/opt/pass.h"
+#include "utils/ms_utils.h"
 
 namespace mindspore {
 namespace dataset {
@@ -101,7 +101,7 @@ Status ConcatOp::operator()() {
       // 3. Put the data into output_connector
       if (!children_flag_and_nums_.empty()) is_not_mappable = children_flag_and_nums_[i].first;
       while (!buf->eoe() && !buf->eof()) {
-        // if dataset is no mappable or generator dataset which source is yeild（cannot get the number of samples in
+        // if dataset is not mappable or generator dataset which source is yield, cannot get the number of samples in
         // python layer), we use filtering to get data
         if (sample_number % num_shard == shard_index && (is_not_mappable || !children_flag_and_nums_[i].second)) {
           RETURN_IF_NOT_OK(out_connector_->Add(0, std::move(buf)));
@@ -125,7 +125,7 @@ Status ConcatOp::operator()() {
         RETURN_IF_NOT_OK(child_[i]->GetNextBuffer(&buf));
       }
 
-      // if dataset is mappable,We do't use filtering to pick data.
+      // if dataset is mappable,We don't use filtering to pick data.
       // so sample_number plus the length of the entire dataset
       if (!is_not_mappable && children_flag_and_nums_[i].second) {
         sample_number += children_flag_and_nums_[i].second;
@@ -142,7 +142,7 @@ Status ConcatOp::operator()() {
   CHECK_FAIL_RETURN_UNEXPECTED(eof_count == children_num_,
                                "Something went wrong, eof count does not match the number of children.");
   // 5. Add eof buffer in the end manually
-  MS_LOG(DEBUG) << "Add the eof buffer manualy in the end.";
+  MS_LOG(DEBUG) << "Add the eof buffer manually in the end.";
   auto eof_buffer = std::make_unique<DataBuffer>(0, DataBuffer::kDeBFlagEOF);
   RETURN_IF_NOT_OK(out_connector_->Add(0, std::move(eof_buffer)));
   return Status::OK();
@@ -150,7 +150,7 @@ Status ConcatOp::operator()() {
 
 Status ConcatOp::Verify(int32_t id, const std::unique_ptr<DataBuffer> &buf) {
   TensorRow new_row;
-  buf->GetRow(0, &new_row);
+  RETURN_IF_NOT_OK(buf->GetRow(0, &new_row));
 
   if (id == 0) {
     // Obtain the data type and data rank in child[0]

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

@@ -25,10 +25,10 @@
 
 namespace mindspore {
 namespace dataset {
-/// \brief Base class of CSV Record
 /// \brief Record type for CSV
 enum CsvType : uint8_t { INT = 0, FLOAT, STRING };
 
+/// \brief Base class of CSV Record
 class CsvBase {
  public:
   CsvBase() = default;

mindspore/ccsrc/minddata/dataset/include/datasets.h

@@ -61,13 +61,14 @@ class Iterator;
 class TensorOperation;
 class SchemaObj;
 class SamplerObj;
-// Datasets classes (in alphabetical order)
 class CsvBase;
+
+// Dataset classes (in alphabetical order)
 class BatchDataset;
-// Dataset Op classes (in alphabetical order)
 #ifndef ENABLE_ANDROID
 class BucketBatchByLengthDataset;
 #endif
+class CSVDataset;
 class ConcatDataset;
 class MapDataset;
 class ProjectDataset;

mindspore/dataset/engine/datasets.py

@@ -2521,6 +2521,7 @@ class ConcatDataset(DatasetOp):
             if isinstance(child, BatchDataset):
                 raise TypeError("The parameter %s of concat must not be BatchDataset!" % (child))
 
+            # if child is mappable and the length is greater than 0
             if not self._children_flag_and_nums[index][0] and self._children_flag_and_nums[index][1]:
 
                 tem_value = cumulative_samples_nums + self._children_flag_and_nums[index][1]

mindspore/lite/minddata/example/jni-example.cc

@@ -20,7 +20,6 @@
 #include <iostream>
 #include <memory>
 #include "minddata/dataset/include/datasets.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
 #include "minddata/dataset/util/path.h"
 #if defined(__ANDROID__) || defined(ANDROID)
 #include <android/log.h>

mindspore/lite/minddata/example/x86-example.cc

@@ -15,12 +15,8 @@
  */
 
 #include <string>
-#include <fstream>
-#include <iostream>
 #include <memory>
 #include "minddata/dataset/include/datasets.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/util/path.h"
 
 using Dataset = mindspore::dataset::Dataset;
 using Iterator = mindspore::dataset::Iterator;

tests/ut/cpp/dataset/c_api_cache_test.cc

@@ -16,21 +16,7 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/album_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/celeba_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar100_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/coco_node.h"
 #include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/manifest_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/mnist_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/random_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/tf_record_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
 
 using namespace mindspore::dataset;
 

tests/ut/cpp/dataset/c_api_dataset_album_test.cc

@@ -16,20 +16,8 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/album_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_cifar_test.cc

@@ -16,22 +16,10 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/cifar100_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::DataType;
+using mindspore::dataset::Tensor;
+using mindspore::dataset::TensorShape;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_clue_test.cc

@@ -14,25 +14,13 @@
  * limitations under the License.
  */
 #include "common/common.h"
-#include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/core/global_context.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::GlobalContext;
+using mindspore::dataset::ShuffleMode;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_coco_test.cc

@@ -16,37 +16,10 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/build_vocab_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/repeat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/take_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/album_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/celeba_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar100_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/coco_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/manifest_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/random_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/tf_record_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::dsize_t;
+using mindspore::dataset::Tensor;
+using mindspore::dataset::TensorShape;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_config_test.cc

@@ -18,18 +18,9 @@
 #include "minddata/dataset/include/config.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::ShuffleMode;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_csv_test.cc

@@ -14,39 +14,11 @@
  * limitations under the License.
  */
 #include "common/common.h"
-#include "minddata/dataset/core/config_manager.h"
 #include "minddata/dataset/core/global_context.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/build_vocab_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/repeat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/take_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/album_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/celeba_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar100_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/coco_node.h"
+// need for CsvRecord
 #include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/manifest_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/random_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/tf_record_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
 
 using namespace mindspore::dataset;
 

tests/ut/cpp/dataset/c_api_dataset_iterator_test.cc

@@ -17,23 +17,9 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/mnist_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
+using mindspore::dataset::TensorShape;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_manifest_test.cc

@@ -16,20 +16,8 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/manifest_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_minddata_test.cc

@@ -16,21 +16,8 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_ops_test.cc

@@ -18,24 +18,8 @@
 #include "minddata/dataset/include/datasets.h"
 #include "minddata/dataset/include/vision.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/mnist_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_randomdata_test.cc

@@ -19,20 +19,6 @@
 
 #include "mindspore/core/ir/dtype/type_id.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/random_node.h"
-
 using namespace mindspore::dataset;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {

tests/ut/cpp/dataset/c_api_dataset_save.cc

@@ -18,23 +18,8 @@
 #include "minddata/dataset/include/datasets.h"
 #include "minddata/dataset/include/transforms.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_dataset_textfile_test.cc

@@ -17,20 +17,6 @@
 #include "minddata/dataset/core/global_context.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-
 using namespace mindspore::dataset;
 
 using mindspore::dataset::ShuffleMode;

tests/ut/cpp/dataset/c_api_dataset_tfrecord_test.cc

@@ -18,20 +18,6 @@
 #include "minddata/dataset/include/vision.h"
 #include "minddata/dataset/core/global_context.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/tf_record_node.h"
-
 using namespace mindspore::dataset;
 
 using mindspore::dataset::DataType;

tests/ut/cpp/dataset/c_api_dataset_voc_test.cc

@@ -16,21 +16,10 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::DataType;
+using mindspore::dataset::Tensor;
+using mindspore::dataset::TensorShape;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_datasets_test.cc

@@ -16,24 +16,9 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-
-#include "minddata/dataset/engine/ir/datasetops/source/celeba_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/mnist_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
+using mindspore::dataset::TensorShape;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_samplers_test.cc

@@ -16,15 +16,8 @@
 #include "common/common.h"
 #include "minddata/dataset/include/datasets.h"
 
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_text_sentence_piece_vocab_test.cc

@@ -23,13 +23,11 @@
 #include "minddata/dataset/include/transforms.h"
 #include "minddata/dataset/include/text.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::SentencePieceModel;
+using mindspore::dataset::SentencePieceVocab;
+using mindspore::dataset::ShuffleMode;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_text_vocab_test.cc

@@ -23,21 +23,12 @@
 #include "minddata/dataset/include/transforms.h"
 #include "minddata/dataset/include/text.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::DataType;
+using mindspore::dataset::ShuffleMode;
+using mindspore::dataset::Status;
+using mindspore::dataset::Tensor;
+using mindspore::dataset::Vocab;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_transforms_test.cc

@@ -18,37 +18,9 @@
 #include "minddata/dataset/include/transforms.h"
 #include "minddata/dataset/include/vision.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/build_vocab_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/repeat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/take_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/album_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/celeba_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar100_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/clue_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/csv_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/manifest_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/minddata_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/random_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/text_file_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/tf_record_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::BorderType;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected:

tests/ut/cpp/dataset/c_api_vision_test.cc

@@ -18,24 +18,10 @@
 #include "minddata/dataset/include/transforms.h"
 #include "minddata/dataset/include/vision.h"
 
-// IR non-leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/batch_node.h"
-#include "minddata/dataset/engine/ir/datasetops/bucket_batch_by_length_node.h"
-#include "minddata/dataset/engine/ir/datasetops/concat_node.h"
-#include "minddata/dataset/engine/ir/datasetops/map_node.h"
-#include "minddata/dataset/engine/ir/datasetops/project_node.h"
-#include "minddata/dataset/engine/ir/datasetops/rename_node.h"
-#include "minddata/dataset/engine/ir/datasetops/shuffle_node.h"
-#include "minddata/dataset/engine/ir/datasetops/skip_node.h"
-#include "minddata/dataset/engine/ir/datasetops/zip_node.h"
-
-// IR leaf nodes
-#include "minddata/dataset/engine/ir/datasetops/source/cifar10_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/image_folder_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/mnist_node.h"
-#include "minddata/dataset/engine/ir/datasetops/source/voc_node.h"
-
 using namespace mindspore::dataset;
+using mindspore::dataset::BorderType;
+using mindspore::dataset::InterpolationMode;
+using mindspore::dataset::Tensor;
 
 class MindDataTestPipeline : public UT::DatasetOpTesting {
  protected: