From ce80db098584dcfc6c159abcba90f33189ed4b5e Mon Sep 17 00:00:00 2001 From: shenwei41 Date: Mon, 16 Nov 2020 20:59:51 +0800 Subject: [PATCH] Modify alarm information --- .../minddata/dataset/core/tensor_helpers.h | 2 ++ .../dataset/engine/cache/cache_request.h | 1 + .../engine/consumers/python_tree_consumer.h | 2 ++ .../dataset/engine/consumers/tree_consumer.h | 9 ++++++ .../ccsrc/minddata/dataset/include/datasets.h | 28 +++++++++++++++++++ 5 files changed, 42 insertions(+) diff --git a/mindspore/ccsrc/minddata/dataset/core/tensor_helpers.h b/mindspore/ccsrc/minddata/dataset/core/tensor_helpers.h index 3e242df4d1..fa04d6be00 100644 --- a/mindspore/ccsrc/minddata/dataset/core/tensor_helpers.h +++ b/mindspore/ccsrc/minddata/dataset/core/tensor_helpers.h @@ -46,6 +46,8 @@ class SliceOption { explicit SliceOption(Slice slice) : slice_(slice) {} SliceOption(SliceOption const &slice) = default; + ~SliceOption() = default; + // only one of the following will be valid // given indices to slice the Tensor. std::vector indices_ = {}; diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h index 059dd26c4d..5dd4d2d8cf 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h @@ -400,6 +400,7 @@ class ServerStopRequest : public BaseRequest { explicit ServerStopRequest(int32_t qID) : BaseRequest(RequestType::kStopService) { rq_.add_buf_data(std::to_string(qID)); } + ~ServerStopRequest() = default; Status PostReply() override; }; diff --git a/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.h b/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.h index 19e98f570e..18443e132e 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.h +++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.h @@ -32,6 +32,8 @@ class PythonIteratorConsumer : public IteratorConsumer { /// Constructor which will call the base class default constructor. /// \param num_epochs number of epochs. Default to -1 (infinite epochs). explicit PythonIteratorConsumer(int32_t num_epochs = -1) : IteratorConsumer(num_epochs) {} + + ~PythonIteratorConsumer() = default; /// Returns the next row in a vector format /// \param[out] out std::vector of Tensors /// \return Status error code diff --git a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h index 7ee5c68720..455b221dff 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h +++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h @@ -58,6 +58,8 @@ class IteratorConsumer : public TreeConsumer { /// \param num_epochs number of epochs. Default to -1 (infinite epochs). explicit IteratorConsumer(int32_t num_epochs = -1) : TreeConsumer(), num_epochs_(num_epochs) {} + ~IteratorConsumer() = default; + Status Init(std::shared_ptr d) override; /// Returns the next row in a vector format @@ -90,6 +92,8 @@ class SaveToDisk : public TreeConsumer { explicit SaveToDisk(std::string dataset_path, int32_t num_files = 1, std::string dataset_type = "mindrecord") : TreeConsumer(), dataset_path_(dataset_path), num_files_(num_files), dataset_type_(dataset_type) {} + ~SaveToDisk() = default; + /// \brief Parameters validation /// \return Status Status::OK() if all the parameters are valid Status ValidateParams(); @@ -130,6 +134,8 @@ class ToDevice : public TreeConsumer { explicit ToDevice(bool send_epoch_end, int32_t num_epochs = -1) : TreeConsumer(), send_epoch_end_(send_epoch_end), num_epochs_(num_epochs) {} + ~ToDevice() = default; + Status Init(std::shared_ptr d) override; /// Send the data to device @@ -159,6 +165,7 @@ class ToDevice : public TreeConsumer { class TreeGetters : public TreeConsumer { public: TreeGetters(); + ~TreeGetters() = default; Status Init(std::shared_ptr d) override; Status GetDatasetSize(int64_t *size); Status GetOutputTypes(std::vector *types); @@ -184,6 +191,8 @@ class BuildVocabConsumer : public TreeConsumer { /// BuildVocabConsumer Constructor which will call the base class default constructor. BuildVocabConsumer() = default; + ~BuildVocabConsumer() = default; + Status Init(std::shared_ptr d) override; /// Start consuming diff --git a/mindspore/ccsrc/minddata/dataset/include/datasets.h b/mindspore/ccsrc/minddata/dataset/include/datasets.h index d108d98d61..5c642700dd 100644 --- a/mindspore/ccsrc/minddata/dataset/include/datasets.h +++ b/mindspore/ccsrc/minddata/dataset/include/datasets.h @@ -424,6 +424,7 @@ class SchemaObj { class BatchDataset : public Dataset { public: BatchDataset(std::shared_ptr input, int32_t batch_size, bool drop_remainder = false); + ~BatchDataset() = default; }; #ifndef ENABLE_ANDROID @@ -435,17 +436,20 @@ class BucketBatchByLengthDataset : public Dataset { std::function element_length_function = nullptr, const std::map>> &pad_info = {}, bool pad_to_bucket_boundary = false, bool drop_remainder = false); + ~BucketBatchByLengthDataset() = default; }; class ConcatDataset : public Dataset { public: explicit ConcatDataset(const std::vector> &input); + ~ConcatDataset() = default; }; class FilterDataset : public Dataset { public: FilterDataset(std::shared_ptr input, std::function predicate, std::vector input_columns); + ~FilterDataset() = default; }; #endif @@ -455,11 +459,13 @@ class MapDataset : public Dataset { std::vector input_columns, std::vector output_columns, const std::vector &project_columns, const std::shared_ptr &cache, std::vector> callbacks); + ~MapDataset() = default; }; class ProjectDataset : public Dataset { public: ProjectDataset(std::shared_ptr input, const std::vector &columns); + ~ProjectDataset() = default; }; #ifndef ENABLE_ANDROID @@ -473,27 +479,32 @@ class RenameDataset : public Dataset { class RepeatDataset : public Dataset { public: RepeatDataset(std::shared_ptr input, int32_t count); + ~RepeatDataset() = default; }; class ShuffleDataset : public Dataset { public: ShuffleDataset(std::shared_ptr input, int32_t buffer_size); + ~ShuffleDataset() = default; }; #ifndef ENABLE_ANDROID class SkipDataset : public Dataset { public: SkipDataset(std::shared_ptr input, int32_t count); + ~SkipDataset() = default; }; class TakeDataset : public Dataset { public: TakeDataset(std::shared_ptr input, int32_t count); + ~TakeDataset() = default; }; class ZipDataset : public Dataset { public: explicit ZipDataset(const std::vector> &inputs); + ~ZipDataset() = default; }; #endif /// \brief Function to create a SchemaObj @@ -507,6 +518,7 @@ class AlbumDataset : public Dataset { const std::vector &column_names = {}, bool decode = false, const std::shared_ptr &sampler = RandomSampler(), const std::shared_ptr &cache = nullptr); + ~AlbumDataset() = default; }; /// \brief Function to create an AlbumDataset @@ -533,6 +545,7 @@ class CelebADataset : public Dataset { const std::shared_ptr &sampler = RandomSampler(), bool decode = false, const std::set &extensions = {}, const std::shared_ptr &cache = nullptr); + ~CelebADataset() = default; }; /// \brief Function to create a CelebADataset @@ -557,6 +570,7 @@ class Cifar10Dataset : public Dataset { explicit Cifar10Dataset(const std::string &dataset_dir, const std::string &usage = "all", const std::shared_ptr &sampler = RandomSampler(), const std::shared_ptr &cache = nullptr); + ~Cifar10Dataset() = default; }; /// \brief Function to create a Cifar10 Dataset @@ -577,6 +591,7 @@ class Cifar100Dataset : public Dataset { explicit Cifar100Dataset(const std::string &dataset_dir, const std::string &usage = "all", const std::shared_ptr &sampler = RandomSampler(), const std::shared_ptr &cache = nullptr); + ~Cifar100Dataset() = default; }; /// \brief Function to create a Cifar100 Dataset @@ -598,6 +613,7 @@ class CLUEDataset : public Dataset { const std::string &usage = "train", int64_t num_samples = 0, ShuffleMode shuffle = ShuffleMode::kGlobal, int32_t num_shards = 1, int32_t shard_id = 0, const std::shared_ptr &cache = nullptr); + ~CLUEDataset() = default; }; /// \brief Function to create a CLUEDataset @@ -629,6 +645,7 @@ class CocoDataset : public Dataset { CocoDataset(const std::string &dataset_dir, const std::string &annotation_file, const std::string &task = "Detection", const bool &decode = false, const std::shared_ptr &sampler = RandomSampler(), const std::shared_ptr &cache = nullptr); + ~CocoDataset() = default; }; /// \brief Function to create a CocoDataset @@ -661,6 +678,7 @@ class CSVDataset : public Dataset { const std::vector &column_names = {}, int64_t num_samples = 0, ShuffleMode shuffle = ShuffleMode::kGlobal, int32_t num_shards = 1, int32_t shard_id = 0, const std::shared_ptr &cache = nullptr); + ~CSVDataset() = default; }; /// \brief Function to create a CSVDataset @@ -698,6 +716,7 @@ class ImageFolderDataset : public Dataset { const std::set &extensions = {}, const std::map &class_indexing = {}, const std::shared_ptr &cache = nullptr); + ~ImageFolderDataset() = default; }; /// \brief Function to create an ImageFolderDataset @@ -725,6 +744,7 @@ class ManifestDataset : public Dataset { const std::shared_ptr &sampler = RandomSampler(), const std::map &class_indexing = {}, bool decode = false, const std::shared_ptr &cache = nullptr); + ~ManifestDataset() = default; }; /// \brief Function to create a ManifestDataset @@ -753,6 +773,7 @@ class MindDataDataset : public Dataset { const std::vector &columns_list = {}, const std::shared_ptr &sampler = RandomSampler(), nlohmann::json padded_sample = nullptr, int64_t num_padded = 0); + ~MindDataDataset() = default; }; /// \brief Function to create a MindDataDataset @@ -789,6 +810,7 @@ class MnistDataset : public Dataset { explicit MnistDataset(const std::string &dataset_dir, const std::string &usage = "all", const std::shared_ptr &sampler = RandomSampler(), const std::shared_ptr &cache = nullptr); + ~MnistDataset() = default; }; /// \brief Function to create a MnistDataset @@ -819,6 +841,8 @@ class RandomDataDataset : public Dataset { RandomDataDataset(const int32_t &total_rows, std::string schema_path, const std::vector &columns_list, std::shared_ptr cache); + + ~RandomDataDataset() = default; }; /// \brief Function to create a RandomDataset @@ -849,6 +873,7 @@ class TextFileDataset : public Dataset { explicit TextFileDataset(const std::vector &dataset_files, int64_t num_samples = 0, ShuffleMode shuffle = ShuffleMode::kGlobal, int32_t num_shards = 1, int32_t shard_id = 0, const std::shared_ptr &cache = nullptr); + ~TextFileDataset() = default; }; /// \brief Function to create a TextFileDataset @@ -883,6 +908,8 @@ class TFRecordDataset : public Dataset { TFRecordDataset(const std::vector &dataset_files, std::shared_ptr schema, const std::vector &columns_list, int64_t num_samples, ShuffleMode shuffle, int32_t num_shards, int32_t shard_id, bool shard_equal_rows, std::shared_ptr cache); + + ~TFRecordDataset() = default; }; /// \brief Function to create a TFRecordDataset @@ -941,6 +968,7 @@ class VOCDataset : public Dataset { const std::string &usage = "train", const std::map &class_indexing = {}, bool decode = false, const std::shared_ptr &sampler = RandomSampler(), const std::shared_ptr &cache = nullptr); + ~VOCDataset() = default; }; /// \brief Function to create a VOCDataset