From 4e5b174f8ff9c39c5da0218fd89e8b46c4abf156 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 16 Mar 2021 19:21:44 -0400 Subject: [PATCH] fix ut --- .../ccsrc/minddata/dataset/api/datasets.cc | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/api/datasets.cc b/mindspore/ccsrc/minddata/dataset/api/datasets.cc index f79af55815..d35a074c31 100644 --- a/mindspore/ccsrc/minddata/dataset/api/datasets.cc +++ b/mindspore/ccsrc/minddata/dataset/api/datasets.cc @@ -991,16 +991,24 @@ MindDataDataset::MindDataDataset(const std::vector &dataset_file, const std::shared_ptr &sampler, nlohmann::json *padded_sample, int64_t num_padded) { auto sampler_obj = sampler ? sampler->Parse() : nullptr; + nlohmann::json sample = nullptr; + if (padded_sample) { + sample = *padded_sample; + }; auto ds = std::make_shared(CharToString(dataset_file), VectorCharToString(columns_list), sampler_obj, - *padded_sample, num_padded); + sample, num_padded); ir_node_ = std::static_pointer_cast(ds); } MindDataDataset::MindDataDataset(const std::vector &dataset_file, const std::vector> &columns_list, Sampler *sampler, nlohmann::json *padded_sample, int64_t num_padded) { auto sampler_obj = sampler ? sampler->Parse() : nullptr; + nlohmann::json sample = nullptr; + if (padded_sample) { + sample = *padded_sample; + }; auto ds = std::make_shared(CharToString(dataset_file), VectorCharToString(columns_list), sampler_obj, - *padded_sample, num_padded); + sample, num_padded); ir_node_ = std::static_pointer_cast(ds); } MindDataDataset::MindDataDataset(const std::vector &dataset_file, @@ -1008,8 +1016,13 @@ MindDataDataset::MindDataDataset(const std::vector &dataset_file, const std::reference_wrapper sampler, nlohmann::json *padded_sample, int64_t num_padded) { auto sampler_obj = sampler.get().Parse(); + nlohmann::json sample = nullptr; + if (padded_sample) { + sample = *padded_sample; + }; + auto ds = std::make_shared(CharToString(dataset_file), VectorCharToString(columns_list), sampler_obj, - *padded_sample, num_padded); + sample, num_padded); ir_node_ = std::static_pointer_cast(ds); } MindDataDataset::MindDataDataset(const std::vector> &dataset_files, @@ -1017,16 +1030,26 @@ MindDataDataset::MindDataDataset(const std::vector> &dataset_f const std::shared_ptr &sampler, nlohmann::json *padded_sample, int64_t num_padded) { auto sampler_obj = sampler ? sampler->Parse() : nullptr; + nlohmann::json sample = nullptr; + if (padded_sample) { + sample = *padded_sample; + }; + auto ds = std::make_shared(VectorCharToString(dataset_files), VectorCharToString(columns_list), - sampler_obj, *padded_sample, num_padded); + sampler_obj, sample, num_padded); ir_node_ = std::static_pointer_cast(ds); } MindDataDataset::MindDataDataset(const std::vector> &dataset_files, const std::vector> &columns_list, Sampler *sampler, nlohmann::json *padded_sample, int64_t num_padded) { auto sampler_obj = sampler ? sampler->Parse() : nullptr; + nlohmann::json sample = nullptr; + if (padded_sample) { + sample = *padded_sample; + }; + auto ds = std::make_shared(VectorCharToString(dataset_files), VectorCharToString(columns_list), - sampler_obj, *padded_sample, num_padded); + sampler_obj, sample, num_padded); ir_node_ = std::static_pointer_cast(ds); } MindDataDataset::MindDataDataset(const std::vector> &dataset_files, @@ -1034,8 +1057,12 @@ MindDataDataset::MindDataDataset(const std::vector> &dataset_f const std::reference_wrapper sampler, nlohmann::json *padded_sample, int64_t num_padded) { auto sampler_obj = sampler.get().Parse(); + nlohmann::json sample = nullptr; + if (padded_sample) { + sample = *padded_sample; + }; auto ds = std::make_shared(VectorCharToString(dataset_files), VectorCharToString(columns_list), - sampler_obj, *padded_sample, num_padded); + sampler_obj, sample, num_padded); ir_node_ = std::static_pointer_cast(ds); } #endif