Browse Source

!15008 [MS_LITE_IOS] rename_reg

From: @YeFeng_24
Reviewed-by: @jpc_chenjianping,@hangangqiang
Signed-off-by: @jpc_chenjianping
pull/15008/MERGE
mindspore-ci-bot Gitee 5 years ago
parent
commit
94ce7830a4
7 changed files with 12 additions and 12 deletions
  1. +1
    -1
      mindspore/lite/src/CMakeLists.txt
  2. +1
    -1
      mindspore/lite/src/ios_reg_kernels.h
  3. +1
    -1
      mindspore/lite/src/ios_reg_ops.cc
  4. +3
    -3
      mindspore/lite/src/kernel_registry.cc
  5. +1
    -1
      mindspore/lite/src/kernel_registry.h
  6. +3
    -3
      mindspore/lite/src/ops/populate/populate_register.h
  7. +2
    -2
      mindspore/lite/src/scheduler.cc

+ 1
- 1
mindspore/lite/src/CMakeLists.txt View File

@@ -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)


mindspore/lite/src/reg_kernels.h → mindspore/lite/src/ios_reg_kernels.h View File

@@ -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();

mindspore/lite/src/reg_ops.cc → mindspore/lite/src/ios_reg_ops.cc View File

@@ -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();

+ 3
- 3
mindspore/lite/src/kernel_registry.cc View File

@@ -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 <asm/hwcap.h>
@@ -140,9 +140,9 @@ kernel::LiteKernel *KernelRegistry::GetKernel(const std::vector<Tensor *> &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

+ 1
- 1
mindspore/lite/src/kernel_registry.h View File

@@ -48,7 +48,7 @@ class KernelRegistry {
kernel::LiteKernel *GetKernel(const std::vector<Tensor *> &in_tensors, const std::vector<Tensor *> &out_tensors,
const InnerContext *ctx, const kernel::KernelKey &key, OpParameter *op_parameter);
#ifdef MS_COMPILE_IOS
void RegisterAllKernels();
void IosRegisterAllKernels();
#endif

protected:


+ 3
- 3
mindspore/lite/src/ops/populate/populate_register.h View File

@@ -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



+ 2
- 2
mindspore/lite/src/scheduler.cc View File

@@ -59,8 +59,8 @@ constexpr int kMainSubGraphIndex = 0;

int Scheduler::Schedule(std::vector<kernel::LiteKernel *> *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";


Loading…
Cancel
Save