diff --git a/mindspore/ccsrc/dataset/core/data_type.cc b/mindspore/ccsrc/dataset/core/data_type.cc index 71a510d88f..bb10fae52f 100644 --- a/mindspore/ccsrc/dataset/core/data_type.cc +++ b/mindspore/ccsrc/dataset/core/data_type.cc @@ -18,7 +18,6 @@ #include "utils/log_adapter.h" #include "dataset/core/pybind_support.h" -#include "dataset/util/de_error.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/tensor.cc b/mindspore/ccsrc/dataset/core/tensor.cc index abab8cf3f4..8de3425c5b 100644 --- a/mindspore/ccsrc/dataset/core/tensor.cc +++ b/mindspore/ccsrc/dataset/core/tensor.cc @@ -152,7 +152,7 @@ Tensor::Tensor(const std::vector &strings, const TensorShape &shape this->data_end_ = data_ + offset_arr[i]; - DS_ASSERT(num_bytes == 0); + MS_ASSERT(num_bytes == 0); if (shape.known()) Tensor::Reshape(shape); } Tensor::Tensor(const dataengine::BytesList &bytes_list, const TensorShape &shape) @@ -191,7 +191,7 @@ Tensor::Tensor(const dataengine::BytesList &bytes_list, const TensorShape &shape data_end_ = data_ + offset_arr[i]; - DS_ASSERT(num_bytes == 0); + MS_ASSERT(num_bytes == 0); if (shape.known()) Tensor::Reshape(shape); } Status Tensor::CreateTensor(std::shared_ptr *ptr, TensorImpl tensor_impl, const TensorShape &shape, @@ -420,7 +420,7 @@ bool Tensor::operator==(const Tensor &rhs) const { // Description: A function that print the value as specified by its index void Tensor::PrintItemAt(const std::vector &index, std::ostream &out) const { Status rc; - DS_ASSERT(data_); + MS_ASSERT(data_); switch (type_.value()) { CASE_PRINT_HEX(DataType::DE_BOOL, bool); diff --git a/mindspore/ccsrc/dataset/core/tensor.h b/mindspore/ccsrc/dataset/core/tensor.h index a3dbb391e5..9fed0bbc97 100644 --- a/mindspore/ccsrc/dataset/core/tensor.h +++ b/mindspore/ccsrc/dataset/core/tensor.h @@ -33,7 +33,6 @@ #include "dataset/core/data_type.h" #include "dataset/core/tensor_shape.h" #include "dataset/util/allocator.h" -#include "dataset/util/de_error.h" #include "dataset/util/status.h" #include "proto/example.pb.h" diff --git a/mindspore/ccsrc/dataset/core/tensor_shape.cc b/mindspore/ccsrc/dataset/core/tensor_shape.cc index 30afdf38bc..a0d6b9cd8d 100644 --- a/mindspore/ccsrc/dataset/core/tensor_shape.cc +++ b/mindspore/ccsrc/dataset/core/tensor_shape.cc @@ -22,7 +22,6 @@ #include "common/utils.h" #include "utils/log_adapter.h" #include "dataset/core/constants.h" -#include "dataset/util/de_error.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/connector.h b/mindspore/ccsrc/dataset/engine/connector.h index cdce592c1b..5701c902da 100644 --- a/mindspore/ccsrc/dataset/engine/connector.h +++ b/mindspore/ccsrc/dataset/engine/connector.h @@ -97,7 +97,7 @@ class Connector { virtual Status Pop(int32_t worker_id, // The worker-id of the caller. See the requirement at the top of this file. T *result) noexcept { { - DS_ASSERT(worker_id < num_consumers_); + MS_ASSERT(worker_id < num_consumers_); std::unique_lock lk(m_); RETURN_IF_NOT_OK(cv_.Wait(&lk, [this, worker_id]() { return expect_consumer_ == worker_id; })); RETURN_IF_NOT_OK(queues_[pop_from_]->PopFront(result)); @@ -114,8 +114,8 @@ class Connector { // @param worker_id The id of a worker thread calling this method. // @param el A const lvalue element to be passed/added/pushed. Status Push(int32_t worker_id, const T &el) noexcept { - DS_ASSERT(worker_id < static_cast(queues_.size())); - DS_ASSERT(queues_[worker_id] != nullptr); + MS_ASSERT(worker_id < static_cast(queues_.size())); + MS_ASSERT(queues_[worker_id] != nullptr); return (queues_[worker_id]->Add(el)); } @@ -125,8 +125,8 @@ class Connector { // @param worker_id The id of a worker thread calling this method. // @param el An element to be passed/added/pushed. virtual Status Push(int32_t worker_id, T &&el) noexcept { - DS_ASSERT(worker_id < static_cast(queues_.size())); - DS_ASSERT(queues_[worker_id] != nullptr); + MS_ASSERT(worker_id < static_cast(queues_.size())); + MS_ASSERT(queues_[worker_id] != nullptr); return (queues_[worker_id]->Add(std::forward(el))); } diff --git a/mindspore/ccsrc/dataset/engine/data_schema.cc b/mindspore/ccsrc/dataset/engine/data_schema.cc index 9b86d18912..419816f30a 100644 --- a/mindspore/ccsrc/dataset/engine/data_schema.cc +++ b/mindspore/ccsrc/dataset/engine/data_schema.cc @@ -27,7 +27,6 @@ #include "dataset/util/status.h" #include "dataset/core/tensor_shape.h" #include "utils/log_adapter.h" -#include "dataset/util/de_error.h" namespace mindspore { namespace dataset { @@ -425,7 +424,7 @@ DataSchema::~DataSchema() = default; // Getter for the ColDescriptor by index const ColDescriptor &DataSchema::column(int32_t idx) const { - DS_ASSERT(idx < static_cast(col_descs_.size())); + MS_ASSERT(idx < static_cast(col_descs_.size())); return col_descs_[idx]; } diff --git a/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc b/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc index d1129848e3..727c543958 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc +++ b/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc @@ -110,7 +110,7 @@ void DatasetOp::RemoveParent(const DatasetOp *parent) { // Getter function to get a shared pointer to our childAdds a operator to become our child. std::shared_ptr DatasetOp::child(int32_t child_index) const { - DS_ASSERT(child_index < static_cast(child_.size())); + MS_ASSERT(child_index < static_cast(child_.size())); // Return a shared pointer return child_[child_index]; } diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc b/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc index b2611a67fc..c28ed2d3ab 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc +++ b/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc @@ -104,7 +104,7 @@ Status ImageFolderOp::PrescanMasterEntry(const std::string &filedir) { // following loop puts the 2 level of shuffles together into 1 vector for (size_t ind = 0; ind < v.size(); ++ind) { while (v[ind]->second.empty() == false) { - DS_ASSERT(!(v[ind]->first.empty())); // make sure that v[ind]->first.substr(1) is not out of bound + MS_ASSERT(!(v[ind]->first.empty())); // make sure that v[ind]->first.substr(1) is not out of bound v[ind]->second.front()->second = class_index_.empty() ? ind : class_index_[v[ind]->first.substr(1)]; image_label_pairs_.push_back(v[ind]->second.front()); v[ind]->second.pop(); diff --git a/mindspore/ccsrc/dataset/engine/jagged_connector.h b/mindspore/ccsrc/dataset/engine/jagged_connector.h index 5f9f255f2b..2058c542a8 100644 --- a/mindspore/ccsrc/dataset/engine/jagged_connector.h +++ b/mindspore/ccsrc/dataset/engine/jagged_connector.h @@ -44,7 +44,7 @@ class JaggedConnector : public Connector> { Status Pop(int32_t worker_id, std::unique_ptr *result) noexcept override { { - DS_ASSERT(worker_id < num_consumers_); + MS_ASSERT(worker_id < num_consumers_); std::unique_lock lock(m_); RETURN_IF_NOT_OK(cv_.Wait(&lock, [this, worker_id]() { return expect_consumer_ == worker_id; })); if (is_queue_finished_[pop_from_]) { diff --git a/mindspore/ccsrc/dataset/util/arena.cc b/mindspore/ccsrc/dataset/util/arena.cc index e9dec9d86e..af4f522678 100644 --- a/mindspore/ccsrc/dataset/util/arena.cc +++ b/mindspore/ccsrc/dataset/util/arena.cc @@ -17,7 +17,6 @@ #include #include #include "dataset/util/system_pool.h" -#include "dataset/util/de_error.h" #include "./securec.h" #include "utils/log_adapter.h" @@ -79,7 +78,7 @@ void Arena::Deallocate(void *p) { auto *q = get_base_addr(p); MemHdr hdr(0, 0); MemHdr::getHdr(q, &hdr); - DS_ASSERT(hdr.sig == 0xDEADBEEF); + MS_ASSERT(hdr.sig == 0xDEADBEEF); // We are going to insert a free block back to the treap. But first, check if we can combine // with the free blocks before and after to form a bigger block. std::unique_lock lck(mux_); @@ -103,8 +102,8 @@ void Arena::Deallocate(void *p) { } Status Arena::Reallocate(void **pp, size_t old_sz, size_t new_sz) { - DS_ASSERT(pp); - DS_ASSERT(*pp); + MS_ASSERT(pp); + MS_ASSERT(*pp); uint64_t actual_size = static_cast(new_sz) + ARENA_WALL_OVERHEAD_SZ; if (actual_size > this->get_max_size()) { RETURN_STATUS_UNEXPECTED("Request size too big : " + std::to_string(new_sz)); @@ -114,7 +113,7 @@ Status Arena::Reallocate(void **pp, size_t old_sz, size_t new_sz) { auto *oldHdr = get_base_addr(oldAddr); MemHdr hdr(0, 0); MemHdr::getHdr(oldHdr, &hdr); - DS_ASSERT(hdr.sig == 0xDEADBEEF); + MS_ASSERT(hdr.sig == 0xDEADBEEF); std::unique_lock lck(mux_); if (hdr.blk_size > req_blk) { // Refresh the header with the new smaller size. @@ -239,8 +238,8 @@ bool Arena::BlockEnlarge(uint64_t *addr, uint64_t old_sz, uint64_t new_sz) { } Status Arena::FreeAndAlloc(void **pp, size_t old_sz, size_t new_sz) { - DS_ASSERT(pp); - DS_ASSERT(*pp); + MS_ASSERT(pp); + MS_ASSERT(*pp); void *p = nullptr; void *q = *pp; RETURN_IF_NOT_OK(Allocate(new_sz, &p)); diff --git a/mindspore/ccsrc/dataset/util/btree_impl.tpp b/mindspore/ccsrc/dataset/util/btree_impl.tpp index 8148a8d12c..fc3b05e3a1 100644 --- a/mindspore/ccsrc/dataset/util/btree_impl.tpp +++ b/mindspore/ccsrc/dataset/util/btree_impl.tpp @@ -61,8 +61,8 @@ typename BPlusTree::IndexRc BPlusTree::InnerNode:: template typename BPlusTree::IndexRc BPlusTree::InnerNode::Split( BPlusTree::InnerNode *to, key_type *split_key) { - DS_ASSERT(to); - DS_ASSERT(to->slotuse_ == 0); + MS_ASSERT(to); + MS_ASSERT(to->slotuse_ == 0); // It is simpler to sort first, then split. Other alternative is to move key by key to the // new node. Also we need to deal with the 'holes' after a key is moved. RETURN_IF_BAD_RC(this->Sort()); @@ -153,8 +153,8 @@ typename BPlusTree::IndexRc BPlusTree::LeafNode::S template typename BPlusTree::IndexRc BPlusTree::LeafNode::Split( BPlusTree::LeafNode *to) { - DS_ASSERT(to); - DS_ASSERT(to->slotuse_ == 0); + MS_ASSERT(to); + MS_ASSERT(to->slotuse_ == 0); // It is simpler to sort first, then split. Other alternative is to move key by key to the // new node. Also we need to deal with the 'holes' after a key is moved. RETURN_IF_BAD_RC(this->Sort()); diff --git a/mindspore/ccsrc/dataset/util/btree_iterator.tpp b/mindspore/ccsrc/dataset/util/btree_iterator.tpp index 91ba2acd7a..cffef3fa7a 100644 --- a/mindspore/ccsrc/dataset/util/btree_iterator.tpp +++ b/mindspore/ccsrc/dataset/util/btree_iterator.tpp @@ -15,7 +15,6 @@ #ifndef DATASET_UTIL_BTREE_ITERATOR_H_ #define DATASET_UTIL_BTREE_ITERATOR_H_ -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" #include "btree.h" diff --git a/mindspore/ccsrc/dataset/util/buddy.cc b/mindspore/ccsrc/dataset/util/buddy.cc index 3a14258419..540fa993d6 100644 --- a/mindspore/ccsrc/dataset/util/buddy.cc +++ b/mindspore/ccsrc/dataset/util/buddy.cc @@ -16,9 +16,9 @@ #include "dataset/util/buddy.h" #include #include -#include "dataset/util/de_error.h" #include "dataset/util/memory_pool.h" #include "dataset/util/system_pool.h" +#include "utils/log_adapter.h" #include "./securec.h" inline uint64_t BitLeftShift(uint64_t v, uint64_t n) { return (v << n); } @@ -68,7 +68,7 @@ Status BuddySpace::Alloc(const uint64_t sz, BSpaceDescriptor *desc, addr_t *p) n } addr_t BuddySpace::AllocNoLock(const uint64_t sz, BSpaceDescriptor *desc) noexcept { - DS_ASSERT(sz <= max_); + MS_ASSERT(sz <= max_); uint32_t reqSize = SizeToBlock(sz); rel_addr_t rel_addr = AllocBuddySeg(reqSize); if (rel_addr != static_cast(NOSPACE)) { @@ -84,7 +84,7 @@ addr_t BuddySpace::AllocNoLock(const uint64_t sz, BSpaceDescriptor *desc) noexce } void BuddySpace::FreeNoLock(const BSpaceDescriptor *desc) { - DS_ASSERT(desc->sig == 0XDEADBEEF); + MS_ASSERT(desc->sig == 0XDEADBEEF); rel_addr_t rel_addr = desc->addr; size_t blk_size = desc->blk_size; size_t req_size = desc->req_size; @@ -217,7 +217,7 @@ void BuddySpace::JoinBuddySeg(rel_addr_t addr, size_t blk_sz) { auto log_sz = static_cast(Log2(blk_sz)); rel_addr_t left = (buddy < addr) ? buddy : addr; rel_addr_t right = left + blk_sz; - DS_ASSERT(count_[log_sz] >= 2); + MS_ASSERT(count_[log_sz] >= 2); count_[log_sz] -= 2; SetBuddySegState(right, blk_sz, STATE::kEmpty); SetBuddySegState(left, BitLeftShift(blk_sz, 1), STATE::kFree); @@ -235,7 +235,7 @@ void BuddySpace::JoinBuddySeg(rel_addr_t addr, size_t blk_sz) { } void BuddySpace::TrimBuddySeg(rel_addr_t addr, size_t blk_sz, size_t ask_sz) { - DS_ASSERT(ask_sz < blk_sz); + MS_ASSERT(ask_sz < blk_sz); uint32_t inx = Log2(blk_sz); size_t remaining_sz = ask_sz; for (int i = inx; i > 0; i--) { @@ -256,7 +256,7 @@ void BuddySpace::TrimBuddySeg(rel_addr_t addr, size_t blk_sz, size_t ask_sz) { } void BuddySpace::UnTrimBuddySeg(rel_addr_t addr, size_t blk_sz, size_t ask_sz) { - DS_ASSERT(ask_sz < blk_sz); + MS_ASSERT(ask_sz < blk_sz); uint32_t inx = Log2(blk_sz); size_t remaining_sz = ask_sz; for (int i = inx; i > 0; i--) { @@ -268,7 +268,7 @@ void BuddySpace::UnTrimBuddySeg(rel_addr_t addr, size_t blk_sz, size_t ask_sz) { size_t sz = 0; STATE st; GetBuddySegState(addr, &sz, &st); - DS_ASSERT(sz == half_sz && st == STATE::kAlloc); + MS_ASSERT(sz == half_sz && st == STATE::kAlloc); } #endif SetBuddySegState(addr, half_sz, STATE::kFree); @@ -291,7 +291,7 @@ rel_addr_t BuddySpace::AllocBuddySeg(uint32_t req_size) noexcept { STATE st; size_t sz = 0; for (int i = start_inx; !found && i < num_lvl_; i++) { - DS_ASSERT(count_[i] >= 0); + MS_ASSERT(count_[i] >= 0); if (count_[i] == 0) { continue; } @@ -302,7 +302,7 @@ rel_addr_t BuddySpace::AllocBuddySeg(uint32_t req_size) noexcept { if (st == STATE::kFree && sz == blk_sz) { found = true; } else { - DS_ASSERT(st != STATE::kEmpty); + MS_ASSERT(st != STATE::kEmpty); ask_addr += ((sz > blk_sz) ? sz : blk_sz); } } diff --git a/mindspore/ccsrc/dataset/util/circular_pool.cc b/mindspore/ccsrc/dataset/util/circular_pool.cc index 92b169c94a..0c68dab81b 100644 --- a/mindspore/ccsrc/dataset/util/circular_pool.cc +++ b/mindspore/ccsrc/dataset/util/circular_pool.cc @@ -19,8 +19,8 @@ #include #include #include "./securec.h" -#include "dataset/util/de_error.h" #include "dataset/util/system_pool.h" +#include "utils/log_adapter.h" namespace mindspore { namespace dataset { @@ -65,7 +65,7 @@ void CircularPool::CircularIterator::Reset() { auto list_end = dp_->mem_segments_.end(); auto it = std::find_if(dp_->mem_segments_.begin(), list_end, [this](const std::shared_ptr &b) { return b.get() == cur_tail_; }); - DS_ASSERT(it != list_end); + MS_ASSERT(it != list_end); start_ = std::distance(dp_->mem_segments_.begin(), it); cur_ = start_; has_next_ = true; @@ -153,7 +153,7 @@ Status CircularPool::Reallocate(void **pp, size_t old_sz, size_t new_sz) { return (q > base && q < base + b->get_max_size()); }); lock.Unlock(); - DS_ASSERT(it != mem_segments_.end()); + MS_ASSERT(it != mem_segments_.end()); Arena *ba = it->get(); Status rc = ba->Reallocate(pp, old_sz, new_sz); if (rc.IsOutofMemory()) { diff --git a/mindspore/ccsrc/dataset/util/de_error.h b/mindspore/ccsrc/dataset/util/de_error.h deleted file mode 100644 index d4988c58db..0000000000 --- a/mindspore/ccsrc/dataset/util/de_error.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright 2019 Huawei Technologies Co., Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef DATASET_UTIL_DE_ERROR_H_ -#define DATASET_UTIL_DE_ERROR_H_ - -#ifdef DEBUG -#include -#define DS_ASSERT(f) assert(f) -#else -#define DS_ASSERT(f) ((void)0) -#endif - -#include -#include "utils/error_code.h" - -namespace mindspore { -namespace dataset { -DE_ERRORNO_DATASET(CATCH_EXCEPTION, 0, "try catch exception error"); -DE_ERRORNO_DATASET(FILE_NOT_FOUND, 1, "file is not found"); -DE_ERRORNO_DATASET(PARSE_FAILED, 2, "parse failed"); -DE_ERRORNO_DATASET(COPY_ERROR, 3, "copy data error"); -DE_ERRORNO_DATASET(BOUND_ERROR, 4, "variable overflow or lost of precision"); -DE_ERRORNO_DATASET(ALLOC_FAILED, 5, "dynamic memory allocation failed"); -} // namespace dataset -} // namespace mindspore -#endif // DATASET_UTIL_DE_ERROR_H_ diff --git a/mindspore/ccsrc/dataset/util/list.h b/mindspore/ccsrc/dataset/util/list.h index a4c15daa0e..06f26ab57c 100644 --- a/mindspore/ccsrc/dataset/util/list.h +++ b/mindspore/ccsrc/dataset/util/list.h @@ -18,7 +18,8 @@ #include #include -#include "dataset/util/de_error.h" + +#include "utils/log_adapter.h" namespace mindspore { namespace dataset { @@ -90,7 +91,7 @@ struct List { // Insert elem2 after elem1 in the list. virtual void InsertAfter(pointer elem1, pointer elem2) { - DS_ASSERT(elem1 != elem2); + MS_ASSERT(elem1 != elem2); Node &elem1_node = elem1->*node; Node &elem2_node = elem2->*node; elem2_node.prev = elem1; @@ -108,7 +109,7 @@ struct List { // Insert elem2 before elem1 in the list. virtual void InsertBefore(pointer elem1, pointer elem2) { - DS_ASSERT(elem1 != elem2); + MS_ASSERT(elem1 != elem2); Node &elem1_node = elem1->*node; Node &elem2_node = elem2->*node; elem2_node.next = elem1; diff --git a/mindspore/ccsrc/dataset/util/lock.cc b/mindspore/ccsrc/dataset/util/lock.cc index 13a43e3e84..bde9d84005 100644 --- a/mindspore/ccsrc/dataset/util/lock.cc +++ b/mindspore/ccsrc/dataset/util/lock.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "dataset/util/lock.h" -#include "dataset/util/de_error.h" +#include "utils/log_adapter.h" namespace mindspore { namespace dataset { @@ -63,7 +63,7 @@ void RWLock::Unlock() noexcept { void RWLock::Upgrade() { std::unique_lock lck(mtx_); - DS_ASSERT(status_); + MS_ASSERT(status_); if (status_ == -1) { // I am a writer already. return; @@ -81,7 +81,7 @@ void RWLock::Upgrade() { void RWLock::Downgrade() { std::unique_lock lck(mtx_); - DS_ASSERT(status_); + MS_ASSERT(status_); if (status_ == -1) { // If there are no other writers waiting, just change the status if (waiting_writers_ == 0) { @@ -111,24 +111,24 @@ SharedLock::~SharedLock() { } void SharedLock::Unlock() { - DS_ASSERT(ownlock_ == true); + MS_ASSERT(ownlock_ == true); rw_->Unlock(); ownlock_ = false; } void SharedLock::Lock() { - DS_ASSERT(ownlock_ == false); + MS_ASSERT(ownlock_ == false); rw_->LockShared(); ownlock_ = true; } void SharedLock::Upgrade() { - DS_ASSERT(ownlock_ == true); + MS_ASSERT(ownlock_ == true); rw_->Upgrade(); } void SharedLock::Downgrade() { - DS_ASSERT(ownlock_ == true); + MS_ASSERT(ownlock_ == true); rw_->Downgrade(); } @@ -146,13 +146,13 @@ UniqueLock::~UniqueLock() { } void UniqueLock::Unlock() { - DS_ASSERT(ownlock_ == true); + MS_ASSERT(ownlock_ == true); rw_->Unlock(); ownlock_ = false; } void UniqueLock::Lock() { - DS_ASSERT(ownlock_ == false); + MS_ASSERT(ownlock_ == false); rw_->LockExclusive(); ownlock_ = true; } @@ -171,13 +171,13 @@ LockGuard::~LockGuard() { } void LockGuard::Unlock() { - DS_ASSERT(own_lock_); + MS_ASSERT(own_lock_); lck_->Unlock(); own_lock_ = false; } void LockGuard::Lock() { - DS_ASSERT(own_lock_ == false); + MS_ASSERT(own_lock_ == false); lck_->Lock(); own_lock_ = true; } diff --git a/mindspore/ccsrc/dataset/util/path.cc b/mindspore/ccsrc/dataset/util/path.cc index 59e5e5232c..cdd2343799 100644 --- a/mindspore/ccsrc/dataset/util/path.cc +++ b/mindspore/ccsrc/dataset/util/path.cc @@ -23,7 +23,6 @@ #include #include "common/utils.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/queue.h b/mindspore/ccsrc/dataset/util/queue.h index 9a51565861..2d55ded736 100644 --- a/mindspore/ccsrc/dataset/util/queue.h +++ b/mindspore/ccsrc/dataset/util/queue.h @@ -25,7 +25,6 @@ #include #include "common/utils.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" #include "dataset/util/allocator.h" #include "dataset/util/services.h" diff --git a/mindspore/ccsrc/dataset/util/storage_container.cc b/mindspore/ccsrc/dataset/util/storage_container.cc index 96f5b45d0c..3a4c13e2d9 100644 --- a/mindspore/ccsrc/dataset/util/storage_container.cc +++ b/mindspore/ccsrc/dataset/util/storage_container.cc @@ -20,7 +20,6 @@ #include #include #include "common/utils.h" -#include "dataset/util/de_error.h" #include "dataset/util/path.h" #include "dataset/util/status.h" #include "utils/log_adapter.h" @@ -59,7 +58,7 @@ Status StorageContainer::Close() noexcept { } Status StorageContainer::Read(WritableSlice *dest, off64_t offset) const noexcept { - DS_ASSERT(is_open_); + MS_ASSERT(is_open_); RETURN_UNEXPECTED_IF_NULL(dest); auto sz = dest->GetSize(); #if defined(_WIN32) || defined(_WIN64) @@ -83,7 +82,7 @@ Status StorageContainer::Read(WritableSlice *dest, off64_t offset) const noexcep } Status StorageContainer::Write(const ReadableSlice &dest, off64_t offset) const noexcept { - DS_ASSERT(is_open_); + MS_ASSERT(is_open_); auto sz = dest.GetSize(); #if defined(_WIN32) || defined(_WIN64) // Doesn't seem there is any pwrite64 on mingw. diff --git a/mindspore/ccsrc/dataset/util/storage_manager.cc b/mindspore/ccsrc/dataset/util/storage_manager.cc index 8b7a6044e9..1d958576ba 100644 --- a/mindspore/ccsrc/dataset/util/storage_manager.cc +++ b/mindspore/ccsrc/dataset/util/storage_manager.cc @@ -22,7 +22,6 @@ #include "common/utils.h" #include "dataset/util/path.h" #include "dataset/util/services.h" -#include "dataset/util//de_error.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/task.cc b/mindspore/ccsrc/dataset/util/task.cc index f00f26f5ce..93db55d5f9 100644 --- a/mindspore/ccsrc/dataset/util/task.cc +++ b/mindspore/ccsrc/dataset/util/task.cc @@ -16,7 +16,6 @@ #include "dataset/util/task.h" #include "common/utils.h" #include "dataset/util/task_manager.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/task.h b/mindspore/ccsrc/dataset/util/task.h index b120ed3d7c..49eb16b182 100644 --- a/mindspore/ccsrc/dataset/util/task.h +++ b/mindspore/ccsrc/dataset/util/task.h @@ -27,7 +27,6 @@ #include #include #include -#include "dataset/util/de_error.h" #include "dataset/util/intrp_resource.h" #include "dataset/util/list.h" #include "dataset/util/memory_pool.h" diff --git a/mindspore/ccsrc/utils/error_code.h b/mindspore/ccsrc/utils/error_code.h deleted file mode 100644 index f6d70666c4..0000000000 --- a/mindspore/ccsrc/utils/error_code.h +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright 2019 Huawei Technologies Co., Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MINDSPORE_CCSRC_UTILS_LOG_DE_ERROR_CODE_H_ -#define MINDSPORE_CCSRC_UTILS_LOG_DE_ERROR_CODE_H_ - -#include -#include - -namespace DataEngineBase { -// system ID -const int SYSID_MD = 20; - -// Runtime location -enum LogRuntime { - RT_HOST = 0b01, - RT_DEVICE = 0b10, -}; - -// sub model -enum SubModuleId { - COMMON_MODULE = 0, - DATAGET_MODULE, - MINDRECORD_MODULE, -}; - -// error code type -enum ErrorCodeType { - ERROR_CODE = 0b01, - EXCEPTION_CODE = 0b10, -}; - -// error level -enum ErrorLevel { - COMMON_LEVEL = 0b000, - SUGGESTION_LEVEL = 0b001, - MINOR_LEVEL = 0b010, - MAJOR_LEVEL = 0b011, - CRITICAL_LEVEL = 0b100, -}; - -// code compose(4 byte), runtime: 2 bit, type: 2 bit, level: 3 bit, sysid: 8 bit, modid: 5 bit, value: 12 bit -#define DE_ERRORNO(runtime, type, level, sysid, submodid, name, value, desc) \ - constexpr DataEngineBase::Status name = ((0xFF & ((uint8_t)runtime)) << 30) | ((0xFF & ((uint8_t)type)) << 28) | \ - ((0xFF & ((uint8_t)level)) << 25) | ((0xFF & ((uint8_t)sysid)) << 17) | \ - ((0xFF & ((uint8_t)submodid)) << 12) | (0x0FFF & ((uint16_t)value)); \ - const DataEngineBase::ErrorNoRegisterar g_##name##_errorno(name, desc); - -// each module defines error codes using the following macros -#define DE_ERRORNO_COMMON(name, value, desc) \ - DE_ERRORNO(DataEngineBase::RT_HOST, DataEngineBase::ERROR_CODE, DataEngineBase::COMMON_LEVEL, \ - DataEngineBase::SYSID_MD, DataEngineBase::COMMON_MODULE, name, value, desc) - -#define DE_ERRORNO_DATASET(name, value, desc) \ - DE_ERRORNO(DataEngineBase::RT_HOST, DataEngineBase::ERROR_CODE, DataEngineBase::COMMON_LEVEL, \ - DataEngineBase::SYSID_MD, DataEngineBase::DATAGET_MODULE, name, value, desc) - -#define DE_ERRORNO_MINDRECORD(name, value, desc) \ - DE_ERRORNO(DataEngineBase::RT_HOST, DataEngineBase::ERROR_CODE, DataEngineBase::COMMON_LEVEL, \ - DataEngineBase::SYSID_MD, DataEngineBase::MINDRECORD_MODULE, name, value, desc) - -// get error code description -#define DE_GET_ERRORNO_STR(value) DataEngineBase::StatusFactory::Instance()->GetErrDesc(value) - -class StatusFactory { - public: - static StatusFactory *Instance() { - static StatusFactory instance; - return &instance; - } - - void RegisterErrorNo(uint32_t err, const std::string &desc) { - if (err_desc_.find(err) != err_desc_.end()) return; - err_desc_[err] = desc; - } - - std::string GetErrDesc(uint32_t err) { - auto iter_find = err_desc_.find(err); - if (iter_find == err_desc_.end()) return ""; - return iter_find->second; - } - - protected: - StatusFactory() = default; - - ~StatusFactory() = default; - - private: - std::map err_desc_; -}; - -class ErrorNoRegisterar { - public: - ErrorNoRegisterar(uint32_t err, const std::string &desc) { StatusFactory::Instance()->RegisterErrorNo(err, desc); } - - ~ErrorNoRegisterar() = default; -}; - -using Status = uint32_t; -} // namespace DataEngineBase -#endif // MINDSPORE_CCSRC_UTILS_LOG_DE_ERROR_CODE_H_ diff --git a/mindspore/mindrecord/filewriter.py b/mindspore/mindrecord/filewriter.py index 62bcc2df79..f8b5448c23 100644 --- a/mindspore/mindrecord/filewriter.py +++ b/mindspore/mindrecord/filewriter.py @@ -240,7 +240,9 @@ class FileWriter: def set_header_size(self, header_size): """ - Set the size of header. + Set the size of header which contains shard information, schema information, \ + page meta information, etc. The larger the header, the more training data \ + a single mindrecord file can store. Args: header_size (int): Size of header, between 16KB and 128MB. @@ -256,7 +258,9 @@ class FileWriter: def set_page_size(self, page_size): """ - Set the size of Page. + Set the size of page which mainly refers to the block to store training data, \ + and the training data will be split into raw page and blob page in mindrecord. \ + The larger the page, the more training data a single page can store. Args: page_size (int): Size of page, between 32KB and 256MB. diff --git a/tests/ut/cpp/dataset/arena_test.cc b/tests/ut/cpp/dataset/arena_test.cc index 0809c40ee3..e8698ad979 100644 --- a/tests/ut/cpp/dataset/arena_test.cc +++ b/tests/ut/cpp/dataset/arena_test.cc @@ -17,7 +17,6 @@ #include #include "dataset/util/arena.h" #include "common/common.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/batch_op_test.cc b/tests/ut/cpp/dataset/batch_op_test.cc index 54972af378..a04da06e4e 100644 --- a/tests/ut/cpp/dataset/batch_op_test.cc +++ b/tests/ut/cpp/dataset/batch_op_test.cc @@ -21,7 +21,6 @@ #include "common/utils.h" #include "gtest/gtest.h" #include "dataset/core/global_context.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" #include "securec.h" #include "dataset/util/status.h" diff --git a/tests/ut/cpp/dataset/btree_test.cc b/tests/ut/cpp/dataset/btree_test.cc index 75d5133e58..67b6c4e6c7 100644 --- a/tests/ut/cpp/dataset/btree_test.cc +++ b/tests/ut/cpp/dataset/btree_test.cc @@ -21,7 +21,6 @@ #include "dataset/util/task_manager.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/celeba_op_test.cc b/tests/ut/cpp/dataset/celeba_op_test.cc index 5fa50a85ff..a109739fda 100644 --- a/tests/ut/cpp/dataset/celeba_op_test.cc +++ b/tests/ut/cpp/dataset/celeba_op_test.cc @@ -23,7 +23,6 @@ #include "dataset/core/global_context.h" #include "dataset/engine/datasetops/source/celeba_op.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/cifar_op_test.cc b/tests/ut/cpp/dataset/cifar_op_test.cc index 2992bc91a8..b37b9acaee 100644 --- a/tests/ut/cpp/dataset/cifar_op_test.cc +++ b/tests/ut/cpp/dataset/cifar_op_test.cc @@ -26,7 +26,6 @@ #include "dataset/engine/datasetops/source/sampler/sampler.h" #include "dataset/engine/datasetops/source/sampler/random_sampler.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/path.h" #include "dataset/util/status.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/coco_op_test.cc b/tests/ut/cpp/dataset/coco_op_test.cc index b412b66887..bcb82f8ec1 100644 --- a/tests/ut/cpp/dataset/coco_op_test.cc +++ b/tests/ut/cpp/dataset/coco_op_test.cc @@ -30,7 +30,6 @@ #include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" #include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/path.h" #include "dataset/util/status.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/common/common.h b/tests/ut/cpp/dataset/common/common.h index 2bd5887dca..539978177a 100644 --- a/tests/ut/cpp/dataset/common/common.h +++ b/tests/ut/cpp/dataset/common/common.h @@ -16,7 +16,6 @@ #ifndef TESTS_DATASET_UT_CORE_COMMON_DE_UT_COMMON_H_ #define TESTS_DATASET_UT_CORE_COMMON_DE_UT_COMMON_H_ -#include "dataset/util/de_error.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/connector_test.cc b/tests/ut/cpp/dataset/connector_test.cc index 6d9e538ab4..7ee36cc2c0 100644 --- a/tests/ut/cpp/dataset/connector_test.cc +++ b/tests/ut/cpp/dataset/connector_test.cc @@ -140,7 +140,7 @@ Status MindDataTestConnector::Run_test_0() { auto my_conn = std::make_shared>(1, // num of producers 1, // num of consumers 10); // capacity of each queue - DS_ASSERT(my_conn != nullptr); + MS_ASSERT(my_conn != nullptr); rc = my_conn->Register(tg_.get()); RETURN_IF_NOT_OK(rc); @@ -277,7 +277,7 @@ Status MindDataTestConnector::FirstWorkerPush( int start_in, int offset) { TaskManager::FindMe()->Post(); - DS_ASSERT(my_conn != nullptr); + MS_ASSERT(my_conn != nullptr); Status rc; for (int i = start_in; i < input_.size(); i += offset) { rc = my_conn->Push(tid, input_[i]); @@ -294,7 +294,7 @@ Status MindDataTestConnector::MidWorkerJob( int tid, std::shared_ptr > from_conn, std::shared_ptr > to_conn) { - DS_ASSERT((from_conn != nullptr) && (to_conn != nullptr)); + MS_ASSERT((from_conn != nullptr) && (to_conn != nullptr)); Status rc; TaskManager::FindMe()->Post(); while (1) { diff --git a/tests/ut/cpp/dataset/duplicate_op_test.cc b/tests/ut/cpp/dataset/duplicate_op_test.cc index 6c9c00a30e..b7ce32f655 100644 --- a/tests/ut/cpp/dataset/duplicate_op_test.cc +++ b/tests/ut/cpp/dataset/duplicate_op_test.cc @@ -17,7 +17,6 @@ #include "common/common.h" #include "gtest/gtest.h" #include "dataset/core/tensor.h" -#include "dataset/util/de_error.h" #include "dataset/kernels/data/duplicate_op.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/execution_tree_test.cc b/tests/ut/cpp/dataset/execution_tree_test.cc index 03072c0477..529644331a 100644 --- a/tests/ut/cpp/dataset/execution_tree_test.cc +++ b/tests/ut/cpp/dataset/execution_tree_test.cc @@ -21,7 +21,6 @@ #include "dataset/engine/datasetops/source/tf_reader_op.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/global_context_test.cc b/tests/ut/cpp/dataset/global_context_test.cc index 1bcd7d938e..bb75d941aa 100644 --- a/tests/ut/cpp/dataset/global_context_test.cc +++ b/tests/ut/cpp/dataset/global_context_test.cc @@ -15,7 +15,6 @@ */ #include "dataset/core/global_context.h" #include "common/common.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/image_folder_op_test.cc b/tests/ut/cpp/dataset/image_folder_op_test.cc index d143a9e06f..576c5abbfc 100644 --- a/tests/ut/cpp/dataset/image_folder_op_test.cc +++ b/tests/ut/cpp/dataset/image_folder_op_test.cc @@ -29,7 +29,6 @@ #include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" #include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/path.h" #include "dataset/util/status.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/interrupt_test.cc b/tests/ut/cpp/dataset/interrupt_test.cc index bde9351ca6..7ab608b9ae 100644 --- a/tests/ut/cpp/dataset/interrupt_test.cc +++ b/tests/ut/cpp/dataset/interrupt_test.cc @@ -14,7 +14,6 @@ * limitations under the License. */ #include "common/common.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" #include "dataset/util/services.h" #include "dataset/util/intrp_service.h" diff --git a/tests/ut/cpp/dataset/manifest_op_test.cc b/tests/ut/cpp/dataset/manifest_op_test.cc index 35773f6bbb..6317a6a345 100644 --- a/tests/ut/cpp/dataset/manifest_op_test.cc +++ b/tests/ut/cpp/dataset/manifest_op_test.cc @@ -25,7 +25,6 @@ #include "dataset/engine/datasetops/source/manifest_op.h" #include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/mask_test.cc b/tests/ut/cpp/dataset/mask_test.cc index eb8a49aa36..9ff5f51fce 100644 --- a/tests/ut/cpp/dataset/mask_test.cc +++ b/tests/ut/cpp/dataset/mask_test.cc @@ -22,7 +22,6 @@ #include "dataset/core/tensor.h" #include "dataset/core/cv_tensor.h" #include "dataset/core/data_type.h" -#include "dataset/util/de_error.h" #include "dataset/kernels/data/mask_op.h" #include "dataset/kernels/data/data_utils.h" diff --git a/tests/ut/cpp/dataset/mnist_op_test.cc b/tests/ut/cpp/dataset/mnist_op_test.cc index 26b7335ad3..da78cb6f7f 100644 --- a/tests/ut/cpp/dataset/mnist_op_test.cc +++ b/tests/ut/cpp/dataset/mnist_op_test.cc @@ -30,7 +30,6 @@ #include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" #include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/path.h" #include "dataset/util/status.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/path_test.cc b/tests/ut/cpp/dataset/path_test.cc index 3839d659aa..4cf3b17968 100644 --- a/tests/ut/cpp/dataset/path_test.cc +++ b/tests/ut/cpp/dataset/path_test.cc @@ -16,7 +16,6 @@ #include "dataset/util/path.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" #include diff --git a/tests/ut/cpp/dataset/stand_alone_samplers_test.cc b/tests/ut/cpp/dataset/stand_alone_samplers_test.cc index ebfba3dde6..dfe15a8f15 100644 --- a/tests/ut/cpp/dataset/stand_alone_samplers_test.cc +++ b/tests/ut/cpp/dataset/stand_alone_samplers_test.cc @@ -21,7 +21,6 @@ #include "dataset/engine/datasetops/source/sampler/random_sampler.h" #include "dataset/engine/datasetops/source/sampler/sampler.h" #include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/status_test.cc b/tests/ut/cpp/dataset/status_test.cc index 30bbd1e909..c64a86b8ba 100644 --- a/tests/ut/cpp/dataset/status_test.cc +++ b/tests/ut/cpp/dataset/status_test.cc @@ -16,7 +16,6 @@ #include "dataset/util/status.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tensor_string_test.cc b/tests/ut/cpp/dataset/tensor_string_test.cc index 2480809681..43b235304d 100644 --- a/tests/ut/cpp/dataset/tensor_string_test.cc +++ b/tests/ut/cpp/dataset/tensor_string_test.cc @@ -22,7 +22,6 @@ #include "dataset/core/tensor.h" #include "dataset/core/cv_tensor.h" #include "dataset/core/data_type.h" -#include "dataset/util/de_error.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tensor_test.cc b/tests/ut/cpp/dataset/tensor_test.cc index 1e75880a35..1aa3cad2fa 100644 --- a/tests/ut/cpp/dataset/tensor_test.cc +++ b/tests/ut/cpp/dataset/tensor_test.cc @@ -22,7 +22,6 @@ #include "dataset/core/tensor.h" #include "dataset/core/cv_tensor.h" #include "dataset/core/data_type.h" -#include "dataset/util/de_error.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/treap_test.cc b/tests/ut/cpp/dataset/treap_test.cc index c92bea6bf8..b454ab108e 100644 --- a/tests/ut/cpp/dataset/treap_test.cc +++ b/tests/ut/cpp/dataset/treap_test.cc @@ -16,7 +16,6 @@ #include "dataset/util/treap.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/type_cast_op_test.cc b/tests/ut/cpp/dataset/type_cast_op_test.cc index f5fa035579..543eb71637 100644 --- a/tests/ut/cpp/dataset/type_cast_op_test.cc +++ b/tests/ut/cpp/dataset/type_cast_op_test.cc @@ -25,7 +25,6 @@ #include "dataset/core/pybind_support.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/util/de_error.h" #define MAX_INT_PRECISION 16777216 // float int precision is 16777216 using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/voc_op_test.cc b/tests/ut/cpp/dataset/voc_op_test.cc index be00e17b0e..05dc28b487 100644 --- a/tests/ut/cpp/dataset/voc_op_test.cc +++ b/tests/ut/cpp/dataset/voc_op_test.cc @@ -30,7 +30,6 @@ #include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" #include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" #include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/de_error.h" #include "dataset/util/path.h" #include "dataset/util/status.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/zip_op_test.cc b/tests/ut/cpp/dataset/zip_op_test.cc index f8f8fe89db..b387341398 100644 --- a/tests/ut/cpp/dataset/zip_op_test.cc +++ b/tests/ut/cpp/dataset/zip_op_test.cc @@ -32,7 +32,6 @@ #include "dataset/engine/data_buffer.h" #include "gtest/gtest.h" #include "dataset/core/global_context.h" -#include "dataset/util/de_error.h" #include "utils/log_adapter.h" namespace common = mindspore::common;