From 4be0ffb9ba9c4afd01b771eae70c3be9307f92ae Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 16 Mar 2021 16:51:10 -0400 Subject: [PATCH] removing type_id.h from header files --- .../ccsrc/minddata/dataset/api/datasets.cc | 3 + .../dataset/engine/ir/datasetops/bindings.cc | 1 + .../dataset/engine/ir/execute/bindings.cc | 1 + .../dataset/engine/ir/schema/bindings.cc | 3 +- .../dataset/api/python/pybind_conversion.h | 5 +- .../dataset/engine/opt/pre/deep_copy_pass.cc | 1 + .../engine/opt/pre/input_validation_pass.cc | 1 + .../ccsrc/minddata/dataset/include/datasets.h | 2 + .../ccsrc/minddata/dataset/include/type_id.h | 92 +++++++++++++++++++ tests/ut/cpp/dataset/common/common.h | 1 + 10 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 mindspore/ccsrc/minddata/dataset/include/type_id.h diff --git a/mindspore/ccsrc/minddata/dataset/api/datasets.cc b/mindspore/ccsrc/minddata/dataset/api/datasets.cc index 90e937c59a..180eba7507 100644 --- a/mindspore/ccsrc/minddata/dataset/api/datasets.cc +++ b/mindspore/ccsrc/minddata/dataset/api/datasets.cc @@ -19,9 +19,11 @@ #include #include #include +#include #include "minddata/dataset/core/tensor.h" #include "minddata/dataset/engine/runtime_context.h" +#include "minddata/dataset/include/iterator.h" #include "minddata/dataset/include/samplers.h" #include "minddata/dataset/include/transforms.h" #include "minddata/dataset/util/path.h" @@ -29,6 +31,7 @@ #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/type_id.h" #include "minddata/dataset/engine/consumers/tree_consumer.h" +#include "minddata/dataset/engine/consumers/pull_based_tree_consumer.h" #include "minddata/dataset/kernels/c_func_op.h" #include "minddata/dataset/kernels/tensor_op.h" diff --git a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/datasetops/bindings.cc b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/datasetops/bindings.cc index 2b47a54d7c..d0aeb3f420 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/datasetops/bindings.cc +++ b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/datasetops/bindings.cc @@ -51,6 +51,7 @@ #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/type_id.h" #include "minddata/dataset/util/path.h" #include "minddata/dataset/util/random.h" #include "minddata/dataset/util/services.h" diff --git a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/execute/bindings.cc b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/execute/bindings.cc index 5d60d350db..c32b5d3c39 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/execute/bindings.cc +++ b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/execute/bindings.cc @@ -17,6 +17,7 @@ #include "minddata/dataset/api/python/pybind_conversion.h" #include "minddata/dataset/api/python/pybind_register.h" +#include "minddata/dataset/core/type_id.h" #include "minddata/dataset/include/execute.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/schema/bindings.cc b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/schema/bindings.cc index 18691b9d3b..6a3c75bd31 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/schema/bindings.cc +++ b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/engine/ir/schema/bindings.cc @@ -19,8 +19,9 @@ #include "minddata/dataset/api/python/pybind_register.h" #include "minddata/dataset/core/global_context.h" -#include "minddata/dataset/include/constants.h" #include "minddata/dataset/api/python/pybind_conversion.h" +#include "minddata/dataset/core/type_id.h" +#include "minddata/dataset/include/constants.h" #include "minddata/dataset/include/datasets.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h b/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h index a707ad241c..41ff949cdd 100644 --- a/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h +++ b/mindspore/ccsrc/minddata/dataset/api/python/pybind_conversion.h @@ -28,11 +28,12 @@ #include "pybind11/pybind11.h" #include "pybind11/stl.h" #include "pybind11/stl_bind.h" -#include "minddata/dataset/include/datasets.h" -#include "minddata/dataset/include/samplers.h" #include "minddata/dataset/api/python/pybind_register.h" +#include "minddata/dataset/core/type_id.h" #include "minddata/dataset/engine/ir/cache/pre_built_dataset_cache.h" #include "minddata/dataset/engine/ir/datasetops/source/csv_node.h" +#include "minddata/dataset/include/datasets.h" +#include "minddata/dataset/include/samplers.h" #include "minddata/dataset/kernels/ir/data/transforms_ir.h" #include "minddata/dataset/kernels/py_func_op.h" namespace py = pybind11; diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc index 459bb1d5fe..e6cf91094d 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/deep_copy_pass.cc @@ -15,6 +15,7 @@ */ #include +#include #include "minddata/dataset/include/datasets.h" #include "minddata/dataset/engine/opt/pre/deep_copy_pass.h" #include "minddata/dataset/engine/ir/datasetops/root_node.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc index 3da5b15076..605aaf696f 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/input_validation_pass.cc @@ -15,6 +15,7 @@ */ #include +#include #include "minddata/dataset/include/datasets.h" #include "minddata/dataset/engine/opt/pre/input_validation_pass.h" diff --git a/mindspore/ccsrc/minddata/dataset/include/datasets.h b/mindspore/ccsrc/minddata/dataset/include/datasets.h index 6bffdd6a9c..4803991ee5 100644 --- a/mindspore/ccsrc/minddata/dataset/include/datasets.h +++ b/mindspore/ccsrc/minddata/dataset/include/datasets.h @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -51,6 +52,7 @@ class DatasetCache; class DatasetNode; class Iterator; +class PullBasedIterator; class TensorOperation; class SchemaObj; diff --git a/mindspore/ccsrc/minddata/dataset/include/type_id.h b/mindspore/ccsrc/minddata/dataset/include/type_id.h new file mode 100644 index 0000000000..ef077a832d --- /dev/null +++ b/mindspore/ccsrc/minddata/dataset/include/type_id.h @@ -0,0 +1,92 @@ +/** + * Copyright 2020 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_MINDDATA_DATASET_INCLUDE_TYPEID_H_ +#define MINDSPORE_CCSRC_MINDDATA_DATASET_INCLUDE_TYPEID_H_ + +#include "mindspore/core/ir/dtype/type_id.h" +#include "minddata/dataset/core/data_type.h" + +namespace mindspore { +namespace dataset { +inline dataset::DataType MSTypeToDEType(TypeId data_type) { + switch (data_type) { + case kNumberTypeBool: + return dataset::DataType(dataset::DataType::DE_BOOL); + case kNumberTypeInt8: + return dataset::DataType(dataset::DataType::DE_INT8); + case kNumberTypeUInt8: + return dataset::DataType(dataset::DataType::DE_UINT8); + case kNumberTypeInt16: + return dataset::DataType(dataset::DataType::DE_INT16); + case kNumberTypeUInt16: + return dataset::DataType(dataset::DataType::DE_UINT16); + case kNumberTypeInt32: + return dataset::DataType(dataset::DataType::DE_INT32); + case kNumberTypeUInt32: + return dataset::DataType(dataset::DataType::DE_UINT32); + case kNumberTypeInt64: + return dataset::DataType(dataset::DataType::DE_INT64); + case kNumberTypeUInt64: + return dataset::DataType(dataset::DataType::DE_UINT64); + case kNumberTypeFloat16: + return dataset::DataType(dataset::DataType::DE_FLOAT16); + case kNumberTypeFloat32: + return dataset::DataType(dataset::DataType::DE_FLOAT32); + case kNumberTypeFloat64: + return dataset::DataType(dataset::DataType::DE_FLOAT64); + case kObjectTypeString: + return dataset::DataType(dataset::DataType::DE_STRING); + default: + return dataset::DataType(dataset::DataType::DE_UNKNOWN); + } +} + +inline TypeId DETypeToMSType(dataset::DataType data_type) { + switch (data_type.value()) { + case dataset::DataType::DE_BOOL: + return mindspore::TypeId::kNumberTypeBool; + case dataset::DataType::DE_INT8: + return mindspore::TypeId::kNumberTypeInt8; + case dataset::DataType::DE_UINT8: + return mindspore::TypeId::kNumberTypeUInt8; + case dataset::DataType::DE_INT16: + return mindspore::TypeId::kNumberTypeInt16; + case dataset::DataType::DE_UINT16: + return mindspore::TypeId::kNumberTypeUInt16; + case dataset::DataType::DE_INT32: + return mindspore::TypeId::kNumberTypeInt32; + case dataset::DataType::DE_UINT32: + return mindspore::TypeId::kNumberTypeUInt32; + case dataset::DataType::DE_INT64: + return mindspore::TypeId::kNumberTypeInt64; + case dataset::DataType::DE_UINT64: + return mindspore::TypeId::kNumberTypeUInt64; + case dataset::DataType::DE_FLOAT16: + return mindspore::TypeId::kNumberTypeFloat16; + case dataset::DataType::DE_FLOAT32: + return mindspore::TypeId::kNumberTypeFloat32; + case dataset::DataType::DE_FLOAT64: + return mindspore::TypeId::kNumberTypeFloat64; + case dataset::DataType::DE_STRING: + return mindspore::TypeId::kObjectTypeString; + default: + return kTypeUnknown; + } +} +} // namespace dataset +} // namespace mindspore + +#endif // MINDSPORE_CCSRC_MINDDATA_DATASET_INCLUDE_TYPEID_H_ diff --git a/tests/ut/cpp/dataset/common/common.h b/tests/ut/cpp/dataset/common/common.h index d99d17b13e..22e8bf3e73 100644 --- a/tests/ut/cpp/dataset/common/common.h +++ b/tests/ut/cpp/dataset/common/common.h @@ -21,6 +21,7 @@ #include "include/api/types.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/core/type_id.h" +#include "minddata/dataset/core/de_tensor.h" #include "utils/log_adapter.h" using mindspore::Status;