From 89ad095092f213309d6223bf56b1228ce6cb0f97 Mon Sep 17 00:00:00 2001 From: yefeng Date: Mon, 12 Apr 2021 17:17:48 +0800 Subject: [PATCH] rename --- mindspore/lite/src/CMakeLists.txt | 2 +- mindspore/lite/src/{reg_kernels.h => ios_reg_kernels.h} | 2 +- mindspore/lite/src/{reg_ops.cc => ios_reg_ops.cc} | 2 +- mindspore/lite/src/kernel_registry.cc | 6 +++--- mindspore/lite/src/kernel_registry.h | 2 +- mindspore/lite/src/ops/populate/populate_register.h | 6 +++--- mindspore/lite/src/scheduler.cc | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename mindspore/lite/src/{reg_kernels.h => ios_reg_kernels.h} (99%) rename mindspore/lite/src/{reg_ops.cc => ios_reg_ops.cc} (99%) diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index b4c68eae56..d363f8f2d5 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -65,7 +65,7 @@ set(LITE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/huffman_decode.cc ) if(DEFINED ARCHS) - list(APPEND LITE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/reg_ops.cc) + list(APPEND LITE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/ios_reg_ops.cc) endif() if(SUPPORT_GPU STREQUAL opencl) diff --git a/mindspore/lite/src/reg_kernels.h b/mindspore/lite/src/ios_reg_kernels.h similarity index 99% rename from mindspore/lite/src/reg_kernels.h rename to mindspore/lite/src/ios_reg_kernels.h index 014c5b7190..ed37347bf0 100644 --- a/mindspore/lite/src/reg_kernels.h +++ b/mindspore/lite/src/ios_reg_kernels.h @@ -361,7 +361,7 @@ extern void _kCPUkNumberTypeInt8PrimitiveType_LeakyRelu(); extern void _kCPUkNumberTypeInt8PrimitiveType_LayerNormFusion(); extern void _kCPUkNumberTypeInt8PrimitiveType_SubFusion(); -void RegisterKernels() { +void IosRegisterKernels() { // base _kCPUkNumberTypeInt32PrimitiveType_StridedSlice(); _kCPUkNumberTypeFloat32PrimitiveType_StridedSlice(); diff --git a/mindspore/lite/src/reg_ops.cc b/mindspore/lite/src/ios_reg_ops.cc similarity index 99% rename from mindspore/lite/src/reg_ops.cc rename to mindspore/lite/src/ios_reg_ops.cc index fed72fe730..43154cd4af 100644 --- a/mindspore/lite/src/reg_ops.cc +++ b/mindspore/lite/src/ios_reg_ops.cc @@ -173,7 +173,7 @@ extern void _PrimitiveType_RankSCHEMA_CUR(); extern void _PrimitiveType_ClipSCHEMA_CUR(); extern void _PrimitiveType_SpaceToDepthSCHEMA_CUR(); -void RegisterOps() { +void IosRegisterOps() { _PrimitiveType_MulFusionSCHEMA_CUR(); _PrimitiveType_NonMaxSuppressionSCHEMA_CUR(); _PrimitiveType_TensorListStackSCHEMA_CUR(); diff --git a/mindspore/lite/src/kernel_registry.cc b/mindspore/lite/src/kernel_registry.cc index 9448c15c54..c99718b9cf 100644 --- a/mindspore/lite/src/kernel_registry.cc +++ b/mindspore/lite/src/kernel_registry.cc @@ -18,7 +18,7 @@ #include "src/ops/populate/populate_register.h" #include "src/common/version_manager.h" #include "nnacl/pooling_parameter.h" -#include "src/reg_kernels.h" +#include "src/ios_reg_kernels.h" #ifdef ENABLE_ARM64 #if defined(__ANDROID__) #include @@ -140,9 +140,9 @@ kernel::LiteKernel *KernelRegistry::GetKernel(const std::vector &in_te } #ifdef MS_COMPILE_IOS -void KernelRegistry::RegisterAllKernels() { +void KernelRegistry::IosRegisterAllKernels() { static std::once_flag flag_kernels; - std::call_once(flag_kernels, [&]() { kernel::RegisterKernels(); }); + std::call_once(flag_kernels, [&]() { kernel::IosRegisterKernels(); }); } #endif } // namespace mindspore::lite diff --git a/mindspore/lite/src/kernel_registry.h b/mindspore/lite/src/kernel_registry.h index 24c224cd67..dae605ed48 100644 --- a/mindspore/lite/src/kernel_registry.h +++ b/mindspore/lite/src/kernel_registry.h @@ -48,7 +48,7 @@ class KernelRegistry { kernel::LiteKernel *GetKernel(const std::vector &in_tensors, const std::vector &out_tensors, const InnerContext *ctx, const kernel::KernelKey &key, OpParameter *op_parameter); #ifdef MS_COMPILE_IOS - void RegisterAllKernels(); + void IosRegisterAllKernels(); #endif protected: diff --git a/mindspore/lite/src/ops/populate/populate_register.h b/mindspore/lite/src/ops/populate/populate_register.h index 6bcfea4415..c14e973ce2 100644 --- a/mindspore/lite/src/ops/populate/populate_register.h +++ b/mindspore/lite/src/ops/populate/populate_register.h @@ -26,7 +26,7 @@ namespace mindspore { namespace lite { #ifdef MS_COMPILE_IOS -void RegisterOps(); +void IosRegisterOps(); #endif typedef OpParameter *(*ParameterGen)(const void *prim); class PopulateRegistry { @@ -52,9 +52,9 @@ class PopulateRegistry { return param_creator; } #ifdef MS_COMPILE_IOS - void RegisterAllOps() { + void IosRegisterAllOps() { static std::once_flag flag_ops; - std::call_once(flag_ops, [&]() { RegisterOps(); }); + std::call_once(flag_ops, [&]() { IosRegisterOps(); }); } #endif diff --git a/mindspore/lite/src/scheduler.cc b/mindspore/lite/src/scheduler.cc index 33eea31bd5..2a8e735a07 100644 --- a/mindspore/lite/src/scheduler.cc +++ b/mindspore/lite/src/scheduler.cc @@ -59,8 +59,8 @@ constexpr int kMainSubGraphIndex = 0; int Scheduler::Schedule(std::vector *dst_kernels) { #ifdef MS_COMPILE_IOS - PopulateRegistry::GetInstance()->RegisterAllOps(); - KernelRegistry::GetInstance()->RegisterAllKernels(); + PopulateRegistry::GetInstance()->IosRegisterAllOps(); + KernelRegistry::GetInstance()->IosRegisterAllKernels(); #endif if (src_model_ == nullptr) { MS_LOG(ERROR) << "Input model is nullptr";