mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!19352 [MS][LITE] fix lite run android env populate register bug 

Merge pull request !19352 from zhengjun10/fix_issue
This commit is contained in:
i-robot 2021-07-05 03:18:20 +00:00 committed by Gitee
parent 1790db17dd a77110b254
commit eeac849968
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mindspore/lite/src/ops/populate/populate_register.cc Normal file
View File

@ -0,0 +1,26 @@
/**
* Copyright 2019-2021 Huawei Technologies Co., Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "src/ops/populate/populate_register.h"
namespace mindspore {
namespace lite {
PopulateRegistry *PopulateRegistry::GetInstance() {
static PopulateRegistry registry;
return &registry;
}
} // namespace lite
} // namespace mindspore

12
mindspore/lite/src/ops/populate/populate_register.h
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#ifndef LITE_MINDSPORE_LITE_C_OPS_OP_POPULATE_REGISTER_H
#define LITE_MINDSPORE_LITE_C_OPS_OP_POPULATE_REGISTER_H
#ifndef MINDSPORE_LITE_SRC_OPS_POPULATE_POPULATE_REGISTER_H_
#define MINDSPORE_LITE_SRC_OPS_POPULATE_POPULATE_REGISTER_H_
#include <map>
#include "schema/model_generated.h"
@ -28,12 +28,10 @@
namespace mindspore {
namespace lite {
typedef OpParameter *(*ParameterGen)(const void *prim);
class PopulateRegistry {
public:
static PopulateRegistry *GetInstance() {
static PopulateRegistry registry;
return &registry;
}
static PopulateRegistry *GetInstance();
void InsertParameterMap(int type, ParameterGen creator, int version) {
parameters_[GenPrimVersionKey(type, version)] = creator;
@ -69,4 +67,4 @@ class Registry {
} // namespace lite
} // namespace mindspore
#endif
#endif // MINDSPORE_LITE_SRC_OPS_POPULATE_POPULATE_REGISTER_H_

1
mindspore/lite/tools/cropper/build_cropper_config.sh
View File

@ -166,6 +166,7 @@ getCommonFile() {
"${MINDSPORE_HOME}"/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.c
"${MINDSPORE_HOME}"/mindspore/lite/src/runtime/kernel/arm/fp16/common_fp16.cc
"${MINDSPORE_HOME}"/mindspore/lite/src/runtime/infer_manager.cc
"${MINDSPORE_HOME}"/mindspore/lite/src/ops/populate/populate_register.cc
"${MINDSPORE_HOME}"/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.c
"${MINDSPORE_HOME}"/mindspore/core/utils/status.cc
"${MINDSPORE_HOME}"/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/common_infer.c