From 6ace46d516bdf263ae112d41362f49e25ffa267f Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 30 Jul 2020 22:12:55 -0400 Subject: [PATCH] Added preprocessor, cmake directory pending --- mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc | 6 ++++++ mindspore/ccsrc/minddata/dataset/engine/opt/pass.h | 4 ++++ .../dataset/engine/opt/pre/cache_transform_pass.cc | 11 +++++++++++ .../dataset/engine/opt/pre/cache_transform_pass.h | 5 +++++ .../minddata/dataset/engine/opt/util/printer_pass.cc | 3 ++- .../minddata/dataset/engine/opt/util/printer_pass.h | 2 ++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc index 07ee10307a5..4a2041e63d0 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc @@ -34,10 +34,14 @@ #include "minddata/dataset/engine/datasetops/source/cifar_op.h" #include "minddata/dataset/engine/datasetops/source/coco_op.h" #include "minddata/dataset/engine/datasetops/source/manifest_op.h" +#ifndef ENABLE_ANDROID #include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" +#endif #include "minddata/dataset/engine/datasetops/source/mnist_op.h" #include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#ifndef ENABLE_ANDROID #include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" +#endif #include "minddata/dataset/engine/datasetops/source/voc_op.h" #ifdef ENABLE_PYTHON #include "minddata/dataset/engine/datasetops/filter_op.h" @@ -136,6 +140,7 @@ Status NodePass::RunOnNode(std::shared_ptr node, bool *modified) { return RunOnNode(std::static_pointer_cast(node), modified); } +#ifndef ENABLE_ANDROID Status NodePass::RunOnNode(std::shared_ptr node, bool *modified) { // Fallback to base class visitor by default return RunOnNode(std::static_pointer_cast(node), modified); @@ -145,6 +150,7 @@ Status NodePass::RunOnNode(std::shared_ptr node, bool *modified) { // Fallback to base class visitor by default return RunOnNode(std::static_pointer_cast(node), modified); } +#endif #ifdef ENABLE_PYTHON Status NodePass::RunOnNode(std::shared_ptr node, bool *modified) { diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.h index f736c46229f..f154b6c2054 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.h @@ -37,9 +37,11 @@ class SkipOp; class ShuffleOp; +#ifndef ENABLE_ANDROID class MindRecordOp; class TFReaderOp; +#endif #ifdef ENABLE_PYTHON class FilterOp; @@ -158,9 +160,11 @@ class NodePass : public Pass { virtual Status RunOnNode(std::shared_ptr node, bool *modified); +#ifndef ENABLE_ANDROID virtual Status RunOnNode(std::shared_ptr node, bool *modified); virtual Status RunOnNode(std::shared_ptr node, bool *modified); +#endif #ifdef ENABLE_PYTHON virtual Status RunOnNode(std::shared_ptr node, bool *modified); diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc index 1667be4e960..8a463aecfa9 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc @@ -25,10 +25,17 @@ #include "minddata/dataset/engine/datasetops/source/cifar_op.h" #include "minddata/dataset/engine/datasetops/source/coco_op.h" #include "minddata/dataset/engine/datasetops/source/image_folder_op.h" + +#ifndef ENABLE_ANDROID #include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" +#endif + #include "minddata/dataset/engine/datasetops/source/mnist_op.h" #include "minddata/dataset/engine/datasetops/source/random_data_op.h" + +#ifndef ENABLE_ANDROID #include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" +#endif #ifdef ENABLE_PYTHON #include "minddata/dataset/engine/datasetops/source/generator_op.h" @@ -123,6 +130,7 @@ Status CacheTransformPass::CachePass::NonMappableCacheLeafSetup(std::shared_ptr< return Status::OK(); } +#ifndef ENABLE_ANDROID // Perform leaf node cache transform identification Status CacheTransformPass::CachePass::RunOnNode(std::shared_ptr node, bool *modified) { if (is_caching_) { @@ -132,6 +140,7 @@ Status CacheTransformPass::CachePass::RunOnNode(std::shared_ptr node } return NonMappableCacheLeafSetup(std::static_pointer_cast(node)); } +#endif // Perform leaf node cache transform identification Status CacheTransformPass::CachePass::RunOnNode(std::shared_ptr node, bool *modified) { @@ -163,10 +172,12 @@ Status CacheTransformPass::CachePass::RunOnNode(std::shared_ptr node, return MappableCacheLeafSetup(std::static_pointer_cast(node)); } +#ifndef ENABLE_ANDROID // Perform leaf node cache transform identification Status CacheTransformPass::CachePass::RunOnNode(std::shared_ptr node, bool *modified) { return MappableCacheLeafSetup(std::static_pointer_cast(node)); } +#endif #ifdef ENABLE_PYTHON // Perform leaf node cache transform identification diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h index d16334f3bb9..970461d48f2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h @@ -58,11 +58,14 @@ class CacheTransformPass : public TreePass { /// \return Status The error code return Status RunOnNode(std::shared_ptr node, bool *modified) override; +#ifndef ENABLE_ANDROID + /// \brief Perform leaf node cache tranform identifications /// \param[in] node The node being visited /// \param[inout] modified Indicator if the node was changed at all /// \return Status The error code return Status RunOnNode(std::shared_ptr node, bool *modified) override; +#endif /// \brief Perform leaf node cache tranform identifications /// \param[in] node The node being visited @@ -120,11 +123,13 @@ class CacheTransformPass : public TreePass { /// \return Status The error code return Status RunOnNode(std::shared_ptr node, bool *modified) override; +#ifndef ENABLE_ANDROID /// \brief Perform leaf node cache tranform identifications /// \param[in] node The node being visited /// \param[inout] modified Indicator if the node was changed at all /// \return Status The error code return Status RunOnNode(std::shared_ptr node, bool *modified) override; +#endif /// \brief Getter std::vector, std::shared_ptr>> cache_pairs() { return cache_pairs_; } diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc index eb74d8fcc35..02f7bf8dfaa 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc @@ -60,7 +60,7 @@ Status PrinterPass::RunOnNode(std::shared_ptr node, bool *modified) { std::cout << "Visiting ShuffleOp" << '\n'; return Status::OK(); } - +#ifndef ENABLE_ANDROID Status PrinterPass::RunOnNode(std::shared_ptr node, bool *modified) { *modified = false; std::cout << "Visiting MindRecordOp" << '\n'; @@ -72,6 +72,7 @@ Status PrinterPass::RunOnNode(std::shared_ptr node, bool *modified) std::cout << "Visiting TFReaderOp" << '\n'; return Status::OK(); } +#endif #ifdef ENABLE_PYTHON Status PrinterPass::RunOnNode(std::shared_ptr node, bool *modified) { diff --git a/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h index bc84c0bd90b..31b444cebd4 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h @@ -39,9 +39,11 @@ class PrinterPass : public NodePass { Status RunOnNode(std::shared_ptr node, bool *modified) override; +#ifndef ENABLE_ANDROID Status RunOnNode(std::shared_ptr node, bool *modified) override; Status RunOnNode(std::shared_ptr node, bool *modified) override; +#endif #ifdef ENABLE_PYTHON Status RunOnNode(std::shared_ptr node, bool *modified) override;