From ef1a664f88307f83a551f106c9102ae6389ceb11 Mon Sep 17 00:00:00 2001 From: ling Date: Sat, 30 Jan 2021 09:48:13 +0800 Subject: [PATCH] [MSLITE]shape scatter skip-gram reverse-sequences where --- .../nnacl/{l2_norm.c => fp32/l2_norm_fp32.c} | 2 +- .../nnacl/{l2_norm.h => fp32/l2_norm_fp32.h} | 7 ++-- .../lite/nnacl/{power.c => fp32/power_fp32.c} | 2 +- .../lite/nnacl/{power.h => fp32/power_fp32.h} | 7 ++-- .../reverse_sequence_fp32.c} | 4 +-- .../lite/nnacl/fp32/reverse_sequence_fp32.h | 33 +++++++++++++++++++ .../{scatter_nd.c => fp32/scatter_nd_fp32.c} | 2 +- .../{scatter_nd.h => fp32/scatter_nd_fp32.h} | 11 ++----- .../lite/nnacl/{where.c => fp32/where_fp32.c} | 3 +- .../lite/nnacl/{where.h => fp32/where_fp32.h} | 21 +++--------- ...equence.h => reverse_sequence_parameter.h} | 14 ++------ ...skip_gram_fp32.h => skip_gram_parameter.h} | 6 ++-- .../lite/nnacl/{shape.h => where_parameter.h} | 20 +++++++---- .../ops/populate/reverse_sequence_populate.cc | 2 +- .../src/ops/populate/scatter_nd_populate.cc | 8 ++--- .../lite/src/ops/populate/shape_populate.cc | 9 ++--- .../src/ops/populate/skip_gram_populate.cc | 2 +- .../lite/src/ops/populate/where_populate.cc | 2 +- .../runtime/kernel/arm/fp32/l2_norm_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/power_fp32.h | 2 +- .../kernel/arm/fp32/reverse_sequence_fp32.h | 2 +- .../runtime/kernel/arm/fp32/scatter_nd_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/shape_fp32.h | 2 -- .../runtime/kernel/arm/fp32/skip_gram_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/where_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/where_fp32.h | 2 +- .../runtime/kernel/arm/fp32_grad/power_grad.h | 3 +- .../src/runtime/kernel/opencl/kernel/fill.h | 2 -- .../src/runtime/kernel/opencl/kernel/power.h | 2 +- .../arm/fp32/reverse_sequence_fp32_tests.cc | 2 +- .../runtime/kernel/arm/fp32/skip_gram_fp32.cc | 2 +- .../runtime/kernel/arm/string/normalize.cc | 2 +- .../ut/src/runtime/kernel/opencl/common.h | 2 +- .../src/runtime/kernel/opencl/fill_tests.cc | 4 +-- .../src/runtime/kernel/opencl/shape_tests.cc | 4 +-- 35 files changed, 100 insertions(+), 94 deletions(-) rename mindspore/lite/nnacl/{l2_norm.c => fp32/l2_norm_fp32.c} (98%) rename mindspore/lite/nnacl/{l2_norm.h => fp32/l2_norm_fp32.h} (88%) rename mindspore/lite/nnacl/{power.c => fp32/power_fp32.c} (98%) rename mindspore/lite/nnacl/{power.h => fp32/power_fp32.h} (85%) rename mindspore/lite/nnacl/{reverse_sequence.c => fp32/reverse_sequence_fp32.c} (95%) create mode 100644 mindspore/lite/nnacl/fp32/reverse_sequence_fp32.h rename mindspore/lite/nnacl/{scatter_nd.c => fp32/scatter_nd_fp32.c} (96%) rename mindspore/lite/nnacl/{scatter_nd.h => fp32/scatter_nd_fp32.h} (76%) rename mindspore/lite/nnacl/{where.c => fp32/where_fp32.c} (96%) rename mindspore/lite/nnacl/{where.h => fp32/where_fp32.h} (71%) rename mindspore/lite/nnacl/{reverse_sequence.h => reverse_sequence_parameter.h} (77%) rename mindspore/lite/nnacl/{fp32/skip_gram_fp32.h => skip_gram_parameter.h} (83%) rename mindspore/lite/nnacl/{shape.h => where_parameter.h} (68%) diff --git a/mindspore/lite/nnacl/l2_norm.c b/mindspore/lite/nnacl/fp32/l2_norm_fp32.c similarity index 98% rename from mindspore/lite/nnacl/l2_norm.c rename to mindspore/lite/nnacl/fp32/l2_norm_fp32.c index 8070401d55..5ffa48d291 100644 --- a/mindspore/lite/nnacl/l2_norm.c +++ b/mindspore/lite/nnacl/fp32/l2_norm_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/l2_norm.h" +#include "nnacl/fp32/l2_norm_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/l2_norm.h b/mindspore/lite/nnacl/fp32/l2_norm_fp32.h similarity index 88% rename from mindspore/lite/nnacl/l2_norm.h rename to mindspore/lite/nnacl/fp32/l2_norm_fp32.h index 5932af687f..4771d382f1 100644 --- a/mindspore/lite/nnacl/l2_norm.h +++ b/mindspore/lite/nnacl/fp32/l2_norm_fp32.h @@ -14,8 +14,9 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_NNACL_L2NORM_H_ -#define MINDSPORE_LITE_NNACL_L2NORM_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_L2NORM_FP32_H_ +#define MINDSPORE_LITE_NNACL_FP32_L2NORM_FP32_H_ + #include "nnacl/l2_norm_parameter.h" #ifdef __cplusplus @@ -30,4 +31,4 @@ int ThreadTrailingAxis(const float *input_ptr, float *output_ptr, const L2NormPa } #endif -#endif // MINDSPORE_LITE_NNACL_L2NORM_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_L2NORM_FP32_H_ diff --git a/mindspore/lite/nnacl/power.c b/mindspore/lite/nnacl/fp32/power_fp32.c similarity index 98% rename from mindspore/lite/nnacl/power.c rename to mindspore/lite/nnacl/fp32/power_fp32.c index afce6af6c7..37789f5ff5 100644 --- a/mindspore/lite/nnacl/power.c +++ b/mindspore/lite/nnacl/fp32/power_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/power.h" +#include "nnacl/fp32/power_fp32.h" bool CheckInteger(float f) { return floorf(f) == f; } diff --git a/mindspore/lite/nnacl/power.h b/mindspore/lite/nnacl/fp32/power_fp32.h similarity index 85% rename from mindspore/lite/nnacl/power.h rename to mindspore/lite/nnacl/fp32/power_fp32.h index 0babeb86e0..8b62fee9ec 100644 --- a/mindspore/lite/nnacl/power.h +++ b/mindspore/lite/nnacl/fp32/power_fp32.h @@ -14,8 +14,9 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_NNACL_POWER_H_ -#define MINDSPORE_LITE_NNACL_POWER_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_POWER_FP32_H_ +#define MINDSPORE_LITE_NNACL_FP32_POWER_FP32_H_ + #include #include "nnacl/op_base.h" #include "nnacl/power_parameter.h" @@ -28,4 +29,4 @@ void Power(const float *input, const float *exponent, float *output, int len, fl } #endif -#endif // MINDSPORE_LITE_NNACL_POWER_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_POWER_FP32_H_ diff --git a/mindspore/lite/nnacl/reverse_sequence.c b/mindspore/lite/nnacl/fp32/reverse_sequence_fp32.c similarity index 95% rename from mindspore/lite/nnacl/reverse_sequence.c rename to mindspore/lite/nnacl/fp32/reverse_sequence_fp32.c index 5b0757b728..637e6c8304 100644 --- a/mindspore/lite/nnacl/reverse_sequence.c +++ b/mindspore/lite/nnacl/fp32/reverse_sequence_fp32.c @@ -14,9 +14,7 @@ * limitations under the License. */ -#include "nnacl/reverse_sequence.h" -#include -#include "nnacl/common_func.h" +#include "nnacl/fp32/reverse_sequence_fp32.h" void ReverseSequence(float *input0, const void *input1, float *output, ReverseSequenceParameter *para) { (void)memcpy(output, input0, para->total_data_size_); diff --git a/mindspore/lite/nnacl/fp32/reverse_sequence_fp32.h b/mindspore/lite/nnacl/fp32/reverse_sequence_fp32.h new file mode 100644 index 0000000000..d0b18c39dd --- /dev/null +++ b/mindspore/lite/nnacl/fp32/reverse_sequence_fp32.h @@ -0,0 +1,33 @@ +/** + * Copyright 2020 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. + */ + +#ifndef MINDSPORE_LITE_NNACL_FP32_REVERSE_SEQUENCE_H_ +#define MINDSPORE_LITE_NNACL_FP32_REVERSE_SEQUENCE_H_ + +#include +#include "nnacl/common_func.h" +#include "nnacl/op_base.h" +#include "nnacl/reverse_sequence_parameter.h" + +#ifdef __cplusplus +extern "C" { +#endif +void ReverseSequence(float *input0, const void *input1, float *output, ReverseSequenceParameter *para); +#ifdef __cplusplus +} +#endif + +#endif // MINDSPORE_LITE_NNACL_FP32_REVERSE_SEQUENCE_H_ diff --git a/mindspore/lite/nnacl/scatter_nd.c b/mindspore/lite/nnacl/fp32/scatter_nd_fp32.c similarity index 96% rename from mindspore/lite/nnacl/scatter_nd.c rename to mindspore/lite/nnacl/fp32/scatter_nd_fp32.c index 2aefdc4c48..33db0194d7 100644 --- a/mindspore/lite/nnacl/scatter_nd.c +++ b/mindspore/lite/nnacl/fp32/scatter_nd_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/scatter_nd.h" +#include "nnacl/fp32/scatter_nd_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/scatter_nd.h b/mindspore/lite/nnacl/fp32/scatter_nd_fp32.h similarity index 76% rename from mindspore/lite/nnacl/scatter_nd.h rename to mindspore/lite/nnacl/fp32/scatter_nd_fp32.h index 9370052bc2..fcae3a8d31 100644 --- a/mindspore/lite/nnacl/scatter_nd.h +++ b/mindspore/lite/nnacl/fp32/scatter_nd_fp32.h @@ -14,16 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_NNACL_SCATTER_ND_H_ -#define MINDSPORE_LITE_NNACL_SCATTER_ND_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_SCATTER_ND_FP32_H_ +#define MINDSPORE_LITE_NNACL_FP32_SCATTER_ND_FP32_H_ #include "nnacl/op_base.h" -typedef struct ScatterNDParameter { - // primitive parameter - OpParameter op_parameter_; -} ScatterNDParameter; - #ifdef __cplusplus extern "C" { #endif @@ -32,4 +27,4 @@ int DoScatterND(float *output_ptr, const float *update, int *output_unit_offsets } #endif -#endif // MINDSPORE_LITE_NNACL_SCATTER_ND_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_SCATTER_ND_FP32_H_ diff --git a/mindspore/lite/nnacl/where.c b/mindspore/lite/nnacl/fp32/where_fp32.c similarity index 96% rename from mindspore/lite/nnacl/where.c rename to mindspore/lite/nnacl/fp32/where_fp32.c index dad83be8d8..cc77f686e1 100644 --- a/mindspore/lite/nnacl/where.c +++ b/mindspore/lite/nnacl/fp32/where_fp32.c @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/where.h" + +#include "nnacl/fp32/where_fp32.h" #include "nnacl/common_func.h" void WhereWithTripleInputs(const bool *condition, const float *x, const float *y, float *output, diff --git a/mindspore/lite/nnacl/where.h b/mindspore/lite/nnacl/fp32/where_fp32.h similarity index 71% rename from mindspore/lite/nnacl/where.h rename to mindspore/lite/nnacl/fp32/where_fp32.h index 91c0cfc6fa..70f7d44217 100644 --- a/mindspore/lite/nnacl/where.h +++ b/mindspore/lite/nnacl/fp32/where_fp32.h @@ -13,24 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_NNACL_WHERE_H_ -#define MINDSPORE_LITE_NNACL_WHERE_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_WHERE_Fp32_H_ +#define MINDSPORE_LITE_NNACL_FP32_WHERE_Fp32_H_ #include "nnacl/op_base.h" - -typedef struct WhereParameter { - // primitive parameter - OpParameter op_parameter_; - - // other parameter - int condition_num_; - int x_num_; - int y_num_; - int max_num_; - - int rank_; - int thread_num_; -} WhereParameter; +#include "nnacl/where_parameter.h" #ifdef __cplusplus extern "C" { @@ -41,4 +28,4 @@ void WhereWithTripleInputs(const bool *condition, const float *x, const float *y } #endif -#endif // MINDSPORE_LITE_NNACL_WHERE_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_WHERE_Fp32_H_ diff --git a/mindspore/lite/nnacl/reverse_sequence.h b/mindspore/lite/nnacl/reverse_sequence_parameter.h similarity index 77% rename from mindspore/lite/nnacl/reverse_sequence.h rename to mindspore/lite/nnacl/reverse_sequence_parameter.h index c25ea3b218..dd5ce36462 100644 --- a/mindspore/lite/nnacl/reverse_sequence.h +++ b/mindspore/lite/nnacl/reverse_sequence_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_H_ -#define MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_H_ +#ifndef MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_PARAMETER_H_ #include "nnacl/op_base.h" @@ -42,12 +42,4 @@ typedef struct ReverseSequenceParameter { bool is_seq_length_int32_; } ReverseSequenceParameter; -#ifdef __cplusplus -extern "C" { -#endif -void ReverseSequence(float *input0, const void *input1, float *output, ReverseSequenceParameter *para); -#ifdef __cplusplus -} -#endif - -#endif // MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_H_ +#endif // MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_PARAMETER_H_ diff --git a/mindspore/lite/nnacl/fp32/skip_gram_fp32.h b/mindspore/lite/nnacl/skip_gram_parameter.h similarity index 83% rename from mindspore/lite/nnacl/fp32/skip_gram_fp32.h rename to mindspore/lite/nnacl/skip_gram_parameter.h index 145bb9e1f7..26d3c28cbf 100644 --- a/mindspore/lite/nnacl/fp32/skip_gram_fp32.h +++ b/mindspore/lite/nnacl/skip_gram_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_NNACL_FP32_SKIP_GRAM_H_ -#define MINDSPORE_LITE_NNACL_FP32_SKIP_GRAM_H_ +#ifndef MINDSPORE_LITE_NNACL_SKIP_GRAM_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_SKIP_GRAM_PARAMETER_H_ #include "nnacl/op_base.h" @@ -27,4 +27,4 @@ typedef struct SkipGramParameter { int ngram_size; } SkipGramParameter; -#endif // MINDSPORE_LITE_NNACL_FP32_SKIP_GRAM_H_ +#endif // MINDSPORE_LITE_NNACL_SKIP_GRAM_PARAMETER_H_ diff --git a/mindspore/lite/nnacl/shape.h b/mindspore/lite/nnacl/where_parameter.h similarity index 68% rename from mindspore/lite/nnacl/shape.h rename to mindspore/lite/nnacl/where_parameter.h index 7e90c73327..9480d6e2fe 100644 --- a/mindspore/lite/nnacl/shape.h +++ b/mindspore/lite/nnacl/where_parameter.h @@ -13,15 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -#ifndef MINDSPORE_CCSRC_KERNEL_CPU_ARM_NNACL_SHAPE_H_ -#define MINDSPORE_CCSRC_KERNEL_CPU_ARM_NNACL_SHAPE_H_ +#ifndef MINDSPORE_LITE_NNACL_WHERE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_WHERE_PARAMETER_H_ #include "nnacl/op_base.h" -typedef struct ShapeParameter { +typedef struct WhereParameter { // primitive parameter OpParameter op_parameter_; -} ShapeParameter; -#endif // MINDSPORE_CCSRC_KERNEL_CPU_ARM_NNACL_SHAPE_H_ + // other parameter + int condition_num_; + int x_num_; + int y_num_; + int max_num_; + + int rank_; + int thread_num_; +} WhereParameter; + +#endif // MINDSPORE_LITE_NNACL_WHERE_PARAMETER_H_ diff --git a/mindspore/lite/src/ops/populate/reverse_sequence_populate.cc b/mindspore/lite/src/ops/populate/reverse_sequence_populate.cc index 83827266e3..d566a37a31 100644 --- a/mindspore/lite/src/ops/populate/reverse_sequence_populate.cc +++ b/mindspore/lite/src/ops/populate/reverse_sequence_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/reverse_sequence.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/reverse_sequence.h" +#include "mindspore/lite/nnacl/fp32/reverse_sequence_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/scatter_nd_populate.cc b/mindspore/lite/src/ops/populate/scatter_nd_populate.cc index e81860a027..46b3fb22ee 100644 --- a/mindspore/lite/src/ops/populate/scatter_nd_populate.cc +++ b/mindspore/lite/src/ops/populate/scatter_nd_populate.cc @@ -17,19 +17,17 @@ #include "src/ops/scatter_nd.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/scatter_nd.h" namespace mindspore { namespace lite { - OpParameter *PopulateScatterNDParameter(const mindspore::lite::PrimitiveC *primitive) { - ScatterNDParameter *scatter_nd_param = reinterpret_cast(malloc(sizeof(ScatterNDParameter))); + OpParameter *scatter_nd_param = reinterpret_cast(malloc(sizeof(OpParameter))); if (scatter_nd_param == nullptr) { MS_LOG(ERROR) << "malloc ScatterNDParameter failed."; return nullptr; } - memset(scatter_nd_param, 0, sizeof(ScatterNDParameter)); - scatter_nd_param->op_parameter_.type_ = primitive->Type(); + memset(scatter_nd_param, 0, sizeof(OpParameter)); + scatter_nd_param->type_ = primitive->Type(); return reinterpret_cast(scatter_nd_param); } Registry ScatterNDParameterRegistry(schema::PrimitiveType_ScatterND, PopulateScatterNDParameter); diff --git a/mindspore/lite/src/ops/populate/shape_populate.cc b/mindspore/lite/src/ops/populate/shape_populate.cc index d097e0ee15..d6f392b102 100644 --- a/mindspore/lite/src/ops/populate/shape_populate.cc +++ b/mindspore/lite/src/ops/populate/shape_populate.cc @@ -18,23 +18,20 @@ #include "src/ops/populate/populate_register.h" #include "src/common/log_adapter.h" #include "src/tensor.h" -#include "nnacl/shape.h" namespace mindspore { namespace lite { - OpParameter *PopulateShapeParameter(const mindspore::lite::PrimitiveC *primitive) { - ShapeParameter *shape_param = reinterpret_cast(malloc(sizeof(ShapeParameter))); + OpParameter *shape_param = reinterpret_cast(malloc(sizeof(OpParameter))); if (shape_param == nullptr) { MS_LOG(ERROR) << "malloc ShapeParameter failed."; return nullptr; } - memset(shape_param, 0, sizeof(ShapeParameter)); - shape_param->op_parameter_.type_ = primitive->Type(); + memset(shape_param, 0, sizeof(OpParameter)); + shape_param->type_ = primitive->Type(); return reinterpret_cast(shape_param); } Registry ShapeParameterRegistry(schema::PrimitiveType_Shape, PopulateShapeParameter); - } // namespace lite } // namespace mindspore diff --git a/mindspore/lite/src/ops/populate/skip_gram_populate.cc b/mindspore/lite/src/ops/populate/skip_gram_populate.cc index 36c7fb97cd..4760edcdf4 100644 --- a/mindspore/lite/src/ops/populate/skip_gram_populate.cc +++ b/mindspore/lite/src/ops/populate/skip_gram_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/skip_gram.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/skip_gram_fp32.h" +#include "mindspore/lite/nnacl/skip_gram_parameter.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/where_populate.cc b/mindspore/lite/src/ops/populate/where_populate.cc index 8a90b99363..a759447ca2 100644 --- a/mindspore/lite/src/ops/populate/where_populate.cc +++ b/mindspore/lite/src/ops/populate/where_populate.cc @@ -15,7 +15,7 @@ */ #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/where.h" +#include "mindspore/lite/nnacl/fp32/where_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/l2_norm_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/l2_norm_fp32.cc index 3e149b2dfa..518dc0e306 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/l2_norm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/l2_norm_fp32.cc @@ -18,7 +18,7 @@ #include #include "src/runtime/kernel/arm/fp32/l2_norm_fp32.h" #include "include/errorcode.h" -#include "nnacl/l2_norm.h" +#include "mindspore/lite/nnacl/fp32/l2_norm_fp32.h" #include "src/runtime/runtime_api.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/power_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/power_fp32.h index 4937ba81c3..aed3964173 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/power_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/power_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/power.h" +#include "mindspore/lite/nnacl/fp32/power_fp32.h" namespace mindspore::kernel { class PowerCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence_fp32.h index 00af584e6d..f71b6c5d8d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence_fp32.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/reverse_sequence.h" +#include "nnacl/fp32/reverse_sequence_fp32.h" namespace mindspore::kernel { class ReverseSequenceCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd_fp32.h index 8339bcbde4..ce7cac8322 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/scatter_nd.h" +#include "mindspore/lite/nnacl/fp32/scatter_nd_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/shape_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/shape_fp32.h index 42b118d96d..5a5b79283c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/shape_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/shape_fp32.h @@ -19,10 +19,8 @@ #include #include "src/lite_kernel.h" -#include "nnacl/shape.h" namespace mindspore::kernel { - class ShapeCPUKernel : public LiteKernel { public: ShapeCPUKernel(OpParameter *parameter, const std::vector &inputs, diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h index e044a91956..1a7580429d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/skip_gram_fp32.h" +#include "mindspore/lite/nnacl/skip_gram_parameter.h" #include "src/common/string_util.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.cc index cdb9f498ec..0f940a3b70 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.cc @@ -17,7 +17,7 @@ #include #include #include "schema/model_generated.h" -#include "nnacl/where.h" +#include "mindspore/lite/nnacl/fp32/where_fp32.h" #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.h index 08a256fc93..db591d0a57 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/where_fp32.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/where.h" +#include "mindspore/lite/nnacl/fp32/where_fp32.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.h index 4ce3cf3622..950d58c5f3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.h @@ -19,7 +19,8 @@ #include #include "src/lite_kernel.h" -#include "nnacl/power.h" +#include "nnacl/power_parameter.h" +#include "nnacl/fp32/power_fp32.h" namespace mindspore::kernel { class PowerGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h index 60db7dd9bb..aabe94beb7 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h @@ -19,11 +19,9 @@ #include #include "mindspore/lite/nnacl/base/fill_base.h" -#include "mindspore/lite/nnacl/shape.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" namespace mindspore::kernel { - class FillOpenCLKernel : public OpenCLKernel { public: using OpenCLKernel::OpenCLKernel; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/power.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/power.h index 469bc2e334..6efce285d1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/power.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/power.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_POWER_H_ #include -#include "nnacl/power.h" +#include "mindspore/lite/nnacl/fp32/power_fp32.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc index 31c6820f10..cab70b2c5e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/nnacl/reverse_sequence.h" +#include "mindspore/lite/nnacl/fp32/reverse_sequence_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc index d2dd4002d6..4778dea26c 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc @@ -16,7 +16,7 @@ #include #include "src/runtime/kernel/arm/fp32/skip_gram_fp32.h" -#include "nnacl/fp32/skip_gram_fp32.h" +#include "mindspore/lite/nnacl/skip_gram_parameter.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc index 47b2b01c4f..ddec37f15a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc @@ -18,7 +18,7 @@ #include "src/runtime/kernel/arm/fp32/skip_gram_fp32.h" #include "src/runtime/kernel/arm/string/normalize.h" #include "mindspore/lite/src/kernel_registry.h" -#include "nnacl/fp32/skip_gram_fp32.h" +#include "mindspore/lite/nnacl/skip_gram_parameter.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h b/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h index 58c8ab6a1b..3dfd0b351a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h @@ -86,7 +86,7 @@ T *CreateParameter(schema::PrimitiveType type) { return nullptr; } memset(param, 0, sizeof(T)); - param->op_parameter_.type_ = type; + (reinterpret_cast(param))->type_ = type; return param; } diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/fill_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/fill_tests.cc index 1611c8ffac..52b430be03 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/fill_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/fill_tests.cc @@ -109,8 +109,8 @@ TEST_F(TestFillOpenCLCI, Fp32testshape) { std::vector outputs{&output_tensor}; MS_LOG(INFO) << " initialize tensors "; - auto param = reinterpret_cast(malloc(sizeof(ShapeParameter))); - param->op_parameter_.type_ = PrimitiveType_Shape; + auto param = reinterpret_cast(malloc(sizeof(OpParameter))); + param->type_ = PrimitiveType_Shape; if (param == nullptr) { MS_LOG(INFO) << " new FillParameter failed "; return; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/shape_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/shape_tests.cc index f2fca060ab..f6673dfb6f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/shape_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/shape_tests.cc @@ -14,16 +14,14 @@ * limitations under the License. */ #include "ut/src/runtime/kernel/opencl/common.h" -#include "nnacl/shape.h" namespace mindspore::lite::opencl::test { - class TestOpenCL_Shape : public CommonTest {}; namespace { // PrimitiveType_Shape: src/ops/populate/shape_populate.cc OpParameter *CreateParameter() { - auto *param = test::CreateParameter(schema::PrimitiveType_Shape); + auto *param = test::CreateParameter(schema::PrimitiveType_Shape); return reinterpret_cast(param); } } // namespace