From e0a5364f53bb6b9868268623a1b7aa9858296041 Mon Sep 17 00:00:00 2001 From: jiaopu Date: Thu, 9 Apr 2020 19:48:31 +0800 Subject: [PATCH] move sth from device_info to backends/mlu --- lite/api/cxx_api_impl.cc | 12 ++-- lite/backends/mlu/target_wrapper.cc | 48 ++++++++++++++ lite/backends/mlu/target_wrapper.h | 22 +++++++ lite/core/context.h | 6 +- lite/core/device_info.cc | 92 +++++++++++++-------------- lite/core/device_info.h | 44 ++++++------- lite/core/mir/mlu_postprocess_pass.cc | 4 +- lite/kernels/mlu/bridges/conv_op.cc | 6 +- 8 files changed, 153 insertions(+), 81 deletions(-) diff --git a/lite/api/cxx_api_impl.cc b/lite/api/cxx_api_impl.cc index fbf487e006..d4da1c429b 100644 --- a/lite/api/cxx_api_impl.cc +++ b/lite/api/cxx_api_impl.cc @@ -36,12 +36,12 @@ void CxxPaddleApiImpl::Init(const lite_api::CxxConfig &config) { #endif #ifdef LITE_WITH_MLU Env::Init(); - lite::DeviceInfo::Global().SetMLURunMode(config.mlu_core_version(), - config.mlu_core_number(), - config.mlu_use_first_conv(), - config.mlu_first_conv_mean(), - config.mlu_first_conv_std(), - config.mlu_input_layout()); + lite::TargetWrapperMlu::SetMLURunMode(config.mlu_core_version(), + config.mlu_core_number(), + config.mlu_use_first_conv(), + config.mlu_first_conv_mean(), + config.mlu_first_conv_std(), + config.mlu_input_layout()); #endif // LITE_WITH_MLU auto places = config.valid_places(); std::vector passes{}; diff --git a/lite/backends/mlu/target_wrapper.cc b/lite/backends/mlu/target_wrapper.cc index 2385f69246..f5c7eece48 100644 --- a/lite/backends/mlu/target_wrapper.cc +++ b/lite/backends/mlu/target_wrapper.cc @@ -36,6 +36,13 @@ void cnrtMemcpyDtoH(void* dst, const void* src, size_t size) { } // namespace mlu +thread_local cnmlCoreVersion_t TargetWrapperMlu::mlu_core_version_{CNML_MLU270}; +thread_local int TargetWrapperMlu::mlu_core_number_{1}; +thread_local bool TargetWrapperMlu::use_first_conv_{false}; +thread_local std::vector TargetWrapperMlu::mean_vec_; +thread_local std::vector TargetWrapperMlu::std_vec_; +thread_local DataLayoutType TargetWrapperMlu::input_layout_{DATALAYOUT(kNCHW)}; + size_t TargetWrapperMlu::num_devices() { uint32_t dev_count = 0; CNRT_CALL(cnrtGetDeviceCount(&dev_count)) << " cnrt get device count failed"; @@ -77,6 +84,47 @@ void TargetWrapperMlu::MemcpySync(void* dst, LOG(FATAL) << "Unsupported IoDirection" << static_cast(dir); } } +void TargetWrapperMlu::SetMLURunMode(lite_api::MLUCoreVersion core_version, + int core_number, + bool use_first_conv, + const std::vector& mean_vec, + const std::vector& std_vec, + DataLayoutType input_layout) { + switch (core_version) { + case (lite_api::MLUCoreVersion::MLU_220): + mlu_core_version_ = CNML_MLU220; + break; + case (lite_api::MLUCoreVersion::MLU_270): + mlu_core_version_ = CNML_MLU270; + break; + default: + mlu_core_version_ = CNML_MLU270; + break; + } + mlu_core_number_ = core_number; + use_first_conv_ = use_first_conv; + mean_vec_ = mean_vec; + std_vec_ = std_vec; + input_layout_ = input_layout; +} + +cnmlCoreVersion_t TargetWrapperMlu::MLUCoreVersion() { + return mlu_core_version_; +} + +int TargetWrapperMlu::MLUCoreNumber() { return mlu_core_number_; } + +bool TargetWrapperMlu::UseFirstConv() { return use_first_conv_; } + +// const std::vector& TargetWrapperMlu::MeanVec() const { return +// mean_vec_; } +const std::vector& TargetWrapperMlu::MeanVec() { return mean_vec_; } + +// const std::vector& TargetWrapperMlu::StdVec() const { return std_vec_; +// } +const std::vector& TargetWrapperMlu::StdVec() { return std_vec_; } + +DataLayoutType TargetWrapperMlu::InputLayout() { return input_layout_; } // void TargetWrapperMlu::MemcpyAsync(void* dst, // const void* src, diff --git a/lite/backends/mlu/target_wrapper.h b/lite/backends/mlu/target_wrapper.h index 2d9e10806f..c1a35a9aa2 100644 --- a/lite/backends/mlu/target_wrapper.h +++ b/lite/backends/mlu/target_wrapper.h @@ -13,6 +13,7 @@ // limitations under the License. #pragma once +#include #include "lite/backends/mlu/mlu_utils.h" #include "lite/core/target_wrapper.h" @@ -43,11 +44,32 @@ class TargetWrapper { const void* src, size_t size, IoDirection dir); + static void SetMLURunMode(lite_api::MLUCoreVersion core_version, + int core_number, + bool use_first_conv, + const std::vector& mean_vec, + const std::vector& std_vec, + DataLayoutType input_layout); + static cnmlCoreVersion_t MLUCoreVersion(); + static int MLUCoreNumber(); + static bool UseFirstConv(); + // static const std::vector& MeanVec() const; + // static const std::vector& StdVec() const; + static const std::vector& MeanVec(); + static const std::vector& StdVec(); + static DataLayoutType InputLayout(); // static void MemcpyAsync(void* dst, // const void* src, // size_t size, // IoDirection dir, // const queue_t& queue); + private: + static thread_local cnmlCoreVersion_t mlu_core_version_; + static thread_local int mlu_core_number_; + static thread_local bool use_first_conv_; + static thread_local std::vector mean_vec_; + static thread_local std::vector std_vec_; + static thread_local DataLayoutType input_layout_; }; } // namespace lite diff --git a/lite/core/context.h b/lite/core/context.h index cdab4e473b..6b826fe46f 100644 --- a/lite/core/context.h +++ b/lite/core/context.h @@ -227,10 +227,12 @@ class Context { void SetIoQueue(cnrtQueue_t queue) { io_queue_ = queue; } cnmlCoreVersion_t MLUCoreVersion() { - return DeviceInfo::Global().MLUCoreVersion(); + return paddle::lite::TargetWrapperMlu::MLUCoreVersion(); } - int MLUCoreNumber() { return DeviceInfo::Global().MLUCoreNumber(); } + int MLUCoreNumber() { + return paddle::lite::TargetWrapperMlu::MLUCoreNumber(); + } u32_t affinity() { return affinity_; } diff --git a/lite/core/device_info.cc b/lite/core/device_info.cc index 29ac96ed74..6038343689 100644 --- a/lite/core/device_info.cc +++ b/lite/core/device_info.cc @@ -66,14 +66,14 @@ thread_local std::vector DeviceInfo::active_ids_; thread_local TensorLite DeviceInfo::workspace_; thread_local int64_t DeviceInfo::count_ = 0; -#ifdef LITE_WITH_MLU -thread_local cnmlCoreVersion_t DeviceInfo::mlu_core_version_{CNML_MLU270}; -thread_local int DeviceInfo::mlu_core_number_{1}; -thread_local bool DeviceInfo::use_first_conv_{false}; -thread_local std::vector DeviceInfo::mean_vec_; -thread_local std::vector DeviceInfo::std_vec_; -thread_local DataLayoutType DeviceInfo::input_layout_{DATALAYOUT(kNCHW)}; -#endif +// #ifdef LITE_WITH_MLU +// thread_local cnmlCoreVersion_t DeviceInfo::mlu_core_version_{CNML_MLU270}; +// thread_local int DeviceInfo::mlu_core_number_{1}; +// thread_local bool DeviceInfo::use_first_conv_{false}; +// thread_local std::vector DeviceInfo::mean_vec_; +// thread_local std::vector DeviceInfo::std_vec_; +// thread_local DataLayoutType DeviceInfo::input_layout_{DATALAYOUT(kNCHW)}; +// #endif #ifdef TARGET_IOS const int DEFAULT_L1_CACHE_SIZE = 64 * 1024; @@ -1089,44 +1089,44 @@ int DeviceInfo::Setup() { return 0; } -#ifdef LITE_WITH_MLU -void DeviceInfo::SetMLURunMode(lite_api::MLUCoreVersion core_version, - int core_number, - bool use_first_conv, - const std::vector& mean_vec, - const std::vector& std_vec, - DataLayoutType input_layout) { - switch (core_version) { - case (lite_api::MLUCoreVersion::MLU_220): - mlu_core_version_ = CNML_MLU220; - break; - case (lite_api::MLUCoreVersion::MLU_270): - mlu_core_version_ = CNML_MLU270; - break; - default: - mlu_core_version_ = CNML_MLU270; - break; - } - mlu_core_number_ = core_number; - use_first_conv_ = use_first_conv; - mean_vec_ = mean_vec; - std_vec_ = std_vec; - input_layout_ = input_layout; -} - -cnmlCoreVersion_t DeviceInfo::MLUCoreVersion() { return mlu_core_version_; } - -int DeviceInfo::MLUCoreNumber() { return mlu_core_number_; } - -bool DeviceInfo::UseFirstConv() { return use_first_conv_; } - -const std::vector& DeviceInfo::MeanVec() const { return mean_vec_; } - -const std::vector& DeviceInfo::StdVec() const { return std_vec_; } - -DataLayoutType DeviceInfo::InputLayout() const { return input_layout_; } - -#endif // LITE_WITH_MLU +// #ifdef LITE_WITH_MLU +// void DeviceInfo::SetMLURunMode(lite_api::MLUCoreVersion core_version, +// int core_number, +// bool use_first_conv, +// const std::vector& mean_vec, +// const std::vector& std_vec, +// DataLayoutType input_layout) { +// switch (core_version) { +// case (lite_api::MLUCoreVersion::MLU_220): +// mlu_core_version_ = CNML_MLU220; +// break; +// case (lite_api::MLUCoreVersion::MLU_270): +// mlu_core_version_ = CNML_MLU270; +// break; +// default: +// mlu_core_version_ = CNML_MLU270; +// break; +// } +// mlu_core_number_ = core_number; +// use_first_conv_ = use_first_conv; +// mean_vec_ = mean_vec; +// std_vec_ = std_vec; +// input_layout_ = input_layout; +// } +// +// cnmlCoreVersion_t DeviceInfo::MLUCoreVersion() { return mlu_core_version_; } +// +// int DeviceInfo::MLUCoreNumber() { return mlu_core_number_; } +// +// bool DeviceInfo::UseFirstConv() { return use_first_conv_; } +// +// const std::vector& DeviceInfo::MeanVec() const { return mean_vec_; } +// +// const std::vector& DeviceInfo::StdVec() const { return std_vec_; } +// +// DataLayoutType DeviceInfo::InputLayout() const { return input_layout_; } +// +// #endif // LITE_WITH_MLU void DeviceInfo::SetRunMode(lite_api::PowerMode mode, int thread_num) { #ifdef ARM_WITH_OMP diff --git a/lite/core/device_info.h b/lite/core/device_info.h index 4e7e4742c4..ae2e1fa551 100644 --- a/lite/core/device_info.h +++ b/lite/core/device_info.h @@ -55,20 +55,20 @@ class DeviceInfo { int Setup(); void SetRunMode(lite_api::PowerMode mode, int thread_num); -#ifdef LITE_WITH_MLU - void SetMLURunMode(lite_api::MLUCoreVersion core_version, - int core_number, - bool use_first_conv, - const std::vector& mean_vec, - const std::vector& std_vec, - DataLayoutType input_layout); - cnmlCoreVersion_t MLUCoreVersion(); - int MLUCoreNumber(); - bool UseFirstConv(); - const std::vector& MeanVec() const; - const std::vector& StdVec() const; - DataLayoutType InputLayout() const; -#endif + // #ifdef LITE_WITH_MLU + // void SetMLURunMode(lite_api::MLUCoreVersion core_version, + // int core_number, + // bool use_first_conv, + // const std::vector& mean_vec, + // const std::vector& std_vec, + // DataLayoutType input_layout); + // cnmlCoreVersion_t MLUCoreVersion(); + // int MLUCoreNumber(); + // bool UseFirstConv(); + // const std::vector& MeanVec() const; + // const std::vector& StdVec() const; + // DataLayoutType InputLayout() const; + // #endif void SetCache(int l1size, int l2size, int l3size); void SetArch(ARMArch arch) { arch_ = arch; } @@ -120,14 +120,14 @@ class DeviceInfo { static thread_local TensorLite workspace_; static thread_local int64_t count_; -#ifdef LITE_WITH_MLU - static thread_local cnmlCoreVersion_t mlu_core_version_; - static thread_local int mlu_core_number_; - static thread_local bool use_first_conv_; - static thread_local std::vector mean_vec_; - static thread_local std::vector std_vec_; - static thread_local DataLayoutType input_layout_; -#endif + // #ifdef LITE_WITH_MLU + // static thread_local cnmlCoreVersion_t mlu_core_version_; + // static thread_local int mlu_core_number_; + // static thread_local bool use_first_conv_; + // static thread_local std::vector mean_vec_; + // static thread_local std::vector std_vec_; + // static thread_local DataLayoutType input_layout_; + // #endif void SetDotInfo(int argc, ...); void SetFP16Info(int argc, ...); diff --git a/lite/core/mir/mlu_postprocess_pass.cc b/lite/core/mir/mlu_postprocess_pass.cc index 191f1543f3..515eab9d3f 100644 --- a/lite/core/mir/mlu_postprocess_pass.cc +++ b/lite/core/mir/mlu_postprocess_pass.cc @@ -569,11 +569,11 @@ void MLUPostprocessPass::Apply(const std::unique_ptr& graph) { // 1: feed->arg_in->subgraph->... 2: ...->subgraph->arg_out->fetch; // arg_in and arg_out are assumed to be NHWC which user should be aware of. // Thus here we change these args' layout to NHWC - if (lite::DeviceInfo::Global().InputLayout() == DATALAYOUT(kNHWC)) { + if (lite::TargetWrapperMlu::InputLayout() == DATALAYOUT(kNHWC)) { ModifyLayout(graph.get()); } - if (lite::DeviceInfo::Global().UseFirstConv()) { + if (lite::TargetWrapperMlu::UseFirstConv()) { GatherAndModifyFirstConvNodes(graph.get()); } diff --git a/lite/kernels/mlu/bridges/conv_op.cc b/lite/kernels/mlu/bridges/conv_op.cc index 5e88323b1e..fc42b2a72a 100644 --- a/lite/kernels/mlu/bridges/conv_op.cc +++ b/lite/kernels/mlu/bridges/conv_op.cc @@ -164,7 +164,7 @@ int ConvConverter(void* ctx, OpLite* op, KernelBase* kernel) { const auto input_scale = op_info->GetAttr("input_scale"); bool use_first_conv = false; - if (lite::DeviceInfo::Global().UseFirstConv() && input_dims[1] == 3) { + if (lite::TargetWrapperMlu::UseFirstConv() && input_dims[1] == 3) { use_first_conv = true; } @@ -192,11 +192,11 @@ int ConvConverter(void* ctx, OpLite* op, KernelBase* kernel) { graph->FPType()); graph->BindConstRawData("first_conv_mean_tensor", - lite::DeviceInfo::Global().MeanVec().data(), + lite::TargetWrapperMlu::MeanVec().data(), 3, false); graph->BindConstRawData("first_conv_std_tensor", - lite::DeviceInfo::Global().StdVec().data(), + lite::TargetWrapperMlu::StdVec().data(), 3, false); -- GitLab