Merge pull request !7697 from ZiruiWu/fix_ut_compile_errtags/v1.1.0
| @@ -15,7 +15,6 @@ | |||||
| */ | */ | ||||
| #include "common/common.h" | #include "common/common.h" | ||||
| #include "minddata/dataset/include/datasets.h" | #include "minddata/dataset/include/datasets.h" | ||||
| #include "minddata/dataset/core/config_manager.h" | |||||
| #include "minddata/dataset/core/global_context.h" | #include "minddata/dataset/core/global_context.h" | ||||
| #include "mindspore/core/ir/dtype/type_id.h" | #include "mindspore/core/ir/dtype/type_id.h" | ||||
| @@ -23,32 +22,16 @@ | |||||
| // IR non-leaf nodes | // IR non-leaf nodes | ||||
| #include "minddata/dataset/engine/ir/datasetops/batch_node.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/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/concat_node.h" | ||||
| #include "minddata/dataset/engine/ir/datasetops/map_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/project_node.h" | ||||
| #include "minddata/dataset/engine/ir/datasetops/rename_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/shuffle_node.h" | ||||
| #include "minddata/dataset/engine/ir/datasetops/skip_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" | #include "minddata/dataset/engine/ir/datasetops/zip_node.h" | ||||
| // IR leaf nodes | // 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/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 namespace mindspore::dataset; | ||||
| using namespace mindspore::dataset::api; | using namespace mindspore::dataset::api; | ||||
| @@ -18,6 +18,22 @@ | |||||
| #include "minddata/dataset/include/datasets.h" | #include "minddata/dataset/include/datasets.h" | ||||
| #include "minddata/dataset/include/transforms.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::api; | using namespace mindspore::dataset::api; | ||||
| using mindspore::dataset::Tensor; | using mindspore::dataset::Tensor; | ||||
| @@ -13,8 +13,6 @@ | |||||
| * See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | ||||
| * limitations under the License. | * limitations under the License. | ||||
| */ | */ | ||||
| #include <fstream> | |||||
| #include <iostream> | |||||
| #include <memory> | #include <memory> | ||||
| #include <vector> | #include <vector> | ||||
| #include <string> | #include <string> | ||||
| @@ -28,32 +26,16 @@ | |||||
| // IR non-leaf nodes | // IR non-leaf nodes | ||||
| #include "minddata/dataset/engine/ir/datasetops/batch_node.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/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/concat_node.h" | ||||
| #include "minddata/dataset/engine/ir/datasetops/map_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/project_node.h" | ||||
| #include "minddata/dataset/engine/ir/datasetops/rename_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/shuffle_node.h" | ||||
| #include "minddata/dataset/engine/ir/datasetops/skip_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" | #include "minddata/dataset/engine/ir/datasetops/zip_node.h" | ||||
| // IR leaf nodes | // 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/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::api; | using namespace mindspore::dataset::api; | ||||
| using mindspore::dataset::DataType; | using mindspore::dataset::DataType; | ||||