misc issues

mindspore/ccsrc/minddata/dataset/api/datasets.cc

@@ -26,8 +26,8 @@
 #include "minddata/dataset/include/transforms.h"
 #include "minddata/dataset/util/path.h"
 #include "minddata/dataset/util/status.h"
-#include "minddata/dataset/include/type_id.h"
 #include "minddata/dataset/core/client.h"
+#include "minddata/dataset/core/type_id.h"
 #include "minddata/dataset/engine/consumers/tree_consumer.h"
 
 #include "minddata/dataset/kernels/c_func_op.h"

mindspore/ccsrc/minddata/dataset/api/execute.cc

@@ -22,7 +22,7 @@
 #include "minddata/dataset/core/device_tensor.h"
 #include "minddata/dataset/core/tensor_row.h"
 #include "minddata/dataset/core/tensor.h"
-#include "minddata/dataset/include/type_id.h"
+#include "minddata/dataset/core/type_id.h"
 #include "minddata/dataset/kernels/ir/tensor_operation.h"
 #include "minddata/dataset/kernels/tensor_op.h"
 #ifndef ENABLE_ANDROID

mindspore/ccsrc/minddata/dataset/core/de_tensor.cc

@@ -18,7 +18,7 @@
 #include "minddata/dataset/core/device_tensor.h"
 #include "minddata/dataset/include/constants.h"
 #include "minddata/dataset/core/data_type.h"
-#include "minddata/dataset/include/type_id.h"
+#include "minddata/dataset/core/type_id.h"
 #include "mindspore/core/ir/dtype/type_id.h"
 #include "utils/hashing.h"
 #ifndef ENABLE_ANDROID

mindspore/ccsrc/minddata/dataset/core/tensor.cc

@@ -24,7 +24,7 @@
 #include <utility>
 #include <functional>
 
-#include "minddata/dataset/include/type_id.h"
+#include "minddata/dataset/core/type_id.h"
 
 #include "utils/ms_utils.h"
 #include "minddata/dataset/include/constants.h"

mindspore/ccsrc/minddata/dataset/include/datasets.h

@@ -36,8 +36,6 @@
 #include "minddata/dataset/include/json_fwd.hpp"
 #include "minddata/dataset/include/samplers.h"
 #include "minddata/dataset/include/text.h"
-#include "minddata/dataset/include/type_id.h"
-#include "minddata/dataset/engine/consumers/pull_based_tree_consumer.h"
 
 namespace mindspore {
 namespace dataset {
@@ -53,7 +51,6 @@ class DatasetCache;
 class DatasetNode;
 
 class Iterator;
-class PullBasedIteratorConsumer;
 
 class TensorOperation;
 class SchemaObj;

tests/ut/cpp/dataset/common/common.h

@@ -20,7 +20,7 @@
 #include "include/api/status.h"
 #include "include/api/types.h"
 #include "minddata/dataset/core/tensor_shape.h"
-#include "minddata/dataset/include/type_id.h"
+#include "minddata/dataset/core/type_id.h"
 #include "utils/log_adapter.h"
 
 using mindspore::Status;