diff --git a/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc index 6bb9e5967b..7edd85c7c3 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc @@ -134,6 +134,20 @@ void ExecutionTree::PrintNode(std::ostream &out, const std::shared_ptr 8) + cv::setNumThreads(8); + else + cv::setNumThreads(thread_num); +#endif +#endif // Tree must be built and prepared before it can be launched! if (tree_state_ != kDeTStateReady) { std::string err_msg = diff --git a/mindspore/ccsrc/minddata/dataset/engine/execution_tree.h b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.h index 3e88a9fe7f..61bddbf4d4 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/execution_tree.h +++ b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.h @@ -21,6 +21,12 @@ #include #include #include +#ifndef ENABLE_ANDROID +#if !defined(_WIN32) && !defined(_WIN64) +#include +#include +#endif +#endif #include "minddata/dataset/engine/datasetops/dataset_op.h" #include "minddata/dataset/util/status.h" #include "mindspore/ccsrc/minddata/dataset/engine/perf/profiling.h" diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc index a09a1612bd..ab95b82807 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc @@ -97,8 +97,6 @@ Status Resize(const std::shared_ptr &input, std::shared_ptr *out if (input_cv->Rank() != 3 && input_cv->Rank() != 2) { RETURN_STATUS_UNEXPECTED("Input Tensor is not in shape of or "); } - // OpenCv lanuch too many threads. - cv::setNumThreads(8); cv::Mat in_image = input_cv->mat(); // resize image too large or too small if (output_height == 0 || output_height > in_image.rows * 1000 || output_width == 0 ||