From f758bfa79f7b272ca20cc522537d67eefb4a293e Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 10 Jan 2021 21:55:17 -0500 Subject: [PATCH] CI fix part 1 Added CI fix --- mindspore/ccsrc/minddata/dataset/api/execute.cc | 3 +++ .../bindings/dataset/include/iterator_bindings.cc | 12 ++++++------ .../minddata/dataset/api/python/pybind_conversion.cc | 2 +- .../minddata/dataset/api/python/pybind_conversion.h | 2 +- .../dataset/engine/consumers/python_tree_consumer.cc | 2 +- .../dataset/engine/consumers/python_tree_consumer.h | 5 ++++- .../dataset/engine/consumers/tree_consumer.cc | 6 +++--- .../dataset/engine/consumers/tree_consumer.h | 6 +++--- .../engine/ir/cache/pre_built_dataset_cache.cc | 2 +- .../engine/ir/cache/pre_built_dataset_cache.h | 4 +++- .../dataset/engine/ir/datasetops/dataset_node.cc | 2 +- .../dataset/engine/ir/datasetops/dataset_node.h | 2 +- mindspore/ccsrc/minddata/dataset/include/execute.h | 3 +++ .../minddata/dataset/kernels/image/image_utils.cc | 2 +- .../dataset/kernels/image/lite_image_utils.cc | 4 ++-- 15 files changed, 34 insertions(+), 23 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/api/execute.cc b/mindspore/ccsrc/minddata/dataset/api/execute.cc index 7b7e15d638..c1bbb9b939 100644 --- a/mindspore/ccsrc/minddata/dataset/api/execute.cc +++ b/mindspore/ccsrc/minddata/dataset/api/execute.cc @@ -31,6 +31,9 @@ namespace dataset { Execute::Execute(std::shared_ptr op) : op_(std::move(op)) {} +/// \brief Destructor +Execute::~Execute() = default; + #ifdef ENABLE_ANDROID std::shared_ptr Execute::operator()(std::shared_ptr input) { // Build the op diff --git a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/iterator_bindings.cc b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/iterator_bindings.cc index 36424e4b25..cca31715b3 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/iterator_bindings.cc +++ b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/iterator_bindings.cc @@ -53,37 +53,37 @@ PYBIND_REGISTER(TreeGetters, 1, ([](const py::module *m) { [](PythonTreeGetters &self, std::shared_ptr d) { THROW_IF_ERROR(self.Init(d)); }) .def("GetOutputShapes", [](PythonTreeGetters &self) { - std::vector shapes; + std::vector shapes = {}; THROW_IF_ERROR(self.GetOutputShapes(&shapes)); return shapesToListOfShape(shapes); }) .def("GetOutputTypes", [](PythonTreeGetters &self) { - std::vector types; + std::vector types = {}; THROW_IF_ERROR(self.GetOutputTypes(&types)); return typesToListOfType(types); }) .def("GetNumClasses", [](PythonTreeGetters &self) { - int64_t num_classes; + int64_t num_classes = -1; THROW_IF_ERROR(self.GetNumClasses(&num_classes)); return num_classes; }) .def("GetRepeatCount", [](PythonTreeGetters &self) { - int64_t repeat_count; + int64_t repeat_count = -1; THROW_IF_ERROR(self.GetRepeatCount(&repeat_count)); return repeat_count; }) .def("GetBatchSize", [](PythonTreeGetters &self) { - int64_t batch_size; + int64_t batch_size = -1; THROW_IF_ERROR(self.GetBatchSize(&batch_size)); return batch_size; }) .def("GetColumnNames", [](PythonTreeGetters &self) { - std::vector col_names; + std::vector col_names = {}; THROW_IF_ERROR(self.GetColumnNames(&col_names)); return col_names; }) diff --git a/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.cc b/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.cc index ca96bcb4fd..b15a0bc1f0 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.cc +++ b/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.cc @@ -202,7 +202,7 @@ std::vector> toCSVBase(py::list csv_bases) { return vector; } -Status ToJson(const py::handle &padded_sample, nlohmann::json *padded_sample_json, +Status ToJson(const py::handle &padded_sample, nlohmann::json *const padded_sample_json, std::map *sample_bytes) { for (const py::handle &key : padded_sample) { if (py::isinstance(padded_sample[key])) { diff --git a/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h b/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h index 49c5e6c425..4f9a95d2d1 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h +++ b/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h @@ -73,7 +73,7 @@ std::vector> toCSVBase(py::list csv_bases); std::shared_ptr toPyFuncOp(py::object func, DataType::Type data_type); -Status ToJson(const py::handle &padded_sample, nlohmann::json *padded_sample_json, +Status ToJson(const py::handle &padded_sample, nlohmann::json *const padded_sample_json, std::map *sample_bytes); Status toPadInfo(py::dict value, std::map>> *pad_info); diff --git a/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.cc b/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.cc index db36286df3..035d8088d8 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.cc @@ -61,7 +61,7 @@ Status PythonSaveToDisk::Save() { PythonSaveToDisk::PythonSaveToDisk(const std::string &datasetPath, int32_t numFiles, const std::string &datasetType) : SaveToDisk(datasetPath, numFiles, datasetType) {} -Status PythonTreeGetters::GetRow(TensorRow *r) { +Status PythonTreeGetters::GetRow(TensorRow *const r) { py::gil_scoped_release gil_release; return TreeGetters::GetRow(r); } 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 b200fe0604..25df8b85ee 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.h +++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/python_tree_consumer.h @@ -53,16 +53,19 @@ class PythonBuildVocabConsumer : public BuildVocabConsumer { class PythonSaveToDisk : public SaveToDisk { public: PythonSaveToDisk(const std::string &datasetPath, int32_t numFiles, const std::string &datasetType); + ~PythonSaveToDisk() = default; Status Save() override; }; class PythonTreeGetters : public TreeGetters { public: - Status GetRow(TensorRow *r) override; + Status GetRow(TensorRow *const r) override; + ~PythonTreeGetters() = default; }; class PythonDatasetSizeGetter : public DatasetSizeGetter { public: Status GetRow(const std::shared_ptr &tree_adapter, TensorRow *r) override; + ~PythonDatasetSizeGetter() = default; }; } // namespace mindspore::dataset #endif // MINDSPORE_CCSRC_MINDDATA_DATASET_ENGINE_CONSUMERS_PYTHON_TREE_CONSUMER_H_ diff --git a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc index f8a925bc9f..69176eb8f3 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc @@ -60,7 +60,7 @@ Status IteratorConsumer::GetNextAsVector(std::vector *out) { return Status::OK(); } -Status IteratorConsumer::GetNextAsMap(std::unordered_map *out_map) { +Status IteratorConsumer::GetNextAsMap(std::unordered_map *const out_map) { RETURN_UNEXPECTED_IF_NULL(out_map); out_map->clear(); @@ -77,7 +77,7 @@ Status IteratorConsumer::GetNextAsMap(std::unordered_map return Status::OK(); } -Status IteratorConsumer::GetNextAsOrderedPair(std::vector>> *vec) { +Status IteratorConsumer::GetNextAsOrderedPair(std::vector>> *const vec) { CHECK_FAIL_RETURN_UNEXPECTED(vec != nullptr && vec->empty(), "vec is null or non-empty."); TensorRow curr_row; @@ -140,7 +140,7 @@ Status ToDevice::Stop() { return Status::OK(); } -Status ToDevice::GetDataInfo(std::vector *types, std::vector *shapes) { +Status ToDevice::GetDataInfo(std::vector *const types, std::vector *const shapes) { // tree_.root() must be DeviceQueueOp std::shared_ptr root = std::shared_ptr(tree_adapter_->GetRoot()); CHECK_FAIL_RETURN_UNEXPECTED(root != nullptr, "Root is a nullptr."); diff --git a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h index 063be9adb9..30d9e2f7a4 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h +++ b/mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.h @@ -72,12 +72,12 @@ class IteratorConsumer : public TreeConsumer { /// Returns the next row in as a map /// \param[out] out std::map of string to Tensor /// \return Status error code - Status GetNextAsMap(std::unordered_map *out); + Status GetNextAsMap(std::unordered_map *const out); /// Returns the next row in as a vector /// \param[out] out std::vector of pairs of string to Tensor /// \return Status error code - Status GetNextAsOrderedPair(std::vector>> *vec); + Status GetNextAsOrderedPair(std::vector>> *const vec); protected: /// Method to return the name of the consumer @@ -161,7 +161,7 @@ class ToDevice : public TreeConsumer { /// Get data info from TDT /// \return Status error code - virtual Status GetDataInfo(std::vector *types, std::vector *shapes); + virtual Status GetDataInfo(std::vector *const types, std::vector *const shapes); protected: /// Method to return the name of the consumer diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc index baf2bf2140..b99c06fbd2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.cc @@ -27,7 +27,7 @@ Status PreBuiltDatasetCache::Build() { return Status::OK(); } -Status PreBuiltDatasetCache::CreateCacheOp(int32_t num_workers, std::shared_ptr *ds) { +Status PreBuiltDatasetCache::CreateCacheOp(int32_t num_workers, std::shared_ptr *const ds) { CHECK_FAIL_RETURN_UNEXPECTED(cache_client_ != nullptr, "Cache client has not been created yet."); std::shared_ptr cache_op = nullptr; RETURN_IF_NOT_OK(CacheOp::Builder().SetNumWorkers(num_workers).SetClient(cache_client_).Build(&cache_op)); diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.h b/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.h index bc7161170b..1a5c733dda 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/cache/pre_built_dataset_cache.h @@ -32,11 +32,13 @@ class PreBuiltDatasetCache : public DatasetCache { /// \param cc a pre-built cache client explicit PreBuiltDatasetCache(std::shared_ptr cc) : cache_client_(std::move(cc)) {} + ~PreBuiltDatasetCache() = default; + /// Method to initialize the DatasetCache by creating an instance of a CacheClient /// \return Status Error code Status Build() override; - Status CreateCacheOp(int32_t num_workers, std::shared_ptr *ds) override; + Status CreateCacheOp(int32_t num_workers, std::shared_ptr *const ds) override; Status ValidateParams() override { return Status::OK(); } diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.cc b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.cc index 78e298a8ff..c82cc99dfc 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.cc @@ -388,7 +388,7 @@ Status DatasetNode::AcceptAfter(IRNodePass *const p, bool *modified) { return p->VisitAfter(shared_from_this(), modified); } -Status DatasetNode::GetShardId(int32_t *shard_id) { +Status DatasetNode::GetShardId(int32_t *const shard_id) { if (!Children().empty()) { // Get shard id from the child node return Children()[0]->GetShardId(shard_id); diff --git a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.h b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.h index 8720b557e9..86f8ef29b6 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/dataset_node.h @@ -156,7 +156,7 @@ class DatasetNode : public std::enable_shared_from_this { /// \brief Pure virtual function for derived class to get the shard id of specific node /// \return Status Status::OK() if get shard id successfully - virtual Status GetShardId(int32_t *shard_id); + virtual Status GetShardId(int32_t *const shard_id); /// \brief Gets the dataset size /// \param[in] size_getter Shared pointer to DatasetSizeGetter diff --git a/mindspore/ccsrc/minddata/dataset/include/execute.h b/mindspore/ccsrc/minddata/dataset/include/execute.h index 64c1a55c3a..660c9fa8f0 100644 --- a/mindspore/ccsrc/minddata/dataset/include/execute.h +++ b/mindspore/ccsrc/minddata/dataset/include/execute.h @@ -37,6 +37,9 @@ class Execute { /// \brief Constructor explicit Execute(std::shared_ptr op); + /// \brief Destructor + ~Execute(); + #ifdef ENABLE_ANDROID /// \brief callable function to execute the TensorOperation in eager mode /// \param[inout] input - the tensor to be transformed diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc index a09c258e7d..7b03ed2b54 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc @@ -220,7 +220,7 @@ static Status JpegReadScanlines(jpeg_decompress_struct *const cinfo, int max_sca } if (cinfo->out_color_space == JCS_CMYK && num_lines_read > 0) { for (int i = 0; i < crop_w; ++i) { - int cmyk_pixel = 4 * i + offset; + const int cmyk_pixel = 4 * i + offset; const int c = scanline_ptr[cmyk_pixel]; const int m = scanline_ptr[cmyk_pixel + 1]; const int y = scanline_ptr[cmyk_pixel + 2]; diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/lite_image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/lite_image_utils.cc index 9aaae55fc3..0d58006b3c 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/lite_image_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/lite_image_utils.cc @@ -99,7 +99,7 @@ static Status JpegReadScanlines(jpeg_decompress_struct *const cinfo, int max_sca } if (cinfo->out_color_space == JCS_CMYK && num_lines_read > 0) { for (int i = 0; i < crop_w; ++i) { - int cmyk_pixel = 4 * i + offset; + const int cmyk_pixel = 4 * i + offset; const int c = scanline_ptr[cmyk_pixel]; const int m = scanline_ptr[cmyk_pixel + 1]; const int y = scanline_ptr[cmyk_pixel + 2]; @@ -119,7 +119,7 @@ static Status JpegReadScanlines(jpeg_decompress_struct *const cinfo, int max_sca buffer[3 * i + 2] = b; } } else if (num_lines_read > 0) { - int copy_status = memcpy_s(buffer, buffer_size, scanline_ptr + offset, stride); + auto copy_status = memcpy_s(buffer, buffer_size, scanline_ptr + offset, stride); if (copy_status != 0) { jpeg_destroy_decompress(cinfo); RETURN_STATUS_UNEXPECTED("memcpy failed");