From a85a256749dcfdb28b31c64566d90e4956c251c6 Mon Sep 17 00:00:00 2001 From: Zirui Wu Date: Fri, 23 Oct 2020 10:09:35 -0400 Subject: [PATCH] fix complie err in c_api_dataset_test_save --- .../dataset/c_api_dataset_randomdata_test.cc | 17 ----------------- tests/ut/cpp/dataset/c_api_dataset_save.cc | 16 ++++++++++++++++ tests/ut/cpp/dataset/c_api_text_vocab_test.cc | 18 ------------------ 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/tests/ut/cpp/dataset/c_api_dataset_randomdata_test.cc b/tests/ut/cpp/dataset/c_api_dataset_randomdata_test.cc index 2267012123..9ec6d744ec 100644 --- a/tests/ut/cpp/dataset/c_api_dataset_randomdata_test.cc +++ b/tests/ut/cpp/dataset/c_api_dataset_randomdata_test.cc @@ -15,7 +15,6 @@ */ #include "common/common.h" #include "minddata/dataset/include/datasets.h" -#include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/global_context.h" #include "mindspore/core/ir/dtype/type_id.h" @@ -23,32 +22,16 @@ // 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 namespace mindspore::dataset::api; diff --git a/tests/ut/cpp/dataset/c_api_dataset_save.cc b/tests/ut/cpp/dataset/c_api_dataset_save.cc index 9697b88ad0..f15d0989be 100644 --- a/tests/ut/cpp/dataset/c_api_dataset_save.cc +++ b/tests/ut/cpp/dataset/c_api_dataset_save.cc @@ -18,6 +18,22 @@ #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::api; using mindspore::dataset::Tensor; diff --git a/tests/ut/cpp/dataset/c_api_text_vocab_test.cc b/tests/ut/cpp/dataset/c_api_text_vocab_test.cc index 2a33af0262..1ab29a0c28 100644 --- a/tests/ut/cpp/dataset/c_api_text_vocab_test.cc +++ b/tests/ut/cpp/dataset/c_api_text_vocab_test.cc @@ -13,8 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include -#include #include #include #include @@ -28,32 +26,16 @@ // 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::api; using mindspore::dataset::DataType;