diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index 7645700035..55ecc82c8e 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -33,7 +33,7 @@ if (PLATFORM_ARM64) install(FILES ${TOP_DIR}/mindspore/core/ir/dtype/type_id.h DESTINATION ${INC_DIR}/ir/dtype COMPONENT ${COMPONENT_NAME}) install(DIRECTORY ${TOP_DIR}/mindspore/lite/include/ DESTINATION ${INC_DIR} COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h") install(DIRECTORY ${TOP_DIR}/mindspore/lite/schema/ DESTINATION ${INC_DIR}/schema COMPONENT ${COMPONENT_NAME} FILES_MATCHING PATTERN "*.h" PATTERN "inner" EXCLUDE) - install(FILES ${TOP_DIR}/mindspore/lite/build/src/runtime/kernel/arm/nnacl/liboptimize.so DESTINATION ${LIB_DIR} COMPONENT ${COMPONENT_NAME}) + install(FILES ${TOP_DIR}/mindspore/lite/build/nnacl/liboptimize.so DESTINATION ${LIB_DIR} COMPONENT ${COMPONENT_NAME}) install(DIRECTORY ${TOP_DIR}/third_party/flatbuffers/include DESTINATION ${FLATBF_DIR} COMPONENT ${COMPONENT_NAME}) elseif (PLATFORM_ARM32) install(FILES ${TOP_DIR}/mindspore/core/ir/dtype/type_id.h DESTINATION ${INC_DIR}/ir/dtype COMPONENT ${COMPONENT_NAME}) diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index de8073b4cb..537f4245c0 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -198,6 +198,7 @@ endif () if (BUILD_DEVICE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/nnacl) if (NOT WIN32) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/benchmark) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test) diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/CMakeLists.txt b/mindspore/lite/nnacl/CMakeLists.txt similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/CMakeLists.txt rename to mindspore/lite/nnacl/CMakeLists.txt index d4b6df1cfc..675393d9a7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/CMakeLists.txt +++ b/mindspore/lite/nnacl/CMakeLists.txt @@ -1,7 +1,7 @@ project(nnacl) set(NNACL_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../..) +set(TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) include_directories(NNACL_DIR) ########################### optimized files ########################### @@ -12,7 +12,7 @@ file(GLOB OPTIMIZED_ASSEMBLY file(GLOB FP16_SRC ${NNACL_DIR}/fp16/*.c - ${NNACL_DIR}/../fp16/*.cc + ${TOP_DIR}/src/runtime/kernel/arm/fp16/*.cc ) ########################### share library build ######################## @@ -34,10 +34,10 @@ if (PLATFORM_ARM64) add_custom_command(TARGET optimize POST_BUILD COMMAND ${ANDROID_NDK}/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/aarch64-linux-android/bin/strip - ${TOP_DIR}/build/src/runtime/kernel/arm/nnacl/liboptimize.so) + ${TOP_DIR}/build/nnacl/liboptimize.so) add_custom_command(TARGET optimize POST_BUILD COMMAND rm -rf ${TOP_DIR}/output/lib/liboptimize.so COMMAND mkdir -pv ${TOP_DIR}/output/lib - COMMAND cp ${TOP_DIR}/build/src/runtime/kernel/arm/nnacl/liboptimize.so ${TOP_DIR}/output/lib) + COMMAND cp ${TOP_DIR}/build/nnacl/liboptimize.so ${TOP_DIR}/output/lib) endif () diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.c b/mindspore/lite/nnacl/activation_grad.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.c rename to mindspore/lite/nnacl/activation_grad.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.h b/mindspore/lite/nnacl/activation_grad.h similarity index 86% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.h rename to mindspore/lite/nnacl/activation_grad.h index de20bc95e6..b0ed303582 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.h +++ b/mindspore/lite/nnacl/activation_grad.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_GRAD_H_ +#ifndef MINDSPORE_LITE_NNACL_ACTIVATION_GRAD_H_ +#define MINDSPORE_LITE_NNACL_ACTIVATION_GRAD_H_ #include #include "nnacl/op_base.h" @@ -42,4 +42,4 @@ int HSigmoidGrad(float *src0, float *src1, int length, float *dst); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_GRAD_H_ +#endif // MINDSPORE_LITE_NNACL_ACTIVATION_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.c b/mindspore/lite/nnacl/arg_min_max.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.c rename to mindspore/lite/nnacl/arg_min_max.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h b/mindspore/lite/nnacl/arg_min_max.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h rename to mindspore/lite/nnacl/arg_min_max.h index 38ceb71ffc..ded46af8d5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h +++ b/mindspore/lite/nnacl/arg_min_max.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_H_ +#ifndef MINDSPORE_LITE_NNACL_ARG_MIN_MAX_H_ +#define MINDSPORE_LITE_NNACL_ARG_MIN_MAX_H_ #include "nnacl/arg_min_max_parameter.h" @@ -26,4 +26,4 @@ void ArgMinMax(const void *input, void *output, const int *in_shape, ArgMinMaxPa } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_H_ +#endif // MINDSPORE_LITE_NNACL_ARG_MIN_MAX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h b/mindspore/lite/nnacl/arg_min_max_parameter.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h rename to mindspore/lite/nnacl/arg_min_max_parameter.h index f8635c208c..afedab08c5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h +++ b/mindspore/lite/nnacl/arg_min_max_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_ARG_MIN_MAX_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_ARG_MIN_MAX_PARAMETER_H_ #include "nnacl/op_base.h" @@ -43,4 +43,4 @@ typedef struct ArgMinMaxParameter { ArgElement *arg_elements_; } ArgMinMaxParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_ARG_MIN_MAX_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.c b/mindspore/lite/nnacl/arithmetic_common.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.c rename to mindspore/lite/nnacl/arithmetic_common.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h b/mindspore/lite/nnacl/arithmetic_common.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h rename to mindspore/lite/nnacl/arithmetic_common.h index c2be3eba46..34aab3e4a5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h +++ b/mindspore/lite/nnacl/arithmetic_common.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_COMMON_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_COMMON_H_ +#ifndef MINDSPORE_LITE_NNACL_ARITHMETIC_COMMON_H_ +#define MINDSPORE_LITE_NNACL_ARITHMETIC_COMMON_H_ #ifdef ENABLE_NEON #include @@ -60,4 +60,4 @@ void TileDimensionsInt8(int8_t *data0, int8_t *data1, int8_t *tile_data0, int8_t } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_COMMON_H_ +#endif // MINDSPORE_LITE_NNACL_ARITHMETIC_COMMON_H_ diff --git a/mindspore/lite/nnacl/arithmetic_parameter.h b/mindspore/lite/nnacl/arithmetic_parameter.h new file mode 100644 index 0000000000..d7d2b73a20 --- /dev/null +++ b/mindspore/lite/nnacl/arithmetic_parameter.h @@ -0,0 +1,22 @@ +/** + * 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_ARTITHMETIC_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_ + +#include "nnacl/op_attribute.h" + +#endif // MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h b/mindspore/lite/nnacl/arithmetic_self_parameter.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h rename to mindspore/lite/nnacl/arithmetic_self_parameter.h index 0e4a29e506..fdbb1c8dbc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h +++ b/mindspore/lite/nnacl/arithmetic_self_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_ARITHMETIC_SELF_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_ARITHMETIC_SELF_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/errorcode.h" @@ -27,4 +27,4 @@ typedef struct ArithmeticSelfParameter { ArithSelfQuantArg quant_arg_; } ArithmeticSelfParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_ARITHMETIC_SELF_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwFp32Center.S b/mindspore/lite/nnacl/assembly/arm32/ConvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwFp32Center.S rename to mindspore/lite/nnacl/assembly/arm32/ConvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwInt8Center.S b/mindspore/lite/nnacl/assembly/arm32/ConvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwInt8Center.S rename to mindspore/lite/nnacl/assembly/arm32/ConvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwFp32Center.S b/mindspore/lite/nnacl/assembly/arm32/DeconvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwFp32Center.S rename to mindspore/lite/nnacl/assembly/arm32/DeconvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwInt8Center.S b/mindspore/lite/nnacl/assembly/arm32/DeconvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwInt8Center.S rename to mindspore/lite/nnacl/assembly/arm32/DeconvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmFp32_8x4.S b/mindspore/lite/nnacl/assembly/arm32/IndirectGemmFp32_8x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmFp32_8x4.S rename to mindspore/lite/nnacl/assembly/arm32/IndirectGemmFp32_8x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S b/mindspore/lite/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S rename to mindspore/lite/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S b/mindspore/lite/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S rename to mindspore/lite/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAdd.S b/mindspore/lite/nnacl/assembly/arm64/C4BiasAdd.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAdd.S rename to mindspore/lite/nnacl/assembly/arm64/C4BiasAdd.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu.S b/mindspore/lite/nnacl/assembly/arm64/C4BiasAddRelu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu.S rename to mindspore/lite/nnacl/assembly/arm64/C4BiasAddRelu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu6.S b/mindspore/lite/nnacl/assembly/arm64/C4BiasAddRelu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu6.S rename to mindspore/lite/nnacl/assembly/arm64/C4BiasAddRelu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu.S b/mindspore/lite/nnacl/assembly/arm64/C4Relu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu.S rename to mindspore/lite/nnacl/assembly/arm64/C4Relu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu6.S b/mindspore/lite/nnacl/assembly/arm64/C4Relu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu6.S rename to mindspore/lite/nnacl/assembly/arm64/C4Relu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwFp32Border.S b/mindspore/lite/nnacl/assembly/arm64/ConvDwFp32Border.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwFp32Border.S rename to mindspore/lite/nnacl/assembly/arm64/ConvDwFp32Border.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwFp32Center.S b/mindspore/lite/nnacl/assembly/arm64/ConvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwFp32Center.S rename to mindspore/lite/nnacl/assembly/arm64/ConvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwInt8Center.S b/mindspore/lite/nnacl/assembly/arm64/ConvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwInt8Center.S rename to mindspore/lite/nnacl/assembly/arm64/ConvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvFp32Center.S b/mindspore/lite/nnacl/assembly/arm64/ConvFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvFp32Center.S rename to mindspore/lite/nnacl/assembly/arm64/ConvFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwFp32Border.S b/mindspore/lite/nnacl/assembly/arm64/DeconvDwFp32Border.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwFp32Border.S rename to mindspore/lite/nnacl/assembly/arm64/DeconvDwFp32Border.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwFp32Center.S b/mindspore/lite/nnacl/assembly/arm64/DeconvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwFp32Center.S rename to mindspore/lite/nnacl/assembly/arm64/DeconvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwInt8Center.S b/mindspore/lite/nnacl/assembly/arm64/DeconvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwInt8Center.S rename to mindspore/lite/nnacl/assembly/arm64/DeconvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmFp32_8x8.S b/mindspore/lite/nnacl/assembly/arm64/IndirectGemmFp32_8x8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmFp32_8x8.S rename to mindspore/lite/nnacl/assembly/arm64/IndirectGemmFp32_8x8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S b/mindspore/lite/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S rename to mindspore/lite/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt8_4x4.S b/mindspore/lite/nnacl/assembly/arm64/IndirectGemmInt8_4x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt8_4x4.S rename to mindspore/lite/nnacl/assembly/arm64/IndirectGemmInt8_4x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/MatmulFp32.S b/mindspore/lite/nnacl/assembly/arm64/MatmulFp32.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/MatmulFp32.S rename to mindspore/lite/nnacl/assembly/arm64/MatmulFp32.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/MatmulInt8.S b/mindspore/lite/nnacl/assembly/arm64/MatmulInt8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/MatmulInt8.S rename to mindspore/lite/nnacl/assembly/arm64/MatmulInt8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/MatmulR4Int8.S b/mindspore/lite/nnacl/assembly/arm64/MatmulR4Int8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/MatmulR4Int8.S rename to mindspore/lite/nnacl/assembly/arm64/MatmulR4Int8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/PostFuncBiasReluC8.S b/mindspore/lite/nnacl/assembly/arm64/PostFuncBiasReluC8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/PostFuncBiasReluC8.S rename to mindspore/lite/nnacl/assembly/arm64/PostFuncBiasReluC8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S b/mindspore/lite/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S rename to mindspore/lite/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add.S b/mindspore/lite/nnacl/assembly/arm64/bias_add.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add.S rename to mindspore/lite/nnacl/assembly/arm64/bias_add.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu.S b/mindspore/lite/nnacl/assembly/arm64/bias_add_relu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu.S rename to mindspore/lite/nnacl/assembly/arm64/bias_add_relu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu6.S b/mindspore/lite/nnacl/assembly/arm64/bias_add_relu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu6.S rename to mindspore/lite/nnacl/assembly/arm64/bias_add_relu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_add.S b/mindspore/lite/nnacl/assembly/arm64/matrix_add.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_add.S rename to mindspore/lite/nnacl/assembly/arm64/matrix_add.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_sub.S b/mindspore/lite/nnacl/assembly/arm64/matrix_sub.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_sub.S rename to mindspore/lite/nnacl/assembly/arm64/matrix_sub.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu.S b/mindspore/lite/nnacl/assembly/arm64/relu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu.S rename to mindspore/lite/nnacl/assembly/arm64/relu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu6.S b/mindspore/lite/nnacl/assembly/arm64/relu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu6.S rename to mindspore/lite/nnacl/assembly/arm64/relu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/ConvDwFp16Border.S b/mindspore/lite/nnacl/assembly/opt/ConvDwFp16Border.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/ConvDwFp16Border.S rename to mindspore/lite/nnacl/assembly/opt/ConvDwFp16Border.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/ConvDwFp16Center.S b/mindspore/lite/nnacl/assembly/opt/ConvDwFp16Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/ConvDwFp16Center.S rename to mindspore/lite/nnacl/assembly/opt/ConvDwFp16Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/DeconvDwFp16Border.S b/mindspore/lite/nnacl/assembly/opt/DeconvDwFp16Border.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/DeconvDwFp16Border.S rename to mindspore/lite/nnacl/assembly/opt/DeconvDwFp16Border.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/DeconvDwFp16Center.S b/mindspore/lite/nnacl/assembly/opt/DeconvDwFp16Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/DeconvDwFp16Center.S rename to mindspore/lite/nnacl/assembly/opt/DeconvDwFp16Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/Float16ToFloat32.S b/mindspore/lite/nnacl/assembly/opt/Float16ToFloat32.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/Float16ToFloat32.S rename to mindspore/lite/nnacl/assembly/opt/Float16ToFloat32.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/Float32ToFloat16.S b/mindspore/lite/nnacl/assembly/opt/Float32ToFloat16.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/Float32ToFloat16.S rename to mindspore/lite/nnacl/assembly/opt/Float32ToFloat16.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmFp16_16x8.S b/mindspore/lite/nnacl/assembly/opt/IndirectGemmFp16_16x8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmFp16_16x8.S rename to mindspore/lite/nnacl/assembly/opt/IndirectGemmFp16_16x8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmInt8_24x4_dp.S b/mindspore/lite/nnacl/assembly/opt/IndirectGemmInt8_24x4_dp.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmInt8_24x4_dp.S rename to mindspore/lite/nnacl/assembly/opt/IndirectGemmInt8_24x4_dp.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/MatmulFp16.S b/mindspore/lite/nnacl/assembly/opt/MatmulFp16.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/MatmulFp16.S rename to mindspore/lite/nnacl/assembly/opt/MatmulFp16.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/MatmulOptR4Int8.S b/mindspore/lite/nnacl/assembly/opt/MatmulOptR4Int8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/MatmulOptR4Int8.S rename to mindspore/lite/nnacl/assembly/opt/MatmulOptR4Int8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/PostFuncBiasReluC8Fp16.S b/mindspore/lite/nnacl/assembly/opt/PostFuncBiasReluC8Fp16.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/PostFuncBiasReluC8Fp16.S rename to mindspore/lite/nnacl/assembly/opt/PostFuncBiasReluC8Fp16.S diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.c b/mindspore/lite/nnacl/batch_to_space.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.c rename to mindspore/lite/nnacl/batch_to_space.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h b/mindspore/lite/nnacl/batch_to_space.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h rename to mindspore/lite/nnacl/batch_to_space.h index 4e1398b3d5..04e43e22a6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h +++ b/mindspore/lite/nnacl/batch_to_space.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCH_TO_SPACE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCH_TO_SPACE_H_ +#ifndef MINDSPORE_LITE_NNACL_BATCH_TO_SPACE_H_ +#define MINDSPORE_LITE_NNACL_BATCH_TO_SPACE_H_ #include "nnacl/op_base.h" #define BATCH_TO_SPACE_BLOCK_SHAPE_SIZE 2 @@ -37,4 +37,4 @@ void BatchToSpaceForNHWC(const void *input, void *output, const int *in_shape, i } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCH_TO_SPACE_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_BATCH_TO_SPACE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/batchnorm_parameter.h b/mindspore/lite/nnacl/batchnorm_parameter.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/batchnorm_parameter.h rename to mindspore/lite/nnacl/batchnorm_parameter.h index bee4165bec..8708ed2cb2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/batchnorm_parameter.h +++ b/mindspore/lite/nnacl/batchnorm_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCHNORM_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCHNORM_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_BATCHNORM_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_BATCHNORM_PARAMETER_H_ #include "nnacl/op_base.h" @@ -28,4 +28,4 @@ typedef struct BatchNormParameter { bool fused_; } BatchNormParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCHNORM_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_BATCHNORM_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.c b/mindspore/lite/nnacl/common_func.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.c rename to mindspore/lite/nnacl/common_func.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h b/mindspore/lite/nnacl/common_func.h similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h rename to mindspore/lite/nnacl/common_func.h index 1099ac7902..9528d83055 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h +++ b/mindspore/lite/nnacl/common_func.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_NNACL_COMMON_FUNC_H_ +#define MINDSPORE_LITE_NNACL_COMMON_FUNC_H_ #include #include @@ -59,4 +59,4 @@ void Relu(float *data, size_t element4); } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_NNACL_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h b/mindspore/lite/nnacl/concat_parameter.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h rename to mindspore/lite/nnacl/concat_parameter.h index fba336b755..91b8966319 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h +++ b/mindspore/lite/nnacl/concat_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONCAT_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONCAT_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_CONCAT_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_CONCAT_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -32,4 +32,4 @@ typedef struct ConcatParameter { int64_t count_unit_; } ConcatParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONCAT_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_CONCAT_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h b/mindspore/lite/nnacl/conv_parameter.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h rename to mindspore/lite/nnacl/conv_parameter.h index 2bb6680a14..6a7f3c5a85 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h +++ b/mindspore/lite/nnacl/conv_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONV_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONV_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_CONV_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_CONV_PARAMETER_H_ #ifdef ENABLE_NEON #include @@ -74,4 +74,4 @@ typedef struct SlidingWindowParam { int kernel_step_; } SlidingWindowParam; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONV_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_CONV_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h b/mindspore/lite/nnacl/crop_parameter.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h rename to mindspore/lite/nnacl/crop_parameter.h index 21e6497800..e2ced9876e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h +++ b/mindspore/lite/nnacl/crop_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CROP_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CROP_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_CROP_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_CROP_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -35,4 +35,4 @@ typedef struct CropParameter { int input_dim_; } CropParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CROP_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_CROP_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.c b/mindspore/lite/nnacl/depth_to_space.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.c rename to mindspore/lite/nnacl/depth_to_space.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h b/mindspore/lite/nnacl/depth_to_space.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h rename to mindspore/lite/nnacl/depth_to_space.h index 28bbd83148..9b22b24d1f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h +++ b/mindspore/lite/nnacl/depth_to_space.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_H_ +#ifndef MINDSPORE_LITE_NNACL_DEPTH_TO_SPACE_H_ +#define MINDSPORE_LITE_NNACL_DEPTH_TO_SPACE_H_ #include "nnacl/depth_to_space_parameter.h" #ifdef __cplusplus @@ -25,4 +25,4 @@ void DepthToSpaceForNHWC(const void *input, void *output, int *in_shape, DepthTo } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_H_ +#endif // MINDSPORE_LITE_NNACL_DEPTH_TO_SPACE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h b/mindspore/lite/nnacl/depth_to_space_parameter.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h rename to mindspore/lite/nnacl/depth_to_space_parameter.h index 61fe9937d5..b95c88012a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h +++ b/mindspore/lite/nnacl/depth_to_space_parameter.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ #include "nnacl/op_base.h" typedef struct DepthToSpaceParameter { @@ -29,4 +29,4 @@ typedef struct DepthToSpaceParameter { uint8_t data_type_size_; } DepthToSpaceParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h b/mindspore/lite/nnacl/errorcode.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h rename to mindspore/lite/nnacl/errorcode.h index fbe5c6bf47..a26a095997 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h +++ b/mindspore/lite/nnacl/errorcode.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ERRORCODE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ERRORCODE_H_ +#ifndef MINDSPORE_LITE_NNACL_ERRORCODE_H_ +#define MINDSPORE_LITE_NNACL_ERRORCODE_H_ typedef enum ErrorCodeCommonEnum { NNACL_OK = 0, @@ -54,4 +54,4 @@ typedef enum ErrorCodeInt8OpEnum { NNACL_ERRCODE_OP_INT8_END = 49999 } ErrorCodeInt8OpEnums; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ERRORCODE_H_ +#endif // MINDSPORE_LITE_NNACL_ERRORCODE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.c b/mindspore/lite/nnacl/flatten.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.c rename to mindspore/lite/nnacl/flatten.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.h b/mindspore/lite/nnacl/flatten.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.h rename to mindspore/lite/nnacl/flatten.h index 05bb367ce4..4d59cd8e84 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.h +++ b/mindspore/lite/nnacl/flatten.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FLATTEN_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FLATTEN_H_ +#ifndef MINDSPORE_LITE_NNACL_FLATTEN_H_ +#define MINDSPORE_LITE_NNACL_FLATTEN_H_ #include "nnacl/op_base.h" typedef struct FlattenParameter { @@ -30,4 +30,4 @@ void Flatten(const void *input, void *output, FlattenParameter *flatten_param); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FLATTEN_H_ +#endif // MINDSPORE_LITE_NNACL_FLATTEN_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.c b/mindspore/lite/nnacl/fp16/arithmetic_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.c rename to mindspore/lite/nnacl/fp16/arithmetic_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.h b/mindspore/lite/nnacl/fp16/arithmetic_fp16.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.h rename to mindspore/lite/nnacl/fp16/arithmetic_fp16.h index 25aaa01d4c..5c62221cca 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.h +++ b/mindspore/lite/nnacl/fp16/arithmetic_fp16.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_ARITHMETIC_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_ARITHMETIC_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_ARITHMETIC_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_ARITHMETIC_FP16_H_ #ifdef ENABLE_NEON #include @@ -117,4 +117,4 @@ void TileDimensionsFp16(float16_t *data0, float16_t *data1, float16_t *tile_data } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_ARITHMETIC_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_ARITHMETIC_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/cast_fp16.c b/mindspore/lite/nnacl/fp16/cast_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/cast_fp16.c rename to mindspore/lite/nnacl/fp16/cast_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h b/mindspore/lite/nnacl/fp16/cast_fp16.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h rename to mindspore/lite/nnacl/fp16/cast_fp16.h index 785935d7f3..d3571503db 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h +++ b/mindspore/lite/nnacl/fp16/cast_fp16.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_CAST_FP16_H_ +#define MINDSPORE_LITE_NNACL_CAST_FP16_H_ #include #include "nnacl/op_base.h" @@ -27,4 +27,4 @@ void Float16ToFloat32(const float16_t *input, float *output, int number); #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_CAST_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.c b/mindspore/lite/nnacl/fp16/common_func.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.c rename to mindspore/lite/nnacl/fp16/common_func.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.h b/mindspore/lite/nnacl/fp16/common_func.h similarity index 90% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.h rename to mindspore/lite/nnacl/fp16/common_func.h index deb8e581c8..2faaec4bb0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.h +++ b/mindspore/lite/nnacl/fp16/common_func.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_COMMON_FUNC_H_ +#define MINDSPORE_LITE_NNACL_FP16_COMMON_FUNC_H_ #include #include @@ -48,4 +48,4 @@ void Relu6Fp16(float16_t *data, float16_t *dst, int ele_num); } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_NNACL_FP32_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/concat_fp16.c b/mindspore/lite/nnacl/fp16/concat_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/concat_fp16.c rename to mindspore/lite/nnacl/fp16/concat_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/concat_fp16.h b/mindspore/lite/nnacl/fp16/concat_fp16.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/concat_fp16.h rename to mindspore/lite/nnacl/fp16/concat_fp16.h index 81d272a2f5..786471cbbf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/concat_fp16.h +++ b/mindspore/lite/nnacl/fp16/concat_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONCAT_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONCAT_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_CONCAT_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_CONCAT_FP16_H_ #include "nnacl/op_base.h" @@ -27,4 +27,4 @@ void ConcatFp16(void **input, int input_num, int axis, int **inputs_output_shape } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONCAT_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_CONCAT_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.c b/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.c rename to mindspore/lite/nnacl/fp16/conv_depthwise_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h b/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h rename to mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h index 62cdc98a78..e70ebcfaf6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h +++ b/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ #include "nnacl/conv_parameter.h" #include "nnacl/fp32/conv_depthwise.h" @@ -34,4 +34,4 @@ void DeconvDwC8Fp16(float16_t *output_data, const float16_t *input_data, const f } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.c b/mindspore/lite/nnacl/fp16/conv_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.c rename to mindspore/lite/nnacl/fp16/conv_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h b/mindspore/lite/nnacl/fp16/conv_fp16.h similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h rename to mindspore/lite/nnacl/fp16/conv_fp16.h index db94df0aca..b54624c5ab 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h +++ b/mindspore/lite/nnacl/fp16/conv_fp16.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_CONV_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_CONV_FP16_H_ #include #include "nnacl/conv_parameter.h" @@ -83,4 +83,4 @@ void UnPackWinogradRelu6OutputFp16(const float16_t *src, float16_t *dst, int bat } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_CONV_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/deconv_fp16.c b/mindspore/lite/nnacl/fp16/deconv_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/deconv_fp16.c rename to mindspore/lite/nnacl/fp16/deconv_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/deconv_fp16.h b/mindspore/lite/nnacl/fp16/deconv_fp16.h similarity index 86% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/deconv_fp16.h rename to mindspore/lite/nnacl/fp16/deconv_fp16.h index 0490940181..068e51a412 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/deconv_fp16.h +++ b/mindspore/lite/nnacl/fp16/deconv_fp16.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_DECONV_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_DECONV_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_DECONV_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_DECONV_FP16_H_ #include #include @@ -37,4 +37,4 @@ void PostFuncBiasReluC8Fp16(float16_t *dst, const float16_t *src, const float16_ #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_DECONV_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_DECONV_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.c b/mindspore/lite/nnacl/fp16/matmul_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.c rename to mindspore/lite/nnacl/fp16/matmul_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.h b/mindspore/lite/nnacl/fp16/matmul_fp16.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.h rename to mindspore/lite/nnacl/fp16/matmul_fp16.h index e3d7e8b90e..fae70ba61d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.h +++ b/mindspore/lite/nnacl/fp16/matmul_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_MATMUL_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_MATMUL_H_ +#define MINDSPORE_LITE_NNACL_FP16_MATMUL_H_ #include #include @@ -43,4 +43,4 @@ void MatmulFp16Neon64(const float16_t *a, const float16_t *b, float16_t *c, cons } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_MATMUL_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.c b/mindspore/lite/nnacl/fp16/pack_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.c rename to mindspore/lite/nnacl/fp16/pack_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h b/mindspore/lite/nnacl/fp16/pack_fp16.h similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h rename to mindspore/lite/nnacl/fp16/pack_fp16.h index 5bdb254858..493672b05d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h +++ b/mindspore/lite/nnacl/fp16/pack_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_PACK_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_PACK_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_PACK_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_PACK_FP16_H_ #ifdef ENABLE_NEON #include @@ -70,4 +70,4 @@ void PackNHWC8ToNHWCFp16(float16_t *src, float16_t *dst, int batch, int plane, i } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_PACK_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_PACK_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pooling_fp16.c b/mindspore/lite/nnacl/fp16/pooling_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pooling_fp16.c rename to mindspore/lite/nnacl/fp16/pooling_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pooling_fp16.h b/mindspore/lite/nnacl/fp16/pooling_fp16.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pooling_fp16.h rename to mindspore/lite/nnacl/fp16/pooling_fp16.h index 0f92f67b88..b5a1b38ddb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pooling_fp16.h +++ b/mindspore/lite/nnacl/fp16/pooling_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_POOLING_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_POOLING_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_POOLING_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_POOLING_FP16_H_ #ifdef ENABLE_NEON #include @@ -30,4 +30,4 @@ void MaxPoolingFp16(const float16_t *input_ptr, float16_t *output_ptr, PoolingPa #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_POOLING_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_POOLING_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/reduce_fp16.c b/mindspore/lite/nnacl/fp16/reduce_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/reduce_fp16.c rename to mindspore/lite/nnacl/fp16/reduce_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/reduce_fp16.h b/mindspore/lite/nnacl/fp16/reduce_fp16.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/reduce_fp16.h rename to mindspore/lite/nnacl/fp16/reduce_fp16.h index 12b04ed440..e7066b0256 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/reduce_fp16.h +++ b/mindspore/lite/nnacl/fp16/reduce_fp16.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_REDUCE_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_REDUCE_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_REDUCE_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_REDUCE_FP16_H_ #include "nnacl/op_base.h" -#include "src/runtime/kernel/arm/nnacl/reduce_parameter.h" +#include "nnacl/reduce_parameter.h" #ifdef ENABLE_NEON #include @@ -32,4 +32,4 @@ int ReduceMean(const int outer_size, const int inner_size, const int axis_size, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_REDUCE_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_REDUCE_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/split_fp16.c b/mindspore/lite/nnacl/fp16/split_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/split_fp16.c rename to mindspore/lite/nnacl/fp16/split_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/split_fp16.h b/mindspore/lite/nnacl/fp16/split_fp16.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/split_fp16.h rename to mindspore/lite/nnacl/fp16/split_fp16.h index fc27fdfbb7..fecc15d823 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/split_fp16.h +++ b/mindspore/lite/nnacl/fp16/split_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLITFP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLITFP16_H_ +#ifndef MINDSPORE_LITE_NNACL_SPLITFP16_H_ +#define MINDSPORE_LITE_NNACL_SPLITFP16_H_ #include #include "nnacl/op_base.h" @@ -30,4 +30,4 @@ int DoSplitFp16(float16_t *in_data, float16_t **out_data, const int *input_shape } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ +#endif // MINDSPORE_LITE_NNACL_SPLIT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/transpose_fp16.c b/mindspore/lite/nnacl/fp16/transpose_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/transpose_fp16.c rename to mindspore/lite/nnacl/fp16/transpose_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/transpose_fp16.h b/mindspore/lite/nnacl/fp16/transpose_fp16.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/transpose_fp16.h rename to mindspore/lite/nnacl/fp16/transpose_fp16.h index 6d9793adb5..16975c8c33 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/transpose_fp16.h +++ b/mindspore/lite/nnacl/fp16/transpose_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_TRANSPOSE_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_TRANSPOSE_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_TRANSPOSE_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_TRANSPOSE_FP16_H_ #include "nnacl/op_base.h" #ifdef ENABLE_NEON @@ -49,4 +49,4 @@ void TransposeDim5(float16_t *in_data, float16_t *out_data, int *strides, int *o } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_TRANSPOSE_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_TRANSPOSE_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.c b/mindspore/lite/nnacl/fp16/winograd_transform_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.c rename to mindspore/lite/nnacl/fp16/winograd_transform_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h b/mindspore/lite/nnacl/fp16/winograd_transform_fp16.h similarity index 90% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h rename to mindspore/lite/nnacl/fp16/winograd_transform_fp16.h index 16bbcd5f1a..52f6ae2c82 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h +++ b/mindspore/lite/nnacl/fp16/winograd_transform_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ +#define MINDSPORE_LITE_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ #include #include @@ -53,4 +53,4 @@ void WinogradOutputTransformFp16(const float16_t *gemm_out, float16_t *tmp_out_d } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.c b/mindspore/lite/nnacl/fp16/winograd_utils_fp16.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.c rename to mindspore/lite/nnacl/fp16/winograd_utils_fp16.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.h b/mindspore/lite/nnacl/fp16/winograd_utils_fp16.h similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.h rename to mindspore/lite/nnacl/fp16/winograd_utils_fp16.h index b86f7d2371..99728ca0e2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.h +++ b/mindspore/lite/nnacl/fp16/winograd_utils_fp16.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_UTILS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_UTILS_H_ +#ifndef MINDSPORE_LITE_NNACL_FP16_WINOGRAD_UTILS_H_ +#define MINDSPORE_LITE_NNACL_FP16_WINOGRAD_UTILS_H_ #include #include "nnacl/conv_parameter.h" @@ -64,4 +64,4 @@ OutputTransformUnitFp16Func GetOutputTransFuncFp16(int input_unit, int output_un } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_UTILS_H_ +#endif // MINDSPORE_LITE_NNACL_FP16_WINOGRAD_UTILS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.c b/mindspore/lite/nnacl/fp32/activation.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.c rename to mindspore/lite/nnacl/fp32/activation.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h b/mindspore/lite/nnacl/fp32/activation.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h rename to mindspore/lite/nnacl/fp32/activation.h index 89ce7ec8e8..dd1177e2d4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h +++ b/mindspore/lite/nnacl/fp32/activation.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_H_ +#ifndef MINDSPORE_LITE_NNACL_ACTIVATION_H_ +#define MINDSPORE_LITE_NNACL_ACTIVATION_H_ #include #include "nnacl/op_base.h" @@ -38,4 +38,4 @@ int HSwish(const float *src, int length, float *dst); #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_H_ +#endif // MINDSPORE_LITE_NNACL_ACTIVATION_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.c b/mindspore/lite/nnacl/fp32/arg_min_max.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.c rename to mindspore/lite/nnacl/fp32/arg_min_max.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h b/mindspore/lite/nnacl/fp32/arg_min_max.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h rename to mindspore/lite/nnacl/fp32/arg_min_max.h index 72f613e65b..77a6df5c42 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h +++ b/mindspore/lite/nnacl/fp32/arg_min_max.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARG_MIN_MAX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARG_MIN_MAX_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_ARG_MIN_MAX_H_ +#define MINDSPORE_LITE_NNACL_FP32_ARG_MIN_MAX_H_ #include "nnacl/arg_min_max_parameter.h" @@ -37,4 +37,4 @@ void ArgMinDim3(const float *input, float *output, const int *in_shape, ArgMinMa } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARG_MIN_MAX_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_ARG_MIN_MAX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.c b/mindspore/lite/nnacl/fp32/arithmetic.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.c rename to mindspore/lite/nnacl/fp32/arithmetic.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h b/mindspore/lite/nnacl/fp32/arithmetic.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h rename to mindspore/lite/nnacl/fp32/arithmetic.h index 7a3ff7346e..5d3303ca0b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h +++ b/mindspore/lite/nnacl/fp32/arithmetic.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_H_ +#ifndef MINDSPORE_LITE_NNACL_ARITHMETIC_H_ +#define MINDSPORE_LITE_NNACL_ARITHMETIC_H_ #ifdef ENABLE_NEON #include @@ -112,4 +112,4 @@ int BroadcastGreaterEqual(float *input0, float *input1, float *tile_input0, floa } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_H_ +#endif // MINDSPORE_LITE_NNACL_ARITHMETIC_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.c b/mindspore/lite/nnacl/fp32/arithmetic_self.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.c rename to mindspore/lite/nnacl/fp32/arithmetic_self.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h b/mindspore/lite/nnacl/fp32/arithmetic_self.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h rename to mindspore/lite/nnacl/fp32/arithmetic_self.h index 97ec764142..3b76a42f4a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h +++ b/mindspore/lite/nnacl/fp32/arithmetic_self.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_H_ +#ifndef MINDSPORE_LITE_NNACL_ARITHMETIC_SELF_H_ +#define MINDSPORE_LITE_NNACL_ARITHMETIC_SELF_H_ #ifdef ENABLE_NEON #include @@ -53,4 +53,4 @@ int ElementCeil(float *input, float *output, int number); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_H_ +#endif // MINDSPORE_LITE_NNACL_ARITHMETIC_SELF_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.c b/mindspore/lite/nnacl/fp32/batchnorm.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.c rename to mindspore/lite/nnacl/fp32/batchnorm.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h b/mindspore/lite/nnacl/fp32/batchnorm.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h rename to mindspore/lite/nnacl/fp32/batchnorm.h index 6e2e0c59c2..5d5bc4e387 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h +++ b/mindspore/lite/nnacl/fp32/batchnorm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCHNORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCHNORM_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_BATCHNORM_H_ +#define MINDSPORE_LITE_NNACL_FP32_BATCHNORM_H_ #include "nnacl/op_base.h" #include "nnacl/batchnorm_parameter.h" @@ -34,4 +34,4 @@ void FusedBatchNorm(float *output_ptr, const float *input_ptr, const float *scal } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FUSED_BATCHNORM_H_ +#endif // MINDSPORE_LITE_NNACL_FUSED_BATCHNORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.c b/mindspore/lite/nnacl/fp32/broadcast_to.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.c rename to mindspore/lite/nnacl/fp32/broadcast_to.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h b/mindspore/lite/nnacl/fp32/broadcast_to.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h rename to mindspore/lite/nnacl/fp32/broadcast_to.h index a98978f3c9..d68477435d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h +++ b/mindspore/lite/nnacl/fp32/broadcast_to.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BROADCAST_TO_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BROADCAST_TO_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_BROADCAST_TO_H_ +#define MINDSPORE_LITE_NNACL_FP32_BROADCAST_TO_H_ #ifdef ENABLE_NEON #include @@ -44,4 +44,4 @@ int BroadcastTo(const float *input, BroadcastShapeInfo *shape_info, float *outpu } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BROADCAST_TO_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_BROADCAST_TO_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.c b/mindspore/lite/nnacl/fp32/cast.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.c rename to mindspore/lite/nnacl/fp32/cast.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.h b/mindspore/lite/nnacl/fp32/cast.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.h rename to mindspore/lite/nnacl/fp32/cast.h index edee7906ae..5f4d12383a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.h +++ b/mindspore/lite/nnacl/fp32/cast.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_H_ +#ifndef MINDSPORE_LITE_NNACL_CAST_H_ +#define MINDSPORE_LITE_NNACL_CAST_H_ #ifdef ENABLE_NEON #include @@ -42,4 +42,4 @@ void Float32ToInt32(const float *input, int32_t *output, int number); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_H_ +#endif // MINDSPORE_LITE_NNACL_CAST_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.c b/mindspore/lite/nnacl/fp32/common_func.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.c rename to mindspore/lite/nnacl/fp32/common_func.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.h b/mindspore/lite/nnacl/fp32/common_func.h similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.h rename to mindspore/lite/nnacl/fp32/common_func.h index fbae30c6fb..875f884468 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.h +++ b/mindspore/lite/nnacl/fp32/common_func.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_COMMON_FUNC_H_ +#define MINDSPORE_LITE_NNACL_FP32_COMMON_FUNC_H_ #include #include @@ -82,4 +82,4 @@ void ConvSwFp32Center(float *dst, const float *src, const float *weight, const f } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_NNACL_FP32_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.c b/mindspore/lite/nnacl/fp32/concat.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.c rename to mindspore/lite/nnacl/fp32/concat.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.h b/mindspore/lite/nnacl/fp32/concat.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.h rename to mindspore/lite/nnacl/fp32/concat.h index b80b7ebacc..fd562bbb05 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.h +++ b/mindspore/lite/nnacl/fp32/concat.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONCAT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONCAT_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_CONCAT_H_ +#define MINDSPORE_LITE_NNACL_FP32_CONCAT_H_ #include "nnacl/op_base.h" @@ -27,4 +27,4 @@ void Concat(void **input, int input_num, int axis, int **inputs_output_shape, si } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONCAT_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_CONCAT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.c b/mindspore/lite/nnacl/fp32/constant_of_shape.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.c rename to mindspore/lite/nnacl/fp32/constant_of_shape.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.h b/mindspore/lite/nnacl/fp32/constant_of_shape.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.h rename to mindspore/lite/nnacl/fp32/constant_of_shape.h index 7325ef772c..355871776b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.h +++ b/mindspore/lite/nnacl/fp32/constant_of_shape.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONSTANT_OF_SHAPE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONSTANT_OF_SHAPE_H_ +#ifndef MINDSPORE_LITE_NNACL_CONSTANT_OF_SHAPE_H_ +#define MINDSPORE_LITE_NNACL_CONSTANT_OF_SHAPE_H_ #ifdef ENABLE_NEON #include @@ -37,4 +37,4 @@ int ConstantOfShape(float *output, int tid, ConstantOfShapeParameter *param); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONSTANT_OF_SHAPE_H_ +#endif // MINDSPORE_LITE_NNACL_CONSTANT_OF_SHAPE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.c b/mindspore/lite/nnacl/fp32/conv.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.c rename to mindspore/lite/nnacl/fp32/conv.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.h b/mindspore/lite/nnacl/fp32/conv.h similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.h rename to mindspore/lite/nnacl/fp32/conv.h index d9c094636f..f2d20c3b52 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.h +++ b/mindspore/lite/nnacl/fp32/conv.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_CONV_H_ +#define MINDSPORE_LITE_NNACL_FP32_CONV_H_ #ifdef ENABLE_NEON #include @@ -76,4 +76,4 @@ void Conv3x3Fp32(float *input_data, float *transed_weight, const float *bias_dat } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_CONV_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.c b/mindspore/lite/nnacl/fp32/conv_depthwise.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.c rename to mindspore/lite/nnacl/fp32/conv_depthwise.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h b/mindspore/lite/nnacl/fp32/conv_depthwise.h similarity index 91% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h rename to mindspore/lite/nnacl/fp32/conv_depthwise.h index c1163e7535..2f2a424417 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h +++ b/mindspore/lite/nnacl/fp32/conv_depthwise.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_DEPTHWISE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_DEPTHWISE_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_CONV_DEPTHWISE_H_ +#define MINDSPORE_LITE_NNACL_FP32_CONV_DEPTHWISE_H_ #include "nnacl/conv_parameter.h" @@ -57,4 +57,4 @@ void DeconvDwC4Fp32(float *output_data, const float *input_data, const float *we } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_DEPTHWISE_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_CONV_DEPTHWISE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.c b/mindspore/lite/nnacl/fp32/crop.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.c rename to mindspore/lite/nnacl/fp32/crop.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h b/mindspore/lite/nnacl/fp32/crop.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h rename to mindspore/lite/nnacl/fp32/crop.h index fb616a0a1d..e2b81afc3b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h +++ b/mindspore/lite/nnacl/fp32/crop.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CROP_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CROP_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_CROP_H_ +#define MINDSPORE_LITE_NNACL_FP32_CROP_H_ #include "nnacl/op_base.h" #include "nnacl/crop_parameter.h" @@ -31,4 +31,4 @@ void Crop4DNoParallel(const float *input, float *output, const int *in_shape, co } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CROP_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_CROP_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.c b/mindspore/lite/nnacl/fp32/deconv.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.c rename to mindspore/lite/nnacl/fp32/deconv.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h b/mindspore/lite/nnacl/fp32/deconv.h similarity index 86% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h rename to mindspore/lite/nnacl/fp32/deconv.h index 75d03f91ea..601e91e605 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h +++ b/mindspore/lite/nnacl/fp32/deconv.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_DECONV_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_DECONV_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_DECONV_H_ +#define MINDSPORE_LITE_NNACL_FP32_DECONV_H_ #include "nnacl/pack.h" #include "nnacl/op_base.h" @@ -34,4 +34,4 @@ int DeConvPostFp32C8x8(const float *src, float *tmp_out, const float *bias, floa } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_DECONV_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_DECONV_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/elu.c b/mindspore/lite/nnacl/fp32/elu.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/elu.c rename to mindspore/lite/nnacl/fp32/elu.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/elu.h b/mindspore/lite/nnacl/fp32/elu.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/elu.h rename to mindspore/lite/nnacl/fp32/elu.h index 3a9dc52ddd..623a40120e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/elu.h +++ b/mindspore/lite/nnacl/fp32/elu.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ELU_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ELU_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_ELU_H_ +#define MINDSPORE_LITE_NNACL_FP32_ELU_H_ #include "nnacl/op_base.h" @@ -34,4 +34,4 @@ int Elu(float *input_data, float *output_data, EluParameter *parameter, int task } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ELU_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_ELU_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.c b/mindspore/lite/nnacl/fp32/embedding_lookup.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.c rename to mindspore/lite/nnacl/fp32/embedding_lookup.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.h b/mindspore/lite/nnacl/fp32/embedding_lookup.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.h rename to mindspore/lite/nnacl/fp32/embedding_lookup.h index 44d124f584..0eeda37185 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.h +++ b/mindspore/lite/nnacl/fp32/embedding_lookup.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_EMBEDDING_LOOKUP_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_EMBEDDING_LOOKUP_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_EMBEDDING_LOOKUP_H_ +#define MINDSPORE_LITE_NNACL_FP32_EMBEDDING_LOOKUP_H_ #include "nnacl/op_base.h" @@ -37,4 +37,4 @@ int EmbeddingLookup(float *input_data, int *ids, float *output_data, EmbeddingLo } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_EMBEDDING_LOOKUP_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_EMBEDDING_LOOKUP_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.c b/mindspore/lite/nnacl/fp32/expandDims.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.c rename to mindspore/lite/nnacl/fp32/expandDims.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.h b/mindspore/lite/nnacl/fp32/expandDims.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.h rename to mindspore/lite/nnacl/fp32/expandDims.h index 5adbf6c07d..1df637c947 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.h +++ b/mindspore/lite/nnacl/fp32/expandDims.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_EXPANDDIMS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_EXPANDDIMS_H_ +#ifndef MINDSPORE_LITE_NNACL_EXPANDDIMS_H_ +#define MINDSPORE_LITE_NNACL_EXPANDDIMS_H_ #include "nnacl/op_base.h" @@ -32,4 +32,4 @@ int ExpandDims(float *input_ptr, float *output_ptr, size_t data_size); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_EXPANDDIMS_H_ +#endif // MINDSPORE_LITE_NNACL_EXPANDDIMS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.c b/mindspore/lite/nnacl/fp32/fill.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.c rename to mindspore/lite/nnacl/fp32/fill.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.h b/mindspore/lite/nnacl/fp32/fill.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.h rename to mindspore/lite/nnacl/fp32/fill.h index b972621f59..3464a64fd5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.h +++ b/mindspore/lite/nnacl/fp32/fill.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FILL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FILL_H_ +#ifndef MINDSPORE_LITE_NNACL_FILL_H_ +#define MINDSPORE_LITE_NNACL_FILL_H_ #ifdef ENABLE_NEON #include @@ -38,4 +38,4 @@ int Fill(float *output, int size, float data); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FILL_H_ +#endif // MINDSPORE_LITE_NNACL_FILL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.c b/mindspore/lite/nnacl/fp32/gather.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.c rename to mindspore/lite/nnacl/fp32/gather.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.h b/mindspore/lite/nnacl/fp32/gather.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.h rename to mindspore/lite/nnacl/fp32/gather.h index c94ff03c59..25438f6bf4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.h +++ b/mindspore/lite/nnacl/fp32/gather.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHER_H_ +#ifndef MINDSPORE_LITE_NNACL_GATHER_H_ +#define MINDSPORE_LITE_NNACL_GATHER_H_ #include "nnacl/op_base.h" @@ -36,4 +36,4 @@ int GatherInt32(const int32_t *input, int outer_size, int inner_size, int limit, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHER_H_ +#endif // MINDSPORE_LITE_NNACL_GATHER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.c b/mindspore/lite/nnacl/fp32/gatherNd.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.c rename to mindspore/lite/nnacl/fp32/gatherNd.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.h b/mindspore/lite/nnacl/fp32/gatherNd.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.h rename to mindspore/lite/nnacl/fp32/gatherNd.h index 4d089dc2c6..467c94b974 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.h +++ b/mindspore/lite/nnacl/fp32/gatherNd.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHERND_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHERND_H_ +#ifndef MINDSPORE_LITE_NNACL_GATHERND_H_ +#define MINDSPORE_LITE_NNACL_GATHERND_H_ #include "nnacl/op_base.h" @@ -32,4 +32,4 @@ int GatherNd(float *input, float *output, int *in_offset, int area, int count); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHERND_H_ +#endif // MINDSPORE_LITE_NNACL_GATHERND_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/leaky_relu.c b/mindspore/lite/nnacl/fp32/leaky_relu.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/leaky_relu.c rename to mindspore/lite/nnacl/fp32/leaky_relu.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/leaky_relu.h b/mindspore/lite/nnacl/fp32/leaky_relu.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/leaky_relu.h rename to mindspore/lite/nnacl/fp32/leaky_relu.h index 808f52aa67..6a19109e93 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/leaky_relu.h +++ b/mindspore/lite/nnacl/fp32/leaky_relu.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_H_ +#ifndef MINDSPORE_LITE_NNACL_PRELU_H_ +#define MINDSPORE_LITE_NNACL_PRELU_H_ #include "nnacl/op_base.h" #include "nnacl/leaky_relu_parameter.h" @@ -27,4 +27,4 @@ void DoLeakyRelu(float *input, float *output, LeakyReluParameter *prelu_param_, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_H_ +#endif // MINDSPORE_LITE_NNACL_PRELU_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.c b/mindspore/lite/nnacl/fp32/local_response_norm.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.c rename to mindspore/lite/nnacl/fp32/local_response_norm.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h b/mindspore/lite/nnacl/fp32/local_response_norm.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h rename to mindspore/lite/nnacl/fp32/local_response_norm.h index c468ffaf4e..5d0d92e8e9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h +++ b/mindspore/lite/nnacl/fp32/local_response_norm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LOCAL_RESPONSE_NORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LOCAL_RESPONSE_NORM_H_ +#ifndef MINDSPORE_LITE_NNACL_LOCAL_RESPONSE_NORM_H_ +#define MINDSPORE_LITE_NNACL_LOCAL_RESPONSE_NORM_H_ #include "nnacl/op_base.h" @@ -36,4 +36,4 @@ int LocalResponseNorm(float *input_ptr, int out_size, int channel, float *output } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LOCAL_RESPONSE_NORM_H_ +#endif // MINDSPORE_LITE_NNACL_LOCAL_RESPONSE_NORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.c b/mindspore/lite/nnacl/fp32/lstm.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.c rename to mindspore/lite/nnacl/fp32/lstm.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h b/mindspore/lite/nnacl/fp32/lstm.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h rename to mindspore/lite/nnacl/fp32/lstm.h index 9ab5d7c137..2ded8758d8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h +++ b/mindspore/lite/nnacl/fp32/lstm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_LSTM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_LSTM_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_LSTM_H_ +#define MINDSPORE_LITE_NNACL_FP32_LSTM_H_ #include "nnacl/op_base.h" @@ -39,4 +39,4 @@ void Lstm(float *output, const float *input, const float *weight_i, const float } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_LSTM_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_LSTM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.c b/mindspore/lite/nnacl/fp32/matmul.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.c rename to mindspore/lite/nnacl/fp32/matmul.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h b/mindspore/lite/nnacl/fp32/matmul.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h rename to mindspore/lite/nnacl/fp32/matmul.h index e612d7c5a3..7459e426ea 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h +++ b/mindspore/lite/nnacl/fp32/matmul.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_MATMUL_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_MATMUL_H_ +#define MINDSPORE_LITE_NNACL_FP32_MATMUL_H_ #include #include @@ -39,4 +39,4 @@ void MatmulFloatNeon64(const float *a, const float *b, float *c, const float *bi } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_MATMUL_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.c b/mindspore/lite/nnacl/fp32/one_hot.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.c rename to mindspore/lite/nnacl/fp32/one_hot.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.h b/mindspore/lite/nnacl/fp32/one_hot.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.h rename to mindspore/lite/nnacl/fp32/one_hot.h index 0a1e28cf86..323ca292be 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.h +++ b/mindspore/lite/nnacl/fp32/one_hot.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ONE_HOT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ONE_HOT_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_ONE_HOT_H_ +#define MINDSPORE_LITE_NNACL_FP32_ONE_HOT_H_ #ifdef ENABLE_NEON #include @@ -41,4 +41,4 @@ int OneHot(const int *indices, float *output, const OneHotParameter *one_hot_par } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ONE_HOT_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_ONE_HOT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.c b/mindspore/lite/nnacl/fp32/pad.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.c rename to mindspore/lite/nnacl/fp32/pad.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.h b/mindspore/lite/nnacl/fp32/pad.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.h rename to mindspore/lite/nnacl/fp32/pad.h index 60374c5833..ad973cba9e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.h +++ b/mindspore/lite/nnacl/fp32/pad.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PAD_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_PAD_H_ +#define MINDSPORE_LITE_NNACL_FP32_PAD_H_ #ifdef ENABLE_NEON #include @@ -33,4 +33,4 @@ void Pad(const float *input_data, float *output_data, const int *input_shape, co } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PAD_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_PAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.c b/mindspore/lite/nnacl/fp32/pooling.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.c rename to mindspore/lite/nnacl/fp32/pooling.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.h b/mindspore/lite/nnacl/fp32/pooling.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.h rename to mindspore/lite/nnacl/fp32/pooling.h index 02a5275b15..c8c90fca64 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.h +++ b/mindspore/lite/nnacl/fp32/pooling.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_POOLING_H_ +#define MINDSPORE_LITE_NNACL_FP32_POOLING_H_ #ifdef ENABLE_NEON #include @@ -34,4 +34,4 @@ void MaxPooling(const float *input_ptr, float *output_ptr, PoolingParameter *poo } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_POOLING_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/prelu.c b/mindspore/lite/nnacl/fp32/prelu.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/prelu.c rename to mindspore/lite/nnacl/fp32/prelu.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/prelu.h b/mindspore/lite/nnacl/fp32/prelu.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/prelu.h rename to mindspore/lite/nnacl/fp32/prelu.h index e92717a4ae..671f76b342 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/prelu.h +++ b/mindspore/lite/nnacl/fp32/prelu.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PRELU_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PRELU_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_PRELU_H_ +#define MINDSPORE_LITE_NNACL_FP32_PRELU_H_ #include "nnacl/op_base.h" #include "nnacl/prelu_parameter.h" @@ -27,4 +27,4 @@ void DoPRelu(float *input, float *output, PReluParameter *prelu_param_, int task } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PRELU_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_PRELU_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.c b/mindspore/lite/nnacl/fp32/range.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.c rename to mindspore/lite/nnacl/fp32/range.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.h b/mindspore/lite/nnacl/fp32/range.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.h rename to mindspore/lite/nnacl/fp32/range.h index 72eeebab00..5e28d59fbd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.h +++ b/mindspore/lite/nnacl/fp32/range.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANGE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANGE_H_ +#ifndef MINDSPORE_LITE_NNACL_RANGE_H_ +#define MINDSPORE_LITE_NNACL_RANGE_H_ #include "nnacl/op_base.h" @@ -35,4 +35,4 @@ void Range(float *output_ptr, int start, int limit, int delta); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANGE_H_ +#endif // MINDSPORE_LITE_NNACL_RANGE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.c b/mindspore/lite/nnacl/fp32/rank.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.c rename to mindspore/lite/nnacl/fp32/rank.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.h b/mindspore/lite/nnacl/fp32/rank.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.h rename to mindspore/lite/nnacl/fp32/rank.h index 70c47fd870..6e66efb816 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.h +++ b/mindspore/lite/nnacl/fp32/rank.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANK_H_ +#ifndef MINDSPORE_LITE_NNACL_RANK_H_ +#define MINDSPORE_LITE_NNACL_RANK_H_ #include "nnacl/op_base.h" @@ -26,4 +26,4 @@ void Rank(float *output, int rank); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANK_H_ +#endif // MINDSPORE_LITE_NNACL_RANK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.c b/mindspore/lite/nnacl/fp32/reduce.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.c rename to mindspore/lite/nnacl/fp32/reduce.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h b/mindspore/lite/nnacl/fp32/reduce.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h rename to mindspore/lite/nnacl/fp32/reduce.h index db0fa5cad7..3a80658393 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h +++ b/mindspore/lite/nnacl/fp32/reduce.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_REDUCE_H_ +#define MINDSPORE_LITE_NNACL_FP32_REDUCE_H_ #include "nnacl/op_base.h" -#include "src/runtime/kernel/arm/nnacl/reduce_parameter.h" +#include "nnacl/reduce_parameter.h" #ifdef __cplusplus @@ -39,4 +39,4 @@ int ReduceSumSquare(const int outer_size, const int inner_size, const int axis_s } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_REDUCE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/resize.c b/mindspore/lite/nnacl/fp32/resize.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/resize.c rename to mindspore/lite/nnacl/fp32/resize.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/resize.h b/mindspore/lite/nnacl/fp32/resize.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/resize.h rename to mindspore/lite/nnacl/fp32/resize.h index 17fdeacba6..a6b76cbdcf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/resize.h +++ b/mindspore/lite/nnacl/fp32/resize.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_RESIZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_RESIZE_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_RESIZE_H_ +#define MINDSPORE_LITE_NNACL_FP32_RESIZE_H_ #ifdef ENABLE_NEON #include @@ -34,4 +34,4 @@ int ResizeNearestNeighbor(const float *input_data, float *output_data, const int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_RESIZE_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_RESIZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.c b/mindspore/lite/nnacl/fp32/reverse.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.c rename to mindspore/lite/nnacl/fp32/reverse.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.h b/mindspore/lite/nnacl/fp32/reverse.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.h rename to mindspore/lite/nnacl/fp32/reverse.h index 4ac13b5d42..d8e58d17bd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.h +++ b/mindspore/lite/nnacl/fp32/reverse.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_H_ +#ifndef MINDSPORE_LITE_NNACL_REVERSE_H_ +#define MINDSPORE_LITE_NNACL_REVERSE_H_ #ifdef ENABLE_NEON #include @@ -38,4 +38,4 @@ int Reverse(const float *input, float *output, size_t elem_size, int *index); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_H_ +#endif // MINDSPORE_LITE_NNACL_REVERSE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/roi_pooling.c b/mindspore/lite/nnacl/fp32/roi_pooling.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/roi_pooling.c rename to mindspore/lite/nnacl/fp32/roi_pooling.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/roi_pooling.h b/mindspore/lite/nnacl/fp32/roi_pooling.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/roi_pooling.h rename to mindspore/lite/nnacl/fp32/roi_pooling.h index 39181fcc85..8bebacce40 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/roi_pooling.h +++ b/mindspore/lite/nnacl/fp32/roi_pooling.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ROI_POOLING_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ROI_POOLING_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_ROI_POOLING_H_ +#define MINDSPORE_LITE_NNACL_FP32_ROI_POOLING_H_ #include "nnacl/op_base.h" @@ -45,4 +45,4 @@ int ROIPooling(float *in_ptr, float *out_ptr, float *roi, int tid, ROIPoolingPar } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ROI_POOLING_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_ROI_POOLING_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.c b/mindspore/lite/nnacl/fp32/slice.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.c rename to mindspore/lite/nnacl/fp32/slice.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.h b/mindspore/lite/nnacl/fp32/slice.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.h rename to mindspore/lite/nnacl/fp32/slice.h index 1eec9f0887..ccb66c66cc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.h +++ b/mindspore/lite/nnacl/fp32/slice.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SLICE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SLICE_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_SLICE_H_ +#define MINDSPORE_LITE_NNACL_FP32_SLICE_H_ #include "nnacl/op_base.h" #include "nnacl/slice_parameter.h" @@ -29,4 +29,4 @@ void DoSliceNoParallel(const float *input, float *output, SliceParameter *param) } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SLICE_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_SLICE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.c b/mindspore/lite/nnacl/fp32/softmax.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.c rename to mindspore/lite/nnacl/fp32/softmax.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.h b/mindspore/lite/nnacl/fp32/softmax.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.h rename to mindspore/lite/nnacl/fp32/softmax.h index 10986829ad..3d2f220242 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.h +++ b/mindspore/lite/nnacl/fp32/softmax.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_SOFTMAX_H_ +#define MINDSPORE_LITE_NNACL_FP32_SOFTMAX_H_ #include "nnacl/op_base.h" #include "nnacl/softmax_parameter.h" @@ -27,4 +27,4 @@ void Softmax(const float *input_ptr, float *output_ptr, float *sum_data, Softmax } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_SOFTMAX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.c b/mindspore/lite/nnacl/fp32/space_to_batch.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.c rename to mindspore/lite/nnacl/fp32/space_to_batch.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h b/mindspore/lite/nnacl/fp32/space_to_batch.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h rename to mindspore/lite/nnacl/fp32/space_to_batch.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.c b/mindspore/lite/nnacl/fp32/space_to_depth.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.c rename to mindspore/lite/nnacl/fp32/space_to_depth.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h b/mindspore/lite/nnacl/fp32/space_to_depth.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h rename to mindspore/lite/nnacl/fp32/space_to_depth.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.c b/mindspore/lite/nnacl/fp32/stack.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.c rename to mindspore/lite/nnacl/fp32/stack.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.h b/mindspore/lite/nnacl/fp32/stack.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.h rename to mindspore/lite/nnacl/fp32/stack.h index 64afbd96fc..2bc8ed8af0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.h +++ b/mindspore/lite/nnacl/fp32/stack.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STACK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STACK_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_STACK_H_ +#define MINDSPORE_LITE_NNACL_FP32_STACK_H_ #include "nnacl/op_base.h" @@ -31,4 +31,4 @@ void DoStack(const float *const *inputs, size_t input_num, int *in_shape, size_t } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STACK_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_STACK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.c b/mindspore/lite/nnacl/fp32/strassen_matmul.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.c rename to mindspore/lite/nnacl/fp32/strassen_matmul.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h b/mindspore/lite/nnacl/fp32/strassen_matmul.h similarity index 86% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h rename to mindspore/lite/nnacl/fp32/strassen_matmul.h index a6c0b40c87..cd0dde8b83 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h +++ b/mindspore/lite/nnacl/fp32/strassen_matmul.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STRASSEN_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STRASSEN_MATMUL_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_STRASSEN_MATMUL_H_ +#define MINDSPORE_LITE_NNACL_FP32_STRASSEN_MATMUL_H_ #include #include "nnacl/pack.h" @@ -42,4 +42,4 @@ int StrassenMatmul(const float *a_ptr, const float *b_ptr, float *c_ptr, Strasse } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STRASSEN_MATMUL_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_STRASSEN_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/tile.c b/mindspore/lite/nnacl/fp32/tile.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/tile.c rename to mindspore/lite/nnacl/fp32/tile.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/tile.h b/mindspore/lite/nnacl/fp32/tile.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/tile.h rename to mindspore/lite/nnacl/fp32/tile.h index b7eff156cc..967b7ff524 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/tile.h +++ b/mindspore/lite/nnacl/fp32/tile.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TILE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TILE_H_ +#ifndef MINDSPORE_LITE_NNACL_TILE_H_ +#define MINDSPORE_LITE_NNACL_TILE_H_ #include "nnacl/op_base.h" @@ -37,4 +37,4 @@ void Tile(float *input_data, float *output_data, TileParameter *parameter); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TILE_H_ +#endif // MINDSPORE_LITE_NNACL_TILE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.c b/mindspore/lite/nnacl/fp32/topk.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.c rename to mindspore/lite/nnacl/fp32/topk.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h b/mindspore/lite/nnacl/fp32/topk.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h rename to mindspore/lite/nnacl/fp32/topk.h index d959cf144d..4a8abd3099 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h +++ b/mindspore/lite/nnacl/fp32/topk.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TOPK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TOPK_H_ +#ifndef MINDSPORE_LITE_NNACL_TOPK_H_ +#define MINDSPORE_LITE_NNACL_TOPK_H_ #include "nnacl/op_base.h" @@ -41,4 +41,4 @@ void Topk(float *input_data, float *output_data, int32_t *output_index, TopkPara } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TOPK_H_ +#endif // MINDSPORE_LITE_NNACL_TOPK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unique.c b/mindspore/lite/nnacl/fp32/unique.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unique.c rename to mindspore/lite/nnacl/fp32/unique.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unique.h b/mindspore/lite/nnacl/fp32/unique.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unique.h rename to mindspore/lite/nnacl/fp32/unique.h index 8765a566ed..2e48d2b33b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unique.h +++ b/mindspore/lite/nnacl/fp32/unique.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNIQUE_H -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNIQUE_H +#ifndef MINDSPORE_LITE_NNACL_UNIQUE_H +#define MINDSPORE_LITE_NNACL_UNIQUE_H #include "nnacl/op_base.h" @@ -31,4 +31,4 @@ void Unique(float *input, int input_len, float *output0, int *output0_len, int * } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNIQUE_H +#endif // MINDSPORE_LITE_NNACL_UNIQUE_H diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.c b/mindspore/lite/nnacl/fp32/unsqueeze.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.c rename to mindspore/lite/nnacl/fp32/unsqueeze.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h b/mindspore/lite/nnacl/fp32/unsqueeze.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h rename to mindspore/lite/nnacl/fp32/unsqueeze.h index 540916e1f0..9adcba8068 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h +++ b/mindspore/lite/nnacl/fp32/unsqueeze.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSQUEEZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSQUEEZE_H_ +#ifndef MINDSPORE_LITE_NNACL_UNSQUEEZE_H_ +#define MINDSPORE_LITE_NNACL_UNSQUEEZE_H_ #include "nnacl/op_base.h" @@ -35,4 +35,4 @@ int Unsqueeze(const int8_t *input_ptr, int8_t *output_ptr, size_t data_size); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSQUEEZE_H_ +#endif // MINDSPORE_LITE_NNACL_UNSQUEEZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/arithmetic_grad.c b/mindspore/lite/nnacl/fp32_grad/arithmetic_grad.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/arithmetic_grad.c rename to mindspore/lite/nnacl/fp32_grad/arithmetic_grad.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/arithmetic_grad.h b/mindspore/lite/nnacl/fp32_grad/arithmetic_grad.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/arithmetic_grad.h rename to mindspore/lite/nnacl/fp32_grad/arithmetic_grad.h index e08c895b42..0ac5c7273c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/arithmetic_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/arithmetic_grad.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_ARITHMETIC_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_ARITHMETIC_GRAD_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_GRAD_ARITHMETIC_GRAD_H_ +#define MINDSPORE_LITE_NNACL_FP32_GRAD_ARITHMETIC_GRAD_H_ #ifdef __cplusplus extern "C" { @@ -25,4 +25,4 @@ void ElementMulAndDivNegSquare(const float *a, const float *b, const float *deno } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARITHMETIC_GRAD_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_ARITHMETIC_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/batch_norm.c b/mindspore/lite/nnacl/fp32_grad/batch_norm.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/batch_norm.c rename to mindspore/lite/nnacl/fp32_grad/batch_norm.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/batch_norm.h b/mindspore/lite/nnacl/fp32_grad/batch_norm.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/batch_norm.h rename to mindspore/lite/nnacl/fp32_grad/batch_norm.h index 6d1a0fec59..488ef98980 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/batch_norm.h +++ b/mindspore/lite/nnacl/fp32_grad/batch_norm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCH_NORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCH_NORM_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_BATCH_NORM_H_ +#define MINDSPORE_LITE_NNACL_FP32_BATCH_NORM_H_ typedef struct bnParameter { int batch; @@ -43,4 +43,4 @@ void NormalizeDelta(const float *x, const float *mean, const float *variance, co } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCH_NORM_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_BATCH_NORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/gemm.c b/mindspore/lite/nnacl/fp32_grad/gemm.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/gemm.c rename to mindspore/lite/nnacl/fp32_grad/gemm.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/gemm.h b/mindspore/lite/nnacl/fp32_grad/gemm.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/gemm.h rename to mindspore/lite/nnacl/fp32_grad/gemm.h index c98f754ba1..ab7007675c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/gemm.h +++ b/mindspore/lite/nnacl/fp32_grad/gemm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_GEMM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_GEMM_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_GRAD_GEMM_H_ +#define MINDSPORE_LITE_NNACL_FP32_GRAD_GEMM_H_ #ifdef __cplusplus extern "C" { @@ -26,4 +26,4 @@ void gemm(int transpose_a, int transpose_b, int M, int N, int K, float alpha, fl } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_GEMM_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_GRAD_GEMM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.c b/mindspore/lite/nnacl/fp32_grad/pack_ext.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.c rename to mindspore/lite/nnacl/fp32_grad/pack_ext.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.h b/mindspore/lite/nnacl/fp32_grad/pack_ext.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.h rename to mindspore/lite/nnacl/fp32_grad/pack_ext.h index 72840f40fc..9a7f486fa0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.h +++ b/mindspore/lite/nnacl/fp32_grad/pack_ext.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_EXT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_EXT_H_ +#ifndef MINDSPORE_LITE_NNACL_PACK_EXT_H_ +#define MINDSPORE_LITE_NNACL_PACK_EXT_H_ #include "nnacl/conv_parameter.h" @@ -29,4 +29,4 @@ void col2im_hwc(const float *data_col, float *data_im, ConvParameter *conv_param } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_EXT_H +#endif // MINDSPORE_LITE_NNACL_PACK_EXT_H diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.c b/mindspore/lite/nnacl/fp32_grad/pooling_grad.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.c rename to mindspore/lite/nnacl/fp32_grad/pooling_grad.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.h b/mindspore/lite/nnacl/fp32_grad/pooling_grad.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.h rename to mindspore/lite/nnacl/fp32_grad/pooling_grad.h index c924427582..e8ba74b48d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/pooling_grad.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_POOLING_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_POOLING_GRAD_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_GRAD_POOLING_GRAD_H_ +#define MINDSPORE_LITE_NNACL_FP32_GRAD_POOLING_GRAD_H_ #include "nnacl/fp32/pooling.h" @@ -28,4 +28,4 @@ void MaxPoolingGrad(const float *dy, const int *indices_ptr, float *output_ptr, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GRAD_POOLING_GRAD_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_GRAD_POOLING_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/reduce_grad.c b/mindspore/lite/nnacl/fp32_grad/reduce_grad.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/reduce_grad.c rename to mindspore/lite/nnacl/fp32_grad/reduce_grad.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/reduce_grad.h b/mindspore/lite/nnacl/fp32_grad/reduce_grad.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/reduce_grad.h rename to mindspore/lite/nnacl/fp32_grad/reduce_grad.h index fd427a5ab7..814fdace08 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/reduce_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/reduce_grad.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_GRAD_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_REDUCE_GRAD_H_ +#define MINDSPORE_LITE_NNACL_FP32_REDUCE_GRAD_H_ #include #include @@ -28,4 +28,4 @@ void ReduceSumByAxes(const float *input, const int *input_dims, float *output, c #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_GRAD_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_REDUCE_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/softmax_grad.h b/mindspore/lite/nnacl/fp32_grad/softmax_grad.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/softmax_grad.h rename to mindspore/lite/nnacl/fp32_grad/softmax_grad.h index 89360b8792..726b6ae271 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32_grad/softmax_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/softmax_grad.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_GRAD_H_ +#ifndef MINDSPORE_LITE_NNACL_FP32_SOFTMAX_GRAD_H_ +#define MINDSPORE_LITE_NNACL_FP32_SOFTMAX_GRAD_H_ #include "nnacl/op_base.h" @@ -26,4 +26,4 @@ typedef struct SoftmaxCrossEntropyParameter { int n_dim_; int input_shape_[5]; } SoftmaxCrossEntropyParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_GRAD_H_ +#endif // MINDSPORE_LITE_NNACL_FP32_SOFTMAX_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/add_int8.c b/mindspore/lite/nnacl/int8/add_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/add_int8.c rename to mindspore/lite/nnacl/int8/add_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/add_int8.h b/mindspore/lite/nnacl/int8/add_int8.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/add_int8.h rename to mindspore/lite/nnacl/int8/add_int8.h index d26c8943d0..92b7e9e53f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/add_int8.h +++ b/mindspore/lite/nnacl/int8/add_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ADD_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ADD_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_ADD_INT8_H_ +#define MINDSPORE_LITE_NNACL_ADD_INT8_H_ #include "nnacl/op_base.h" @@ -59,4 +59,4 @@ int32x4_t ClacScaledInput(int32x4_t input, int32x4_t left_shift_result_vec, int3 int32x4_t right_shift_vec); #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ADD_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_ADD_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.c b/mindspore/lite/nnacl/int8/arg_min_max_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.c rename to mindspore/lite/nnacl/int8/arg_min_max_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h b/mindspore/lite/nnacl/int8/arg_min_max_int8.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h rename to mindspore/lite/nnacl/int8/arg_min_max_int8.h index 230d8391a8..7827fce908 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h +++ b/mindspore/lite/nnacl/int8/arg_min_max_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARG_MIN_MAX_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARG_MIN_MAX_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_ARG_MIN_MAX_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_ARG_MIN_MAX_INT8_H_ #include "nnacl/arg_min_max_parameter.h" #include "nnacl/quantization/quantize.h" @@ -38,4 +38,4 @@ void Int8ArgMinMaxDim3(const int8_t *input, int8_t *output, const int *in_shape, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARG_MIN_MAX_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_ARG_MIN_MAX_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.c b/mindspore/lite/nnacl/int8/arithmetic_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.c rename to mindspore/lite/nnacl/int8/arithmetic_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h b/mindspore/lite/nnacl/int8/arithmetic_int8.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h rename to mindspore/lite/nnacl/int8/arithmetic_int8.h index 3c59da43b2..b442092200 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h +++ b/mindspore/lite/nnacl/int8/arithmetic_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_ARITHMETIC_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_ARITHMETIC_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -41,4 +41,4 @@ int ElementGreaterEqualInt8(int8_t *input0, int8_t *input1, int8_t *output, int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_ARITHMETIC_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.c b/mindspore/lite/nnacl/int8/arithmetic_self_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.c rename to mindspore/lite/nnacl/int8/arithmetic_self_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h b/mindspore/lite/nnacl/int8/arithmetic_self_int8.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h rename to mindspore/lite/nnacl/int8/arithmetic_self_int8.h index 6b7df914c1..3eb7b57d54 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h +++ b/mindspore/lite/nnacl/int8/arithmetic_self_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ #ifdef ENABLE_NEON #include @@ -54,4 +54,4 @@ int Int8ElementLogicalNot(int8_t *input, int8_t *output, int element_size, Arith } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.c b/mindspore/lite/nnacl/int8/batch_to_space_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.c rename to mindspore/lite/nnacl/int8/batch_to_space_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h b/mindspore/lite/nnacl/int8/batch_to_space_int8.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h rename to mindspore/lite/nnacl/int8/batch_to_space_int8.h index a58362f307..ce2b3f3a85 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h +++ b/mindspore/lite/nnacl/int8/batch_to_space_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -29,4 +29,4 @@ void BatchToSpaceForNHWCInt8(const int8_t *input, int8_t *output, const int *in_ } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.c b/mindspore/lite/nnacl/int8/batchnorm_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.c rename to mindspore/lite/nnacl/int8/batchnorm_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.h b/mindspore/lite/nnacl/int8/batchnorm_int8.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.h rename to mindspore/lite/nnacl/int8/batchnorm_int8.h index 16c24ed417..95f59f0401 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.h +++ b/mindspore/lite/nnacl/int8/batchnorm_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCHNORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCHNORM_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_BATCHNORM_H_ +#define MINDSPORE_LITE_NNACL_INT8_BATCHNORM_H_ #include "nnacl/op_base.h" #include "nnacl/batchnorm_parameter.h" @@ -31,4 +31,4 @@ void BatchNormInt8(int8_t *output_ptr, const int8_t *input_ptr, const float *alp } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCHNORM_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_BATCHNORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.c b/mindspore/lite/nnacl/int8/common_func.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.c rename to mindspore/lite/nnacl/int8/common_func.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.h b/mindspore/lite/nnacl/int8/common_func.h similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.h rename to mindspore/lite/nnacl/int8/common_func.h index a5b8aa2f8b..bc8b35a0b8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.h +++ b/mindspore/lite/nnacl/int8/common_func.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_COMMON_FUNC_H_ +#define MINDSPORE_LITE_NNACL_INT8_COMMON_FUNC_H_ #include #include @@ -55,4 +55,4 @@ void ConvDwInt8Center(int8_t *dst, const int16_t *src, const int16_t *weight, co } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_NNACL_FP32_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.c b/mindspore/lite/nnacl/int8/concat_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.c rename to mindspore/lite/nnacl/int8/concat_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.h b/mindspore/lite/nnacl/int8/concat_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.h rename to mindspore/lite/nnacl/int8/concat_int8.h index 17ef0a69c7..2c2f9d05d5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.h +++ b/mindspore/lite/nnacl/int8/concat_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONCAT_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONCAT_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_CONCAT_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_CONCAT_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/concat_parameter.h" @@ -29,4 +29,4 @@ void Int8Concat(int8_t **inputs, int8_t *output_ptr, ConcatParameter *para, int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONCAT_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_CONCAT_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.c b/mindspore/lite/nnacl/int8/conv_depthwise_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.c rename to mindspore/lite/nnacl/int8/conv_depthwise_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h b/mindspore/lite/nnacl/int8/conv_depthwise_int8.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h rename to mindspore/lite/nnacl/int8/conv_depthwise_int8.h index 1e207dbcd8..19a4ad0fd8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h +++ b/mindspore/lite/nnacl/int8/conv_depthwise_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_DEPTHWISE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_DEPTHWISE_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_CONV_DEPTHWISE_H_ +#define MINDSPORE_LITE_NNACL_INT8_CONV_DEPTHWISE_H_ #include "nnacl/conv_parameter.h" #include "nnacl/fp32/conv_depthwise.h" @@ -33,4 +33,4 @@ void DeconvDwInt8(int8_t *output_data, int32_t *output_buffer, const int16_t *in } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_DEPTHWISE_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_CONV_DEPTHWISE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.c b/mindspore/lite/nnacl/int8/conv_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.c rename to mindspore/lite/nnacl/int8/conv_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.h b/mindspore/lite/nnacl/int8/conv_int8.h similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.h rename to mindspore/lite/nnacl/int8/conv_int8.h index ff2b9f39b0..730b031cef 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.h +++ b/mindspore/lite/nnacl/int8/conv_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_CONV_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_CONV_INT8_H_ #ifdef ENABLE_NEON #include @@ -60,4 +60,4 @@ void Conv3x3Int8(int16_t *input_data, int16_t *transed_weight, const int32_t *bi } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_CONV_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.c b/mindspore/lite/nnacl/int8/crop_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.c rename to mindspore/lite/nnacl/int8/crop_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.h b/mindspore/lite/nnacl/int8/crop_int8.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.h rename to mindspore/lite/nnacl/int8/crop_int8.h index c5b08b7d3d..45f50b3a4b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.h +++ b/mindspore/lite/nnacl/int8/crop_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CROP_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CROP_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_CROP_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_CROP_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/crop_parameter.h" @@ -31,4 +31,4 @@ void Int8Crop4D(const int8_t *input, int8_t *output, int task_id, CropParameter } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CROP_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_CROP_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.c b/mindspore/lite/nnacl/int8/deconv.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.c rename to mindspore/lite/nnacl/int8/deconv.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h b/mindspore/lite/nnacl/int8/deconv.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h rename to mindspore/lite/nnacl/int8/deconv.h index 6ee0880324..339f6cb40e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h +++ b/mindspore/lite/nnacl/int8/deconv.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DECONV_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DECONV_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_DECONV_H_ +#define MINDSPORE_LITE_NNACL_INT8_DECONV_H_ #include #include "nnacl/pack.h" @@ -43,4 +43,4 @@ int DeConvPostInt8(const int32_t *src, const int32_t *bias, int32_t *tmp, int8_t } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DECONV_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_DECONV_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.c b/mindspore/lite/nnacl/int8/depth_to_space_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.c rename to mindspore/lite/nnacl/int8/depth_to_space_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h b/mindspore/lite/nnacl/int8/depth_to_space_int8.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h rename to mindspore/lite/nnacl/int8/depth_to_space_int8.h index ec3d945111..1ef57e03f5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h +++ b/mindspore/lite/nnacl/int8/depth_to_space_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ #include "nnacl/depth_to_space_parameter.h" #include "nnacl/quantization/quantize.h" @@ -28,4 +28,4 @@ void DepthToSpaceForNHWCInt8(const int8_t *input, int8_t *output, int *in_shape, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/div_int8.c b/mindspore/lite/nnacl/int8/div_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/div_int8.c rename to mindspore/lite/nnacl/int8/div_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/div_int8.h b/mindspore/lite/nnacl/int8/div_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/div_int8.h rename to mindspore/lite/nnacl/int8/div_int8.h index 5ebbaa3e43..c39b8854b6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/div_int8.h +++ b/mindspore/lite/nnacl/int8/div_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DIV_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DIV_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_DIV_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_DIV_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -28,4 +28,4 @@ int DivInt8(int8_t *input0_data, int8_t *input1_data, int8_t *output_data, int64 } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DIV_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_DIV_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.c b/mindspore/lite/nnacl/int8/hswish_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.c rename to mindspore/lite/nnacl/int8/hswish_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.h b/mindspore/lite/nnacl/int8/hswish_int8.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.h rename to mindspore/lite/nnacl/int8/hswish_int8.h index c4ba221b88..e54248fb4b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.h +++ b/mindspore/lite/nnacl/int8/hswish_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_HSWISH_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_HSWISH_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_HSWISH_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_HSWISH_INT8_H_ #include #include "nnacl/op_base.h" @@ -40,4 +40,4 @@ int HSwishInt8(const int8_t *src, int length, int8_t *dst, HswishQuantArg *arg); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_HSWISH_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_HSWISH_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/leaky_relu_int8.c b/mindspore/lite/nnacl/int8/leaky_relu_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/leaky_relu_int8.c rename to mindspore/lite/nnacl/int8/leaky_relu_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/leaky_relu_int8.h b/mindspore/lite/nnacl/int8/leaky_relu_int8.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/leaky_relu_int8.h rename to mindspore/lite/nnacl/int8/leaky_relu_int8.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul_int8.c b/mindspore/lite/nnacl/int8/matmul_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul_int8.c rename to mindspore/lite/nnacl/int8/matmul_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul_int8.h b/mindspore/lite/nnacl/int8/matmul_int8.h similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul_int8.h rename to mindspore/lite/nnacl/int8/matmul_int8.h index 7a8ee5608d..bf6ab900a9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul_int8.h +++ b/mindspore/lite/nnacl/int8/matmul_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MATMUL_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_MATMUL_H_ +#define MINDSPORE_LITE_NNACL_INT8_MATMUL_H_ #include #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.c b/mindspore/lite/nnacl/int8/mul_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.c rename to mindspore/lite/nnacl/int8/mul_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.h b/mindspore/lite/nnacl/int8/mul_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.h rename to mindspore/lite/nnacl/int8/mul_int8.h index b4b06d1e11..f4e80243ee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.h +++ b/mindspore/lite/nnacl/int8/mul_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MUL_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MUL_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_MUL_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_MUL_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/mul_parameter.h" @@ -28,4 +28,4 @@ void Mul(int8_t *input0_data, int8_t *input1_data, int8_t *output_data, int64_t } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MUL_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_MUL_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.c b/mindspore/lite/nnacl/int8/pad.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.c rename to mindspore/lite/nnacl/int8/pad.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.h b/mindspore/lite/nnacl/int8/pad.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.h rename to mindspore/lite/nnacl/int8/pad.h index f34011181e..28d5c7fee1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.h +++ b/mindspore/lite/nnacl/int8/pad.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_PAD_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_PAD_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_PAD_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_PAD_INT8_H_ #include #include "nnacl/op_base.h" @@ -30,4 +30,4 @@ int PadConstant4D(const int8_t *in_data, int8_t *out_data, const int32_t *in_dim } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_PAD_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_PAD_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.c b/mindspore/lite/nnacl/int8/pooling_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.c rename to mindspore/lite/nnacl/int8/pooling_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.h b/mindspore/lite/nnacl/int8/pooling_int8.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.h rename to mindspore/lite/nnacl/int8/pooling_int8.h index e5ac919f47..3926f6e682 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.h +++ b/mindspore/lite/nnacl/int8/pooling_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POOLING_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POOLING_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_POOLING_H_ +#define MINDSPORE_LITE_NNACL_INT8_POOLING_H_ #ifdef ENABLE_NEON #include @@ -37,4 +37,4 @@ void MaxPoolingOptInt8(const int8_t *input_ptr, int8_t *output_ptr, PoolingParam } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POOLING_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_POOLING_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/power_int8.c b/mindspore/lite/nnacl/int8/power_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/power_int8.c rename to mindspore/lite/nnacl/int8/power_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/power_int8.h b/mindspore/lite/nnacl/int8/power_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/power_int8.h rename to mindspore/lite/nnacl/int8/power_int8.h index 996c7a7570..3cac590aff 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/power_int8.h +++ b/mindspore/lite/nnacl/int8/power_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POWER_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POWER_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_POWER_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_POWER_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/power_parameter.h" @@ -29,4 +29,4 @@ int PowerInt8(const int8_t *input_ptr, int8_t *exp_ptr, int8_t *output_ptr, int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POWER_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_POWER_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.c b/mindspore/lite/nnacl/int8/quant_dtype_cast.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.c rename to mindspore/lite/nnacl/int8/quant_dtype_cast.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h b/mindspore/lite/nnacl/int8/quant_dtype_cast.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h rename to mindspore/lite/nnacl/int8/quant_dtype_cast.h index 0b4505d011..8e79fd5b55 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h +++ b/mindspore/lite/nnacl/int8/quant_dtype_cast.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_QUANTDTYPECAST_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_QUANTDTYPECAST_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_QUANTDTYPECAST_H_ +#define MINDSPORE_LITE_NNACL_INT8_QUANTDTYPECAST_H_ #include "nnacl/op_base.h" @@ -34,4 +34,4 @@ int DoQuantizeToInt8(float *real_values, int8_t *quant_values, float scale, int3 } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_QUANTDTYPECAST_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_QUANTDTYPECAST_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reduce_int8.c b/mindspore/lite/nnacl/int8/reduce_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reduce_int8.c rename to mindspore/lite/nnacl/int8/reduce_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reduce_int8.h b/mindspore/lite/nnacl/int8/reduce_int8.h similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reduce_int8.h rename to mindspore/lite/nnacl/int8/reduce_int8.h index b8b95cb1df..39d31fdc98 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reduce_int8.h +++ b/mindspore/lite/nnacl/int8/reduce_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_REDUCE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_REDUCE_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_REDUCE_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_REDUCE_INT8_H_ #include "nnacl/quantization/quantize.h" #ifdef __cplusplus extern "C" { @@ -50,4 +50,4 @@ bool isMulOverflow(int32_t x, int32_t y); #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_REDUCE_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_REDUCE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relux_int8.c b/mindspore/lite/nnacl/int8/relux_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relux_int8.c rename to mindspore/lite/nnacl/int8/relux_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relux_int8.h b/mindspore/lite/nnacl/int8/relux_int8.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relux_int8.h rename to mindspore/lite/nnacl/int8/relux_int8.h index 94a425b837..4be944ae4e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relux_int8.h +++ b/mindspore/lite/nnacl/int8/relux_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RELU_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RELU_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_RELU_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_RELU_INT8_H_ #include #include "nnacl/op_base.h" @@ -40,4 +40,4 @@ void ReluXInt8(const int8_t *src, int length, int8_t *dst, ReluXQuantArg *arg); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RELU_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_RELU_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.c b/mindspore/lite/nnacl/int8/reshape_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.c rename to mindspore/lite/nnacl/int8/reshape_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.h b/mindspore/lite/nnacl/int8/reshape_int8.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.h rename to mindspore/lite/nnacl/int8/reshape_int8.h index 08a8792a2e..fc0d2ac074 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.h +++ b/mindspore/lite/nnacl/int8/reshape_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESHAHPE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESHAHPE_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_RESHAHPE_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_RESHAHPE_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/reshape_parameter.h" @@ -27,4 +27,4 @@ void Int8Reshape(int8_t *input_ptr, int8_t *output_ptr, int64_t real_dst_count, } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESHAHPE_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_RESHAHPE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/resize.c b/mindspore/lite/nnacl/int8/resize.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/resize.c rename to mindspore/lite/nnacl/int8/resize.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/resize.h b/mindspore/lite/nnacl/int8/resize.h similarity index 91% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/resize.h rename to mindspore/lite/nnacl/int8/resize.h index eb9411f3ca..48f13e27e3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/resize.h +++ b/mindspore/lite/nnacl/int8/resize.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESIZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESIZE_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_RESIZE_H_ +#define MINDSPORE_LITE_NNACL_INT8_RESIZE_H_ #ifdef ENABLE_NEON #include @@ -49,4 +49,4 @@ void ComputeNearestNeighborInt(const int32_t pos, const int in_size, const int32 } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESIZE_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_RESIZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sigmoid_int8.c b/mindspore/lite/nnacl/int8/sigmoid_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sigmoid_int8.c rename to mindspore/lite/nnacl/int8/sigmoid_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sigmoid_int8.h b/mindspore/lite/nnacl/int8/sigmoid_int8.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sigmoid_int8.h rename to mindspore/lite/nnacl/int8/sigmoid_int8.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/slice_int8.c b/mindspore/lite/nnacl/int8/slice_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/slice_int8.c rename to mindspore/lite/nnacl/int8/slice_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/slice_int8.h b/mindspore/lite/nnacl/int8/slice_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/slice_int8.h rename to mindspore/lite/nnacl/int8/slice_int8.h index 2e77447d95..7021d9831a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/slice_int8.h +++ b/mindspore/lite/nnacl/int8/slice_int8.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SLICE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SLICE_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_SLICE_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_SLICE_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/slice_parameter.h" @@ -28,5 +28,5 @@ int SliceInt8(const int8_t *input, int8_t *output, SliceParameter *param); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SLICE_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_SLICE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.c b/mindspore/lite/nnacl/int8/softmax_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.c rename to mindspore/lite/nnacl/int8/softmax_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.h b/mindspore/lite/nnacl/int8/softmax_int8.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.h rename to mindspore/lite/nnacl/int8/softmax_int8.h index 5d517df14d..a6adae25fb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.h +++ b/mindspore/lite/nnacl/int8/softmax_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SOFTMAX_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SOFTMAX_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_SOFTMAX_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_SOFTMAX_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/softmax_parameter.h" @@ -30,4 +30,4 @@ int SoftmaxInt8(const int8_t *input_ptr, int8_t *output_ptr, int count, int *exp } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SOFTMAX_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_SOFTMAX_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.c b/mindspore/lite/nnacl/int8/split_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.c rename to mindspore/lite/nnacl/int8/split_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.h b/mindspore/lite/nnacl/int8/split_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.h rename to mindspore/lite/nnacl/int8/split_int8.h index 990d84e855..f2d18954e8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.h +++ b/mindspore/lite/nnacl/int8/split_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SPLIT_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SPLIT_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_SPLIT_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_SPLIT_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/split_parameter.h" @@ -28,4 +28,4 @@ int Int8DoSplit(int8_t *in_data, int8_t **out_data, const int *input_shape, int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SPLIT_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_SPLIT_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/squeeze_int8.c b/mindspore/lite/nnacl/int8/squeeze_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/squeeze_int8.c rename to mindspore/lite/nnacl/int8/squeeze_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/squeeze_int8.h b/mindspore/lite/nnacl/int8/squeeze_int8.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/squeeze_int8.h rename to mindspore/lite/nnacl/int8/squeeze_int8.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sub_int8.c b/mindspore/lite/nnacl/int8/sub_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sub_int8.c rename to mindspore/lite/nnacl/int8/sub_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sub_int8.h b/mindspore/lite/nnacl/int8/sub_int8.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sub_int8.h rename to mindspore/lite/nnacl/int8/sub_int8.h index 4aa4c3f1b0..4ac8f50042 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/sub_int8.h +++ b/mindspore/lite/nnacl/int8/sub_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SUB_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SUB_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_SUB_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_SUB_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -28,4 +28,4 @@ int SubInt8(int8_t *input0_data, int8_t *input1_data, int8_t *output_data, int64 } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SUB_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_SUB_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.c b/mindspore/lite/nnacl/int8/topk_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.c rename to mindspore/lite/nnacl/int8/topk_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.h b/mindspore/lite/nnacl/int8/topk_int8.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.h rename to mindspore/lite/nnacl/int8/topk_int8.h index 8d126ef414..d318b62eed 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.h +++ b/mindspore/lite/nnacl/int8/topk_int8.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_TOPK_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_TOPK_INT8_H_ +#ifndef MINDSPORE_LITE_NNACL_INT8_TOPK_INT8_H_ +#define MINDSPORE_LITE_NNACL_INT8_TOPK_INT8_H_ #include "nnacl/op_base.h" #include "nnacl/fp32/topk.h" @@ -33,4 +33,4 @@ void TopkInt8(int8_t *input_data, int8_t *output_data, int32_t *output_index, To } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_TOPK_INT8_H_ +#endif // MINDSPORE_LITE_NNACL_INT8_TOPK_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/unsqueeze_int8.c b/mindspore/lite/nnacl/int8/unsqueeze_int8.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/unsqueeze_int8.c rename to mindspore/lite/nnacl/int8/unsqueeze_int8.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/unsqueeze_int8.h b/mindspore/lite/nnacl/int8/unsqueeze_int8.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/int8/unsqueeze_int8.h rename to mindspore/lite/nnacl/int8/unsqueeze_int8.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/leaky_relu_parameter.h b/mindspore/lite/nnacl/leaky_relu_parameter.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/leaky_relu_parameter.h rename to mindspore/lite/nnacl/leaky_relu_parameter.h index a3407f4538..54805f7e6c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/leaky_relu_parameter.h +++ b/mindspore/lite/nnacl/leaky_relu_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LEAKY_RELU_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LEAKY_RELU_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_LEAKY_RELU_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_LEAKY_RELU_PARAMETER_H_ #include "nnacl/op_base.h" @@ -26,4 +26,4 @@ typedef struct LeakyReluParameter { int input_num_; } LeakyReluParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LEAKY_RELU_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_LEAKY_RELU_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/matmul_parameter.h b/mindspore/lite/nnacl/matmul_parameter.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/matmul_parameter.h rename to mindspore/lite/nnacl/matmul_parameter.h index f7061f83fd..9e290e7841 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/matmul_parameter.h +++ b/mindspore/lite/nnacl/matmul_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATMUL_H_ +#ifndef MINDSPORE_LITE_NNACL_MATMUL_H_ +#define MINDSPORE_LITE_NNACL_MATMUL_H_ #include "nnacl/op_base.h" @@ -43,4 +43,4 @@ typedef struct MatMulParameter { ActType act_type_; } MatMulParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATMUL_H_ +#endif // MINDSPORE_LITE_NNACL_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.c b/mindspore/lite/nnacl/matrix_table.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.c rename to mindspore/lite/nnacl/matrix_table.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.h b/mindspore/lite/nnacl/matrix_table.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.h rename to mindspore/lite/nnacl/matrix_table.h index ad99d79f95..b2c7f5404c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.h +++ b/mindspore/lite/nnacl/matrix_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATRIX_TABLE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATRIX_TABLE_H_ +#ifndef MINDSPORE_LITE_NNACL_MATRIX_TABLE_H_ +#define MINDSPORE_LITE_NNACL_MATRIX_TABLE_H_ #ifdef __cplusplus extern "C" { @@ -51,4 +51,4 @@ void MatrixGT7x8(float *matrix_data); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATRIX_TABLE_H_ +#endif // MINDSPORE_LITE_NNACL_MATRIX_TABLE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h b/mindspore/lite/nnacl/mul_parameter.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h rename to mindspore/lite/nnacl/mul_parameter.h index 74c5065614..0f8386300c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h +++ b/mindspore/lite/nnacl/mul_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MUL_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MUL_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_MUL_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_MUL_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -26,4 +26,4 @@ typedef struct MulParameter { MulQuantArg mul_quant_arg_; } MulParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MUL_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_MUL_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.c b/mindspore/lite/nnacl/nnacl_utils.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.c rename to mindspore/lite/nnacl/nnacl_utils.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.h b/mindspore/lite/nnacl/nnacl_utils.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.h rename to mindspore/lite/nnacl/nnacl_utils.h index fd6cb18c4b..b8dd2fbf44 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.h +++ b/mindspore/lite/nnacl/nnacl_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_NNACL_UTILS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_NNACL_UTILS_H_ +#ifndef MINDSPORE_LITE_NNACL_NNACL_UTILS_H_ +#define MINDSPORE_LITE_NNACL_NNACL_UTILS_H_ #include #ifdef __cplusplus @@ -27,4 +27,4 @@ uint32_t getHwCap(int hwcap_type); #ifdef __cplusplus } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_NNACL_UTILS_H_ +#endif // MINDSPORE_LITE_NNACL_NNACL_UTILS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/op_base.h b/mindspore/lite/nnacl/op_base.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/op_base.h rename to mindspore/lite/nnacl/op_base.h index 8be6051ced..f7c90bce49 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/op_base.h +++ b/mindspore/lite/nnacl/op_base.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OP_BASE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OP_BASE_H_ +#ifndef MINDSPORE_LITE_NNACL_OP_BASE_H_ +#define MINDSPORE_LITE_NNACL_OP_BASE_H_ #include #include @@ -61,4 +61,4 @@ typedef struct OpParameter { int thread_num_; } OpParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OP_BASE_H_ +#endif // MINDSPORE_LITE_NNACL_OP_BASE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/opt_op_handler.c b/mindspore/lite/nnacl/opt_op_handler.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/opt_op_handler.c rename to mindspore/lite/nnacl/opt_op_handler.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/optimized_kernel.h b/mindspore/lite/nnacl/optimized_kernel.h similarity index 90% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/optimized_kernel.h rename to mindspore/lite/nnacl/optimized_kernel.h index 79b27eea26..d3df6c89e2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/optimized_kernel.h +++ b/mindspore/lite/nnacl/optimized_kernel.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OPTIMIZED_KERNEL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OPTIMIZED_KERNEL_H_ +#ifndef MINDSPORE_LITE_NNACL_OPTIMIZED_KERNEL_H_ +#define MINDSPORE_LITE_NNACL_OPTIMIZED_KERNEL_H_ #ifndef _WIN32 #include @@ -77,4 +77,4 @@ class OptimizeModule { void *optimized_op_handler_ = nullptr; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OPTIMIZED_KERNEL_H_ +#endif // MINDSPORE_LITE_NNACL_OPTIMIZED_KERNEL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.c b/mindspore/lite/nnacl/pack.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/pack.c rename to mindspore/lite/nnacl/pack.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h b/mindspore/lite/nnacl/pack.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h rename to mindspore/lite/nnacl/pack.h index 90786b7aa1..3567732fe9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h +++ b/mindspore/lite/nnacl/pack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_H_ +#ifndef MINDSPORE_LITE_NNACL_PACK_H_ +#define MINDSPORE_LITE_NNACL_PACK_H_ #ifdef ENABLE_NEON #include @@ -106,4 +106,4 @@ void PackDepthwiseInt8Weight(const int8_t *origin_weight, int16_t *packed_weight } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_H_ +#endif // MINDSPORE_LITE_NNACL_PACK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/pad_parameter.h b/mindspore/lite/nnacl/pad_parameter.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/pad_parameter.h rename to mindspore/lite/nnacl/pad_parameter.h index 272c7dba71..c772397863 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/pad_parameter.h +++ b/mindspore/lite/nnacl/pad_parameter.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PAD_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PAD_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_PAD_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_PAD_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -30,4 +30,4 @@ typedef struct PadParameter { float constant_value_; } PadParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PAD_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_PAD_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/pooling_parameter.h b/mindspore/lite/nnacl/pooling_parameter.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/pooling_parameter.h rename to mindspore/lite/nnacl/pooling_parameter.h index 6473469103..42205af006 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/pooling_parameter.h +++ b/mindspore/lite/nnacl/pooling_parameter.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POOLING_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POOLING_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_POOLING_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_POOLING_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -46,4 +46,4 @@ typedef struct PoolingParameter { int thread_num_; } PoolingParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POOLING_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_POOLING_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/power.c b/mindspore/lite/nnacl/power.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/power.c rename to mindspore/lite/nnacl/power.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/power.h b/mindspore/lite/nnacl/power.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/power.h rename to mindspore/lite/nnacl/power.h index bce9bd0de8..0babeb86e0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/power.h +++ b/mindspore/lite/nnacl/power.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_H_ +#ifndef MINDSPORE_LITE_NNACL_POWER_H_ +#define MINDSPORE_LITE_NNACL_POWER_H_ #include #include "nnacl/op_base.h" #include "nnacl/power_parameter.h" @@ -28,4 +28,4 @@ void Power(const float *input, const float *exponent, float *output, int len, fl } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_H_ +#endif // MINDSPORE_LITE_NNACL_POWER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/power_parameter.h b/mindspore/lite/nnacl/power_parameter.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/power_parameter.h rename to mindspore/lite/nnacl/power_parameter.h index cd33edaf7f..3c425fb25c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/power_parameter.h +++ b/mindspore/lite/nnacl/power_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_POWER_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_POWER_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -29,4 +29,4 @@ typedef struct PowerParameter { bool broadcast_; } PowerParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_POWER_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/prelu_parameter.h b/mindspore/lite/nnacl/prelu_parameter.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/prelu_parameter.h rename to mindspore/lite/nnacl/prelu_parameter.h index 9e8a481374..6a0e7b2553 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/prelu_parameter.h +++ b/mindspore/lite/nnacl/prelu_parameter.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_PRELU_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_PRELU_PARAMETER_H_ -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" typedef struct PReluParameter { OpParameter op_parameter_; float *slope_; @@ -26,4 +26,4 @@ typedef struct PReluParameter { int input_num_; } PReluParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_PRELU_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.c b/mindspore/lite/nnacl/prior_box.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.c rename to mindspore/lite/nnacl/prior_box.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.h b/mindspore/lite/nnacl/prior_box.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.h rename to mindspore/lite/nnacl/prior_box.h index af96adc3e6..8742ebe7ae 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.h +++ b/mindspore/lite/nnacl/prior_box.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRIOR_BOX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRIOR_BOX_H_ +#ifndef MINDSPORE_LITE_NNACL_PRIOR_BOX_H_ +#define MINDSPORE_LITE_NNACL_PRIOR_BOX_H_ #ifdef ENABLE_NEON #include @@ -49,4 +49,4 @@ int PriorBox(const float *input_data, float *output_data, const size_t size, con } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRIOR_BOX_H_ +#endif // MINDSPORE_LITE_NNACL_PRIOR_BOX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.c b/mindspore/lite/nnacl/quantization/fixed_point.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.c rename to mindspore/lite/nnacl/quantization/fixed_point.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.h b/mindspore/lite/nnacl/quantization/fixed_point.h similarity index 91% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.h rename to mindspore/lite/nnacl/quantization/fixed_point.h index f3425de514..e64d76c08f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.h +++ b/mindspore/lite/nnacl/quantization/fixed_point.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_FIXED_POINT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_FIXED_POINT_H_ +#ifndef MINDSPORE_LITE_NNACL_QUANTIZATION_FIXED_POINT_H_ +#define MINDSPORE_LITE_NNACL_QUANTIZATION_FIXED_POINT_H_ #include #include @@ -92,4 +92,4 @@ int32x4_t RoundingDivideByPOTInt32x4(int32x4_t x, int exponent); int32x4_t SaturatingRoundingDoublingHighMulInt32x4(int32x4_t a, int32x4_t b); #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_FIXED_POINT_H_ +#endif // MINDSPORE_LITE_NNACL_QUANTIZATION_FIXED_POINT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.c b/mindspore/lite/nnacl/quantization/quantize.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.c rename to mindspore/lite/nnacl/quantization/quantize.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h b/mindspore/lite/nnacl/quantization/quantize.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h rename to mindspore/lite/nnacl/quantization/quantize.h index ba32963301..3a2cec217a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h +++ b/mindspore/lite/nnacl/quantization/quantize.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_QUANTIZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_QUANTIZE_H_ +#ifndef MINDSPORE_LITE_NNACL_QUANTIZATION_QUANTIZE_H_ +#define MINDSPORE_LITE_NNACL_QUANTIZATION_QUANTIZE_H_ #include #include @@ -295,4 +295,4 @@ void Dequantize(int8_t *input_data, int length, float scale, int zero_point, flo } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_QUANTIZE_H_ +#endif // MINDSPORE_LITE_NNACL_QUANTIZATION_QUANTIZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/reduce_parameter.h b/mindspore/lite/nnacl/reduce_parameter.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/reduce_parameter.h rename to mindspore/lite/nnacl/reduce_parameter.h index 092789aa35..34086d5f72 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/reduce_parameter.h +++ b/mindspore/lite/nnacl/reduce_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REDUCE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REDUCE_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_REDUCE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_REDUCE_PARAMETER_H_ #include "nnacl/op_base.h" #define REDUCE_MAX_AXES_NUM 8 @@ -27,4 +27,4 @@ struct ReduceParameter { int mode_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REDUCE_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_REDUCE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.c b/mindspore/lite/nnacl/reshape.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.c rename to mindspore/lite/nnacl/reshape.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.h b/mindspore/lite/nnacl/reshape.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.h rename to mindspore/lite/nnacl/reshape.h index b0c55e07b1..426bccee95 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.h +++ b/mindspore/lite/nnacl/reshape.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_H_ +#ifndef MINDSPORE_LITE_NNACL_RESHAHPE_H_ +#define MINDSPORE_LITE_NNACL_RESHAHPE_H_ #include "nnacl/op_base.h" #ifdef __cplusplus @@ -26,4 +26,4 @@ void Reshape(void *input_ptr, void *output_ptr, size_t data_size); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_H_ +#endif // MINDSPORE_LITE_NNACL_RESHAHPE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h b/mindspore/lite/nnacl/reshape_parameter.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h rename to mindspore/lite/nnacl/reshape_parameter.h index a44ae9756e..122d1a66b3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h +++ b/mindspore/lite/nnacl/reshape_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_RESHAHPE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_RESHAHPE_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -26,4 +26,4 @@ typedef struct ReshapeParameter { int thread_count_; } ReshapeParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_RESHAHPE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/resize_parameter.h b/mindspore/lite/nnacl/resize_parameter.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/resize_parameter.h rename to mindspore/lite/nnacl/resize_parameter.h index 237b9c5ca2..eb4f63d1f3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/resize_parameter.h +++ b/mindspore/lite/nnacl/resize_parameter.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESIZE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESIZE_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_RESIZE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_RESIZE_PARAMETER_H_ #include "nnacl/op_base.h" typedef struct ResizeParameter { @@ -25,4 +25,4 @@ typedef struct ResizeParameter { bool align_corners_; bool preserve_aspect_ratio_; } ResizeParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESIZE_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_RESIZE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.c b/mindspore/lite/nnacl/reverse_sequence.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.c rename to mindspore/lite/nnacl/reverse_sequence.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.h b/mindspore/lite/nnacl/reverse_sequence.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.h rename to mindspore/lite/nnacl/reverse_sequence.h index 9de73e4f46..d42c79f98d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.h +++ b/mindspore/lite/nnacl/reverse_sequence.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_SEQUENCE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_SEQUENCE_H_ +#ifndef MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_H_ +#define MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_H_ #include "nnacl/op_base.h" @@ -44,4 +44,4 @@ void ReverseSequence(float *input0, int *input1, float *output, ReverseSequenceP } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_SEQUENCE_H_ +#endif // MINDSPORE_LITE_NNACL_REVERSE_SEQUENCE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.c b/mindspore/lite/nnacl/scale.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/scale.c rename to mindspore/lite/nnacl/scale.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.h b/mindspore/lite/nnacl/scale.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/scale.h rename to mindspore/lite/nnacl/scale.h index e817b40dd7..fd0156f389 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.h +++ b/mindspore/lite/nnacl/scale.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCALE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCALE_H_ +#ifndef MINDSPORE_LITE_NNACL_SCALE_H_ +#define MINDSPORE_LITE_NNACL_SCALE_H_ #include "nnacl/op_base.h" @@ -37,4 +37,4 @@ int DoScale(float *in_data, float *out_data, float *scale, float *offset, int ta } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCALE_H_ +#endif // MINDSPORE_LITE_NNACL_SCALE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.c b/mindspore/lite/nnacl/scatter_nd.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.c rename to mindspore/lite/nnacl/scatter_nd.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.h b/mindspore/lite/nnacl/scatter_nd.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.h rename to mindspore/lite/nnacl/scatter_nd.h index 579f1eccee..d8f04fbaf2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.h +++ b/mindspore/lite/nnacl/scatter_nd.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCATTER_ND_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCATTER_ND_H_ +#ifndef MINDSPORE_LITE_NNACL_SCATTER_ND_H_ +#define MINDSPORE_LITE_NNACL_SCATTER_ND_H_ #include "nnacl/op_base.h" @@ -31,4 +31,4 @@ int DoScatterND(float *output_ptr, float *update, int *output_unit_offsets, int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCATTER_ND_H_ +#endif // MINDSPORE_LITE_NNACL_SCATTER_ND_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/shape.h b/mindspore/lite/nnacl/shape.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/shape.h rename to mindspore/lite/nnacl/shape.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/sigmoid_parameter.h b/mindspore/lite/nnacl/sigmoid_parameter.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/sigmoid_parameter.h rename to mindspore/lite/nnacl/sigmoid_parameter.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/slice_parameter.h b/mindspore/lite/nnacl/slice_parameter.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/slice_parameter.h rename to mindspore/lite/nnacl/slice_parameter.h index 2a367a00cc..11cb8cc020 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/slice_parameter.h +++ b/mindspore/lite/nnacl/slice_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SLICE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SLICE_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_SLICE_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_SLICE_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -33,4 +33,4 @@ typedef struct SliceParameter { int32_t thread_id_; } SliceParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SLICE_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_SLICE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h b/mindspore/lite/nnacl/softmax_parameter.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h rename to mindspore/lite/nnacl/softmax_parameter.h index c1ba6ec78e..afcd3a36bf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h +++ b/mindspore/lite/nnacl/softmax_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SOFTMAX_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SOFTMAX_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_SOFTMAX_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_SOFTMAX_PARAMETER_H_ #include "nnacl/op_base.h" @@ -27,4 +27,4 @@ typedef struct SoftmaxParameter { int input_shape_[4]; } SoftmaxParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SOFTMAX_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_SOFTMAX_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.c b/mindspore/lite/nnacl/sparse_to_dense.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.c rename to mindspore/lite/nnacl/sparse_to_dense.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.h b/mindspore/lite/nnacl/sparse_to_dense.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.h rename to mindspore/lite/nnacl/sparse_to_dense.h index 97fa33494e..2047aa6fcf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.h +++ b/mindspore/lite/nnacl/sparse_to_dense.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPARSETODENSE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPARSETODENSE_H_ +#ifndef MINDSPORE_LITE_NNACL_SPARSETODENSE_H_ +#define MINDSPORE_LITE_NNACL_SPARSETODENSE_H_ #include "nnacl/op_base.h" @@ -33,4 +33,4 @@ void SparseToDense(int *input, int *output_shape_, float *snum, float *dnum, int } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPARSETODENCE_H_ +#endif // MINDSPORE_LITE_NNACL_SPARSETODENCE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/split.c b/mindspore/lite/nnacl/split.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/split.c rename to mindspore/lite/nnacl/split.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/split.h b/mindspore/lite/nnacl/split.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/split.h rename to mindspore/lite/nnacl/split.h index b38078db06..155f702754 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/split.h +++ b/mindspore/lite/nnacl/split.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ +#ifndef MINDSPORE_LITE_NNACL_SPLIT_H_ +#define MINDSPORE_LITE_NNACL_SPLIT_H_ #include "nnacl/op_base.h" #include "nnacl/split_parameter.h" @@ -29,4 +29,4 @@ int DoSplit(float *in_data, float **out_data, const int *input_shape, int offset } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ +#endif // MINDSPORE_LITE_NNACL_SPLIT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h b/mindspore/lite/nnacl/split_parameter.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h rename to mindspore/lite/nnacl/split_parameter.h index 6cffbffb47..600a881a08 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h +++ b/mindspore/lite/nnacl/split_parameter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_PARAMETER_H_ +#ifndef MINDSPORE_LITE_NNACL_SPLIT_PARAMETER_H_ +#define MINDSPORE_LITE_NNACL_SPLIT_PARAMETER_H_ #include "nnacl/op_base.h" #include "nnacl/quantization/quantize.h" @@ -31,4 +31,4 @@ typedef struct SplitParameter { int split_count_; } SplitParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_PARAMETER_H_ +#endif // MINDSPORE_LITE_NNACL_SPLIT_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.c b/mindspore/lite/nnacl/squeeze.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.c rename to mindspore/lite/nnacl/squeeze.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.h b/mindspore/lite/nnacl/squeeze.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.h rename to mindspore/lite/nnacl/squeeze.h index 71345f20fa..aecd5a05a6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.h +++ b/mindspore/lite/nnacl/squeeze.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SQUEEZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SQUEEZE_H_ +#ifndef MINDSPORE_LITE_NNACL_SQUEEZE_H_ +#define MINDSPORE_LITE_NNACL_SQUEEZE_H_ #include "nnacl/op_base.h" @@ -33,4 +33,4 @@ int DoSqueezeInt32(int32_t *in_data, int32_t *out_data, size_t data_size); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SQUEEZE_H_ +#endif // MINDSPORE_LITE_NNACL_SQUEEZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze_parameter.h b/mindspore/lite/nnacl/squeeze_parameter.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze_parameter.h rename to mindspore/lite/nnacl/squeeze_parameter.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/strassen_matmul.h b/mindspore/lite/nnacl/strassen_matmul.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/strassen_matmul.h rename to mindspore/lite/nnacl/strassen_matmul.h index 32b7067e55..4fff48219d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/strassen_matmul.h +++ b/mindspore/lite/nnacl/strassen_matmul.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_STRASSEN_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_STRASSEN_MATMUL_H_ +#ifndef MINDSPORE_LITE_NNACL_STRASSEN_MATMUL_H_ +#define MINDSPORE_LITE_NNACL_STRASSEN_MATMUL_H_ #include "nnacl/op_base.h" @@ -30,4 +30,4 @@ typedef struct StrassenMatMulParameter { int c_stride_; /* h * w * 4 */ } StrassenMatMulParameter; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_STRASSEN_MATMUL_H_ +#endif // MINDSPORE_LITE_NNACL_STRASSEN_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.c b/mindspore/lite/nnacl/strided_slice.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.c rename to mindspore/lite/nnacl/strided_slice.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.h b/mindspore/lite/nnacl/strided_slice.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.h rename to mindspore/lite/nnacl/strided_slice.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.c b/mindspore/lite/nnacl/transpose.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.c rename to mindspore/lite/nnacl/transpose.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h b/mindspore/lite/nnacl/transpose.h similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h rename to mindspore/lite/nnacl/transpose.h index 3303a06d15..823780d33e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h +++ b/mindspore/lite/nnacl/transpose.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TRANSPOSE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TRANSPOSE_H_ +#ifndef MINDSPORE_LITE_NNACL_TRANSPOSE_H_ +#define MINDSPORE_LITE_NNACL_TRANSPOSE_H_ #include "nnacl/op_base.h" @@ -46,4 +46,4 @@ void TransposeDim5(float *in_data, float *out_data, int *strides, int *out_strid } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TRANSPOSE_H_ +#endif // MINDSPORE_LITE_NNACL_TRANSPOSE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/unsqueeze_parameter.h b/mindspore/lite/nnacl/unsqueeze_parameter.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/unsqueeze_parameter.h rename to mindspore/lite/nnacl/unsqueeze_parameter.h diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.c b/mindspore/lite/nnacl/unstack.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.c rename to mindspore/lite/nnacl/unstack.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h b/mindspore/lite/nnacl/unstack.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h rename to mindspore/lite/nnacl/unstack.h index 2c0e42d6c5..957a9c91e9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h +++ b/mindspore/lite/nnacl/unstack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSTACK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSTACK_H_ +#ifndef MINDSPORE_LITE_NNACL_UNSTACK_H_ +#define MINDSPORE_LITE_NNACL_UNSTACK_H_ #include "nnacl/op_base.h" @@ -36,4 +36,4 @@ void Unistack(float *input, float **output, UnstackParameter *para); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSTACK_H_ +#endif // MINDSPORE_LITE_NNACL_UNSTACK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/where.c b/mindspore/lite/nnacl/where.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/where.c rename to mindspore/lite/nnacl/where.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/where.h b/mindspore/lite/nnacl/where.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/where.h rename to mindspore/lite/nnacl/where.h index 12d5da304c..ffd2a5810e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/where.h +++ b/mindspore/lite/nnacl/where.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WHERE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WHERE_H_ +#ifndef MINDSPORE_LITE_NNACL_WHERE_H_ +#define MINDSPORE_LITE_NNACL_WHERE_H_ #include "nnacl/op_base.h" @@ -35,4 +35,4 @@ void Where(bool *input, float *input1, float *input2, float *output, WhereParame } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WHERE_H_ +#endif // MINDSPORE_LITE_NNACL_WHERE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.c b/mindspore/lite/nnacl/winograd_transform.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.c rename to mindspore/lite/nnacl/winograd_transform.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.h b/mindspore/lite/nnacl/winograd_transform.h similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.h rename to mindspore/lite/nnacl/winograd_transform.h index 31db84742c..4edbb75db2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.h +++ b/mindspore/lite/nnacl/winograd_transform.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_TRANSFORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_TRANSFORM_H_ +#ifndef MINDSPORE_LITE_NNACL_WINOGRAD_TRANSFORM_H_ +#define MINDSPORE_LITE_NNACL_WINOGRAD_TRANSFORM_H_ #ifdef ENABLE_ARM #include @@ -73,4 +73,4 @@ void Conv3x3Uint8OutputTransform(const int32_t *gemm_out, int8_t *out_data, cons } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_TRANSFORM_H_ +#endif // MINDSPORE_LITE_NNACL_WINOGRAD_TRANSFORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.c b/mindspore/lite/nnacl/winograd_utils.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.c rename to mindspore/lite/nnacl/winograd_utils.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.h b/mindspore/lite/nnacl/winograd_utils.h similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.h rename to mindspore/lite/nnacl/winograd_utils.h index 2a10381bfa..e7afd28328 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.h +++ b/mindspore/lite/nnacl/winograd_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_UTILS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_UTILS_H_ +#ifndef MINDSPORE_LITE_NNACL_WINOGRAD_UTILS_H_ +#define MINDSPORE_LITE_NNACL_WINOGRAD_UTILS_H_ #ifdef ENABLE_ARM #include @@ -63,4 +63,4 @@ void CheckIfUseWinograd(bool *use_winograd, int *output_unit, ConvParameter *con } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_UTILS_H_ +#endif // MINDSPORE_LITE_NNACL_WINOGRAD_UTILS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.c b/mindspore/lite/nnacl/zeroslike.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.c rename to mindspore/lite/nnacl/zeroslike.c diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.h b/mindspore/lite/nnacl/zeroslike.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.h rename to mindspore/lite/nnacl/zeroslike.h index 475dec5fbb..b1a541ffd0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.h +++ b/mindspore/lite/nnacl/zeroslike.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ZEROSLIKE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ZEROSLIKE_H_ +#ifndef MINDSPORE_LITE_NNACL_ZEROSLIKE_H_ +#define MINDSPORE_LITE_NNACL_ZEROSLIKE_H_ #include "nnacl/op_base.h" @@ -26,4 +26,4 @@ void ApproximateZerosLike(float *input, float *output, int number); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ZEROSLIKE_H_ +#endif // MINDSPORE_LITE_NNACL_ZEROSLIKE_H_ diff --git a/mindspore/lite/src/executor.cc b/mindspore/lite/src/executor.cc index 7b167fc7e1..449de53800 100644 --- a/mindspore/lite/src/executor.cc +++ b/mindspore/lite/src/executor.cc @@ -15,7 +15,7 @@ */ #include "mindspore/lite/src/executor.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #include "include/errorcode.h" #include "src/common/ms_tensor_utils.h" diff --git a/mindspore/lite/src/kernel_registry.cc b/mindspore/lite/src/kernel_registry.cc index 8e3d8a6cf1..7b4d8eb9cf 100644 --- a/mindspore/lite/src/kernel_registry.cc +++ b/mindspore/lite/src/kernel_registry.cc @@ -21,7 +21,7 @@ #include #include "common/utils.h" #include "utils/log_adapter.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" +#include "nnacl/optimized_kernel.h" #endif using mindspore::kernel::kCPU; diff --git a/mindspore/lite/src/lite_kernel.h b/mindspore/lite/src/lite_kernel.h index 07adf89692..64682c3e73 100644 --- a/mindspore/lite/src/lite_kernel.h +++ b/mindspore/lite/src/lite_kernel.h @@ -22,7 +22,7 @@ #include #endif #include "src/ops/primitive_c.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" #include "include/context.h" #include "src/ir/tensor.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/populate_parameter.cc b/mindspore/lite/src/populate_parameter.cc index 6972d90aed..33feaaba28 100644 --- a/mindspore/lite/src/populate_parameter.cc +++ b/mindspore/lite/src/populate_parameter.cc @@ -110,62 +110,62 @@ #include "src/populate_parameter.h" #include "utils/log_adapter.h" #include "schema/ops_generated.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h" -#include "src/runtime/kernel/arm/nnacl/fp32/cast.h" -#include "src/runtime/kernel/arm/nnacl/concat_parameter.h" -#include "src/runtime/kernel/arm/nnacl/prelu_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/slice.h" -#include "src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h" -#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h" -#include "src/runtime/kernel/arm/nnacl/shape.h" -#include "src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.h" -#include "src/runtime/kernel/arm/nnacl/fp32/stack.h" -#include "src/runtime/kernel/arm/nnacl/unstack.h" -#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" -#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/roi_pooling.h" -#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/tile.h" -#include "src/runtime/kernel/arm/nnacl/fp32/topk.h" -#include "src/runtime/kernel/arm/nnacl/reduce_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" -#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" -#include "src/runtime/kernel/arm/nnacl/power.h" -#include "src/runtime/kernel/arm/nnacl/fp32/range.h" -#include "src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h" -#include "src/runtime/kernel/arm/nnacl/fp32/expandDims.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h" -#include "src/runtime/kernel/arm/nnacl/pad_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/fill.h" -#include "src/runtime/kernel/arm/nnacl/transpose.h" -#include "src/runtime/kernel/arm/nnacl/split_parameter.h" -#include "src/runtime/kernel/arm/nnacl/squeeze.h" -#include "src/runtime/kernel/arm/nnacl/fp32/gather.h" -#include "src/runtime/kernel/arm/nnacl/fp32/reverse.h" -#include "src/runtime/kernel/arm/nnacl/reverse_sequence.h" -#include "src/runtime/kernel/arm/nnacl/fp32/unique.h" -#include "src/runtime/kernel/arm/nnacl/scale.h" -#include "src/runtime/kernel/arm/nnacl/fp32/gatherNd.h" -#include "src/runtime/kernel/arm/nnacl/resize_parameter.h" -#include "src/runtime/kernel/arm/nnacl/scatter_nd.h" -#include "src/runtime/kernel/arm/nnacl/batch_to_space.h" -#include "src/runtime/kernel/arm/nnacl/fp32/crop.h" +#include "nnacl/op_base.h" +#include "nnacl/fp32/arg_min_max.h" +#include "nnacl/fp32/cast.h" +#include "nnacl/concat_parameter.h" +#include "nnacl/prelu_parameter.h" +#include "nnacl/fp32/slice.h" +#include "nnacl/fp32/broadcast_to.h" +#include "nnacl/reshape_parameter.h" +#include "nnacl/shape.h" +#include "nnacl/fp32/constant_of_shape.h" +#include "nnacl/fp32/stack.h" +#include "nnacl/unstack.h" +#include "nnacl/depth_to_space.h" +#include "nnacl/conv_parameter.h" +#include "nnacl/fp32/pooling.h" +#include "nnacl/matmul_parameter.h" +#include "nnacl/fp32/roi_pooling.h" +#include "nnacl/softmax_parameter.h" +#include "nnacl/fp32/tile.h" +#include "nnacl/fp32/topk.h" +#include "nnacl/reduce_parameter.h" +#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/batchnorm.h" +#include "nnacl/power.h" +#include "nnacl/fp32/range.h" +#include "nnacl/fp32/local_response_norm.h" +#include "nnacl/fp32/expandDims.h" +#include "nnacl/arithmetic_self_parameter.h" +#include "nnacl/pad_parameter.h" +#include "nnacl/fp32/fill.h" +#include "nnacl/transpose.h" +#include "nnacl/split_parameter.h" +#include "nnacl/squeeze.h" +#include "nnacl/fp32/gather.h" +#include "nnacl/fp32/reverse.h" +#include "nnacl/reverse_sequence.h" +#include "nnacl/fp32/unique.h" +#include "nnacl/scale.h" +#include "nnacl/fp32/gatherNd.h" +#include "nnacl/resize_parameter.h" +#include "nnacl/scatter_nd.h" +#include "nnacl/batch_to_space.h" +#include "nnacl/fp32/crop.h" #include "src/runtime/kernel/arm/fp32/flatten.h" -#include "src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h" -#include "src/runtime/kernel/arm/nnacl/fp32/one_hot.h" -#include "src/runtime/kernel/arm/nnacl/strided_slice.h" +#include "nnacl/fp32/unsqueeze.h" +#include "nnacl/fp32/one_hot.h" +#include "nnacl/strided_slice.h" #include "src/runtime/kernel/arm/base/prior_box.h" -#include "src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h" -#include "src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h" -#include "src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h" -#include "src/runtime/kernel/arm/nnacl/fp32/lstm.h" -#include "src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.h" -#include "src/runtime/kernel/arm/nnacl/fp32/elu.h" -#include "src/runtime/kernel/arm/nnacl/leaky_relu_parameter.h" +#include "nnacl/fp32/space_to_depth.h" +#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/int8/quant_dtype_cast.h" +#include "nnacl/fp32/lstm.h" +#include "nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/elu.h" +#include "nnacl/leaky_relu_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/populate_parameter.h b/mindspore/lite/src/populate_parameter.h index 2e27d65978..1ba686543d 100644 --- a/mindspore/lite/src/populate_parameter.h +++ b/mindspore/lite/src/populate_parameter.h @@ -19,7 +19,7 @@ #include "schema/model_generated.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" #include "src/ops/primitive_c.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt b/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt index 8e5178f821..7adb743267 100644 --- a/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt +++ b/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt @@ -2,26 +2,26 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/) file(GLOB KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/base/*.cc - nnacl/*.c - nnacl/fp32/*.c - nnacl/int8/*.c - nnacl/quantization/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/fp32/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/int8/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/quantization/*.c ${CMAKE_CURRENT_SOURCE_DIR}/fp32/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/int8/*.cc ) -list(REMOVE_ITEM KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/nnacl/opt_op_handler.c) +list(REMOVE_ITEM KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/opt_op_handler.c) if (SUPPORT_TRAIN) file (GLOB TRAIN_KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/fp32_grad/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/nnacl/fp32_grad/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/fp32_grad/*.c ) endif() if (PLATFORM_ARM64) # assembly - file(GLOB ASSEMBLY_SRC nnacl/assembly/arm64/*.s - nnacl/assembly/arm64/*.S) + file(GLOB ASSEMBLY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/assembly/arm64/*.s + ${CMAKE_CURRENT_SOURCE_DIR}/../../../../nnacl/assembly/arm64/*.S) set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C) set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC}) endif() @@ -38,4 +38,3 @@ endif() ]] add_library(cpu_kernel_mid_ OBJECT ${KERNEL_SRC} ${TRAIN_KERNEL_SRC}) -add_subdirectory(nnacl) diff --git a/mindspore/lite/src/runtime/kernel/arm/base/arg_min_max_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/arg_min_max_base.cc index 94e89bba95..38bb63005d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/arg_min_max_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/arg_min_max_base.cc @@ -14,10 +14,10 @@ * limitations under the License. */ #include "src/runtime/kernel/arm/base/arg_min_max_base.h" -#include "src/runtime/kernel/arm/nnacl/arg_min_max.h" +#include "nnacl/arg_min_max.h" #include "src/runtime/kernel/arm/fp32/argminmax.h" #include "src/runtime/kernel/arm/int8/argminmax_int8.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "nnacl/arithmetic_common.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.cc index bad7c321dd..5def8f0186 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/arm/base/batch_to_space_base.h" -#include "src/runtime/kernel/arm/nnacl/batch_to_space.h" +#include "nnacl/batch_to_space.h" #include "src/runtime/kernel/arm/fp32/batch_to_space.h" #include "src/runtime/kernel/arm/int8/batch_to_space_int8.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.h b/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.h index 36a3ae5125..6bd3ff8af3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/concat_parameter.h" +#include "nnacl/concat_parameter.h" namespace mindspore::kernel { class BatchToSpaceBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc index 4e63b094c3..0d8392f269 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/arm/int8/concat_int8.h" #include "src/runtime/kernel/arm/fp32/concat.h" -#include "src/runtime/kernel/arm/nnacl/fp32/concat.h" +#include "nnacl/fp32/concat.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/concat_base.h b/mindspore/lite/src/runtime/kernel/arm/base/concat_base.h index 5aa29c4987..8a3a531d6e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/concat_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/concat_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/concat_parameter.h" +#include "nnacl/concat_parameter.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/crop_base.h b/mindspore/lite/src/runtime/kernel/arm/base/crop_base.h index 7168bd78ea..bd9338cf3a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/crop_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/crop_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/crop_parameter.h" +#include "nnacl/crop_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.cc index 4c84f3414e..b68e45b366 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.cc @@ -14,10 +14,10 @@ * limitations under the License. */ #include "src/runtime/kernel/arm/base/depth_to_space_base.h" -#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" +#include "nnacl/depth_to_space.h" #include "src/runtime/kernel/arm/fp32/depth_to_space.h" #include "src/runtime/kernel/arm/int8/depth_to_space_int8.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "nnacl/arithmetic_common.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.h b/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.h index 86c4b215d4..b8c8ea8b4a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" +#include "nnacl/depth_to_space.h" namespace mindspore::kernel { class DepthToSpaceBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/base/fullconnection_base.h b/mindspore/lite/src/runtime/kernel/arm/base/fullconnection_base.h index 4c75face90..15151ee72e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/fullconnection_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/fullconnection_base.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" +#include "nnacl/matmul_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/layout_transform.h b/mindspore/lite/src/runtime/kernel/arm/base/layout_transform.h index 5296c53066..a1c9fb2c2e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/layout_transform.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/layout_transform.h @@ -20,7 +20,7 @@ #ifdef ENABLE_FP16 #include #endif -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #include "ir/dtype/type_id.h" #include "schema/ops_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/leaky_relu_base.h b/mindspore/lite/src/runtime/kernel/arm/base/leaky_relu_base.h index 37f5c74624..85dd45c7ef 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/leaky_relu_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/leaky_relu_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/leaky_relu_parameter.h" +#include "nnacl/leaky_relu_parameter.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.h b/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.h index a9bea46d6f..1a51529a99 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/matmul_base.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" +#include "nnacl/matmul_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/matrix.h b/mindspore/lite/src/runtime/kernel/arm/base/matrix.h index e3b94e7819..4dbdd59dd5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/matrix.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/matrix.h @@ -19,7 +19,7 @@ #include #include -#include "src/runtime/kernel/arm/nnacl/winograd_utils.h" +#include "nnacl/winograd_utils.h" namespace mindspore::kernel { class Matrix { diff --git a/mindspore/lite/src/runtime/kernel/arm/base/pooling_base.h b/mindspore/lite/src/runtime/kernel/arm/base/pooling_base.h index be72a6332b..afaae8b8a3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/pooling_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/pooling_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling.h" #include "include/errorcode.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/power_base.h b/mindspore/lite/src/runtime/kernel/arm/base/power_base.h index 09d956221f..044579b803 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/power_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/power_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/power_parameter.h" +#include "nnacl/power_parameter.h" namespace mindspore::kernel { class PowerBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/base/prior_box.h b/mindspore/lite/src/runtime/kernel/arm/base/prior_box.h index 0c514a9a99..5f26ce00c0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/prior_box.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/prior_box.h @@ -19,8 +19,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h" -#include "src/runtime/kernel/arm/nnacl/prior_box.h" +#include "nnacl/reshape_parameter.h" +#include "nnacl/prior_box.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc b/mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc index cb0c97d0f7..60287713e2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/base/quant_dtype_cast.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h" +#include "nnacl/int8/quant_dtype_cast.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/reshape_base.h b/mindspore/lite/src/runtime/kernel/arm/base/reshape_base.h index 9ee70203da..f4b27c88e2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/reshape_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/reshape_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h" +#include "nnacl/reshape_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/slice_base.h b/mindspore/lite/src/runtime/kernel/arm/base/slice_base.h index a266946bdb..14e9e51b66 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/slice_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/slice_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/slice_parameter.h" +#include "nnacl/slice_parameter.h" namespace mindspore::kernel { class SliceBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc b/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc index 29846f3a0c..04419db7f3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc @@ -18,7 +18,7 @@ #include #include "src/runtime/kernel/arm/int8/softmax_int8.h" #include "src/runtime/kernel/arm/fp32/softmax.h" -#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.h b/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.h index 07e0300037..a8febaf783 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h" +#include "nnacl/softmax_parameter.h" namespace mindspore::kernel { class SoftmaxBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/base/split_base.h b/mindspore/lite/src/runtime/kernel/arm/base/split_base.h index 6ce04ee607..e77e4fd0a1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/split_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/split_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/split_parameter.h" +#include "nnacl/split_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/squeeze_base.h b/mindspore/lite/src/runtime/kernel/arm/base/squeeze_base.h index b024cb1de5..27cf796265 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/squeeze_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/squeeze_base.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/squeeze_parameter.h" +#include "nnacl/squeeze_parameter.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/base/strided_slice.cc b/mindspore/lite/src/runtime/kernel/arm/base/strided_slice.cc index 46c2c6524c..7e1470e4c9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/strided_slice.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/strided_slice.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/base/strided_slice.h" #include -#include "src/runtime/kernel/arm/nnacl/strided_slice.h" +#include "nnacl/strided_slice.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc index 2237a1cbbc..63e40c995a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/fp16/arithmetic_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/arithmetic_fp16.h" +#include "nnacl/fp16/cast_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h index 0a8a9f67b2..e16dd03e2b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/arithmetic_fp16.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp16/arithmetic_fp16.h" +#include "nnacl/fp16/arithmetic_fp16.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/cast_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/cast_fp16.cc index 68ad986d6f..d67ab064d8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/cast_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/cast_fp16.cc @@ -17,8 +17,8 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/fp16/cast_fp16.h" +#include "nnacl/op_base.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/common_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/common_fp16.cc index 87f5446040..c1e2ed56aa 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/common_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/common_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp16/common_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/cast_fp16.h" namespace mindspore::kernel { float16_t *ConvertInputFp32toFp16(lite::tensor::Tensor *input, const lite::Context *ctx) { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.cc index 32884017a5..ed602d65c7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.cc @@ -15,9 +15,9 @@ */ #include "src/runtime/kernel/arm/fp16/convolution_1x1_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/pack_fp16.h" #include "src/runtime/kernel/arm/fp16/layout_transform_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.h index 12aa135bfe..b2a43426b6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_1x1_fp16.h @@ -21,9 +21,9 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.h" +#include "nnacl/optimized_kernel.h" +#include "nnacl/matmul_parameter.h" +#include "nnacl/fp16/matmul_fp16.h" namespace mindspore::kernel { class Convolution1x1FP16CPUKernel : public ConvolutionBaseFP16CPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc index 45b4e1a389..153274d7ed 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc @@ -15,10 +15,10 @@ */ #include "src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/winograd_transform_fp16.h" +#include "nnacl/fp16/pack_fp16.h" #include "src/runtime/kernel/arm/fp16/layout_transform_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h index d5584bfdcd..e14ebc6f99 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h @@ -21,7 +21,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" +#include "nnacl/optimized_kernel.h" namespace mindspore::kernel { class Convolution3x3FP16CPUKernel : public ConvolutionBaseFP16CPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.cc index 06159c73ab..dcc110d068 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/cast_fp16.h" #include "src/runtime/kernel/arm/fp16/common_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.h index f5af08f5d1..e507ab3d3e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_base_fp16.h @@ -21,7 +21,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" +#include "nnacl/optimized_kernel.h" namespace mindspore::kernel { class ConvolutionBaseFP16CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc index ee1e750a79..6da98cb524 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/cast_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h index c68df7f36e..2355fe8199 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h" +#include "nnacl/fp16/conv_depthwise_fp16.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc index 6a0d4e4709..b42e3d6009 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc @@ -20,9 +20,9 @@ #include "src/runtime/kernel/arm/fp16/convolution_winograd_fp16.h" #include "src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h" #include "src/runtime/kernel/arm/fp16/convolution_1x1_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/pack_fp16.h" #include "src/runtime/kernel/arm/fp16/layout_transform_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc index f4c756f54f..dc2c1bd07e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_sw_fp16.cc @@ -15,10 +15,10 @@ */ #include "src/runtime/kernel/arm/fp16/convolution_sw_fp16.h" #include -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/pack_fp16.h" +#include "nnacl/fp32/conv_depthwise.h" #include "src/runtime/kernel/arm/fp16/layout_transform_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc index 41324bdd83..a361abca30 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.cc @@ -16,12 +16,12 @@ #include "src/runtime/kernel/arm/fp16/convolution_winograd_fp16.h" #include "src/runtime/kernel/arm/fp16/matrix_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/common_func.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.h" +#include "nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/common_func.h" +#include "nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/winograd_transform_fp16.h" +#include "nnacl/fp16/winograd_utils_fp16.h" #include "src/runtime/kernel/arm/fp16/layout_transform_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.h index 2ea67108eb..d9dc03611e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_winograd_fp16.h @@ -21,10 +21,10 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/conv_fp16.h" #include "src/runtime/kernel/arm/fp16/matrix_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/winograd_utils_fp16.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" +#include "nnacl/fp16/winograd_utils_fp16.h" +#include "nnacl/optimized_kernel.h" namespace mindspore::kernel { class ConvolutionWinogradFP16CPUKernel : public ConvolutionBaseFP16CPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc index 049fc4ed23..82c0a4a8ee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/pack_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h index fe1a4bcebb..984c19731e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h" +#include "nnacl/fp16/conv_depthwise_fp16.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.h b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.h index fd729182cd..93fca6a1f5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_fp16.h @@ -24,10 +24,10 @@ #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/runtime/kernel/arm/fp16/convolution_base_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/deconv_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/matmul_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/cast_fp16.h" +#include "nnacl/fp16/deconv_fp16.h" +#include "nnacl/fp16/matmul_fp16.h" +#include "nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/cast_fp16.h" namespace mindspore::kernel { class DeConvolutionFp16CPUKernel : public ConvolutionBaseFP16CPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/layout_transform_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/layout_transform_fp16.cc index a628a55e6d..32b05c44d9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/layout_transform_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/layout_transform_fp16.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/arm/fp16/layout_transform_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "nnacl/fp16/pack_fp16.h" #include "schema/ops_generated.h" #include "mindspore/core/utils/log_adapter.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/pooling_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/pooling_fp16.cc index 70fccd8cb3..b280b7fb68 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/pooling_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/pooling_fp16.cc @@ -15,11 +15,11 @@ */ #include "src/runtime/kernel/arm/fp16/pooling_fp16.h" #include -#include "src/runtime/kernel/arm/nnacl/fp16/pooling_fp16.h" +#include "nnacl/fp16/pooling_fp16.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" #include "nnacl/fp16/cast_fp16.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp16/split_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/split_fp16.cc index ccd9103762..e7ec771e7d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/split_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/split_fp16.cc @@ -17,8 +17,8 @@ #include "nnacl/fp16/split_fp16.h" #include "src/runtime/kernel/arm/fp16/split_fp16.h" #include "src/runtime/kernel/arm/base/split_base.h" -#include "src/runtime/kernel/arm/nnacl/split.h" -#include "src/runtime/kernel/arm/nnacl/split_parameter.h" +#include "nnacl/split.h" +#include "nnacl/split_parameter.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/fp16/transpose_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/fp16/transpose_fp16.cc index efd45f5213..c9c0e3fb8b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/transpose_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp16/transpose_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp16/transpose_fp16.h" #include -#include "src/runtime/kernel/arm/nnacl/fp16/transpose_fp16.h" +#include "nnacl/fp16/transpose_fp16.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/activation.h b/mindspore/lite/src/runtime/kernel/arm/fp32/activation.h index 8f995ce065..d5e7a050f2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/activation.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/activation.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "nnacl/fp32/activation.h" namespace mindspore::kernel { class ActivationCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc index 64d951eb22..8a72522e1e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/arg_min_max.h" +#include "nnacl/arg_min_max.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h index 3bff65a5d9..f4b42a25a1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic.h" #include "schema/model_generated.h" using mindspore::schema::PrimitiveType_Add; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self.h b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self.h index 3061aa0e05..4fb1b5ff97 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self.h @@ -19,8 +19,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h" +#include "nnacl/fp32/arithmetic_self.h" +#include "nnacl/arithmetic_self_parameter.h" #include "schema/model_generated.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/batch_to_space.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/batch_to_space.cc index 580605df78..d41cfb1752 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/batch_to_space.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/batch_to_space.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/batch_to_space.h" +#include "nnacl/batch_to_space.h" #include "include/errorcode.h" using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.cc index ada56d3f76..7aa01a9695 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.cc @@ -19,8 +19,8 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" -#include "src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" +#include "nnacl/batchnorm_parameter.h" +#include "nnacl/fp32/batchnorm.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h index 1b6e6a7e68..f8a13ff9f0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h @@ -20,8 +20,8 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" -#include "src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" +#include "nnacl/fp32/batchnorm.h" +#include "nnacl/batchnorm_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/bias.h b/mindspore/lite/src/runtime/kernel/arm/fp32/bias.h index 97c39e684b..10dab30752 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/bias.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/bias.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BIAS_H_ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic.h" namespace mindspore::kernel { class BiasCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to.h b/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to.h index 4f948d9d35..3c80af451b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h" +#include "nnacl/fp32/broadcast_to.h" namespace mindspore::kernel { class BroadcastToCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/cast.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/cast.cc index e28702fa12..2e984644bf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/cast.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/cast.cc @@ -17,8 +17,8 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/cast.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/fp32/cast.h" +#include "nnacl/op_base.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc index ed83589366..ad42fd95f5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/concat.h" #include -#include "src/runtime/kernel/arm/nnacl/fp32/concat.h" +#include "nnacl/fp32/concat.h" #include "src/kernel_registry.h" #include "schema/model_generated.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape.h b/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape.h index 88194a10b2..3ef626e54a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/constant_of_shape.h" +#include "nnacl/fp32/constant_of_shape.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc index b7ab2c3196..7d83c4fba1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc @@ -19,8 +19,8 @@ #include "src/runtime/kernel/arm/fp32/convolution_1x1.h" #include "src/runtime/kernel/arm/fp32/convolution_3x3.h" #include "src/runtime/kernel/arm/fp32/convolution_winograd.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" -#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "nnacl/fp32/conv.h" +#include "nnacl/common_func.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h index b53dd14dac..8b8fb3aca5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h @@ -19,9 +19,9 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" +#include "nnacl/fp32/conv.h" namespace mindspore::kernel { class ConvolutionCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1.h index 4ec8d90ad5..7b7413f516 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1.h @@ -21,14 +21,14 @@ #include #include "src/lite_kernel.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" -#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" +#include "nnacl/op_base.h" +#include "nnacl/winograd_transform.h" #include "src/runtime/kernel/arm/base/convolution_base.h" #include "src/runtime/kernel/arm/base/layout_transform.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" -#include "src/runtime/kernel/arm/nnacl/fp32/common_func.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/common_func.h" +#include "nnacl/matmul_parameter.h" +#include "nnacl/fp32/matmul.h" namespace mindspore::kernel { class Convolution1x1CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc index 22af27368d..d30a9c4402 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/convolution_3x3.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" +#include "nnacl/fp32/conv.h" #include "src/runtime/kernel/arm/base/layout_transform.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.h index c2f8747b8f..383c8f1bc6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" +#include "nnacl/winograd_transform.h" namespace mindspore::kernel { class Convolution3x3CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.h index 8fefa0dd08..81d1540010 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class ConvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3.h index bc4651a0d5..728c00c4b3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class ConvolutionDepthwise3x3CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc index 1087e3f883..11c561133c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/convolution_slidewindow.h" -#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "nnacl/common_func.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.h index a63de04b1c..40fa9eb285 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_slidewindow.h @@ -19,10 +19,10 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class ConvolutionSWCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc index c9fbdf6ddc..29504aa36d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/convolution_winograd.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" +#include "nnacl/fp32/conv.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.h index 97b5e149bb..44ff046cb5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" +#include "nnacl/winograd_transform.h" #include "src/runtime/kernel/arm/base/convolution_base.h" #include "src/runtime/kernel/arm/base/matrix.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/crop.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/crop.cc index d0e2e6a5a3..b8c4bca55f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/crop.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/crop.cc @@ -16,8 +16,8 @@ #include "src/runtime/kernel/arm/fp32/crop.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/crop.h" -#include "src/runtime/kernel/arm/nnacl/crop_parameter.h" +#include "nnacl/fp32/crop.h" +#include "nnacl/crop_parameter.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h index 44c6dc70da..b0a57a2c6d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h @@ -24,8 +24,8 @@ #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/deconv.h" -#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "nnacl/fp32/deconv.h" +#include "nnacl/fp32/matmul.h" namespace mindspore::kernel { class DeConvolutionCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.h b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.h index 54fd68e9e4..17b513d796 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class DeconvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/depth_to_space.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/depth_to_space.cc index fb31ffeab0..ef2f064ede 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/depth_to_space.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/depth_to_space.cc @@ -17,8 +17,8 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" -#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" +#include "nnacl/arithmetic_common.h" +#include "nnacl/depth_to_space.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/elu.h b/mindspore/lite/src/runtime/kernel/arm/fp32/elu.h index efddc8bf43..a2e1df3231 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/elu.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/elu.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/elu.h" +#include "nnacl/fp32/elu.h" namespace mindspore::kernel { class EluCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup.h b/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup.h index c8c2129429..5a8b39b78c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/embedding_lookup.h" namespace mindspore::kernel { class EmbeddingLookupCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h b/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h index c36c388d0d..85f1cddeb4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/expandDims.h" +#include "nnacl/fp32/expandDims.h" #include "schema/model_generated.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/fill.h b/mindspore/lite/src/runtime/kernel/arm/fp32/fill.h index 64d5b42774..bc73bbbbbd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/fill.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/fill.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/fill.h" +#include "nnacl/fp32/fill.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.cc index 788a0530e5..3f1a677558 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/fp32/flatten.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/flatten.h" +#include "nnacl/flatten.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h b/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h index c0834ded20..62938a6b91 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/flatten.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "ir/anf.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/flatten.h" +#include "nnacl/flatten.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection.h b/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection.h index cceac13d80..5ad3ac994d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection.h @@ -20,7 +20,7 @@ #include #include "include/errorcode.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul.h" #include "src/runtime/kernel/arm/base/fullconnection_base.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.cc index 3844d7ce11..e082a8818a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.cc @@ -19,8 +19,8 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" -#include "src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" +#include "nnacl/batchnorm_parameter.h" +#include "nnacl/fp32/batchnorm.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.h b/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.h index 165b361601..45b4e3b880 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" +#include "nnacl/batchnorm_parameter.h" namespace mindspore::kernel { class FusedBatchnormCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/gather.h b/mindspore/lite/src/runtime/kernel/arm/fp32/gather.h index 5b954e0b64..65df4f510c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/gather.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/gather.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GATHER_H_ #include -#include "src/runtime/kernel/arm/nnacl/fp32/gather.h" +#include "nnacl/fp32/gather.h" #include "src/lite_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd.h b/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd.h index 4b399243d0..4b8f016d04 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd.h @@ -18,11 +18,11 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GATHERND_H_ #include -#include "src/runtime/kernel/arm/nnacl/fp32/gatherNd.h" +#include "nnacl/fp32/gatherNd.h" #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.cc index 674764f55b..df623ff0e3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/leaky_relu.h" #include #include "schema/model_generated.h" -#include "src/runtime/kernel/arm/nnacl/fp32/leaky_relu.h" +#include "nnacl/fp32/leaky_relu.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/leaky_relu.h b/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.h index 816e8f41eb..aaca8d13d7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/leaky_relu.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/leaky_relu.h" +#include "nnacl/fp32/leaky_relu.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm.h b/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm.h index 6a6bfaa75b..13915eca60 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_LOCAL_RESPONSE_NORM_H_ #include -#include "src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h" +#include "nnacl/fp32/local_response_norm.h" #include "src/lite_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h b/mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h index 5bdba39fdb..80c9a6bab0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/lstm.h" +#include "nnacl/fp32/lstm.h" namespace mindspore::kernel { class LstmCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.cc index 5ec49ada49..dbec2fb6b3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/matmul.h" -#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.h b/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.h index 4b29b0cceb..a0a32e82f4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/matmul.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" +#include "nnacl/matmul_parameter.h" #include "src/runtime/kernel/arm/base/matmul_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/nchw2nhwc.h b/mindspore/lite/src/runtime/kernel/arm/fp32/nchw2nhwc.h index d3070ea4fa..b789afdb68 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/nchw2nhwc.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/nchw2nhwc.h @@ -23,7 +23,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" namespace mindspore::kernel { class Nchw2NhwcCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/nhwc2nchw.h b/mindspore/lite/src/runtime/kernel/arm/fp32/nhwc2nchw.h index 52558bbaf3..d784fa7944 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/nhwc2nchw.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/nhwc2nchw.h @@ -23,7 +23,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" namespace mindspore::kernel { class Nhwc2NchwCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot.cc index 488057751c..757482f02a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/one_hot.h" -#include "src/runtime/kernel/arm/nnacl/fp32/one_hot.h" +#include "nnacl/fp32/one_hot.h" #include "schema/model_generated.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc index 168a83c8c7..012f4ab4f4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc @@ -18,7 +18,7 @@ #include "schema/model_generated.h" #include "src/runtime/kernel/arm/fp32/pad.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "nnacl/errorcode.h" #include "src/runtime/runtime_api.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.h b/mindspore/lite/src/runtime/kernel/arm/fp32/pad.h index ca0d2c2cd2..9b3ae6ded0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/pad.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/pad.h" +#include "nnacl/fp32/pad.h" #include "src/runtime/kernel/arm/base/layout_transform.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/pooling.cc index 7ea32a1391..8ea453593f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/pooling.cc @@ -15,11 +15,11 @@ */ #include "src/runtime/kernel/arm/fp32/pooling.h" -#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/power.h b/mindspore/lite/src/runtime/kernel/arm/fp32/power.h index 0f1ed2a698..c5bc0fde7c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/power.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/power.h @@ -20,7 +20,7 @@ #include #include "include/context.h" #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/power.h" +#include "nnacl/power.h" #include "src/runtime/kernel/arm/base/power_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h index 9dc9080b04..4fe0edaf18 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/prelu.h" +#include "nnacl/fp32/prelu.h" namespace mindspore::kernel { class PReluCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/range.h b/mindspore/lite/src/runtime/kernel/arm/fp32/range.h index 95bd779133..8938e1791c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/range.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/range.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/range.h" +#include "nnacl/fp32/range.h" namespace mindspore::kernel { class RangeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/rank.h b/mindspore/lite/src/runtime/kernel/arm/fp32/rank.h index 4db3a00f1a..36bbca742a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/rank.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/rank.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/rank.h" +#include "nnacl/fp32/rank.h" namespace mindspore::kernel { class RankCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h index 9792ca9578..b1fa2920ca 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce.h" #include "src/runtime/kernel/arm/base/reduce_base.h" #include "ir/anf.h" using mindspore::schema::ReduceMode; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reshape.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/reshape.cc index 1a28fe871c..15adf3e113 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reshape.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reshape.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/reshape.h" #include -#include "src/runtime/kernel/arm/nnacl/reshape.h" +#include "nnacl/reshape.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc index 7ee53e3603..e61ff43cb8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/reverse.h" +#include "nnacl/fp32/reverse.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence.h b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence.h index 8a924232b4..ae7e71229f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/reverse_sequence.h" +#include "nnacl/reverse_sequence.h" namespace mindspore::kernel { class ReverseSequenceCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.cc index abc0fcff5d..21718c5553 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/arm/fp32/roi_pooling.h" -#include "src/runtime/kernel/arm/nnacl/fp32/roi_pooling.h" +#include "nnacl/fp32/roi_pooling.h" #include #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.h b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.h index 95ab84aea2..b870d1669d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/roi_pooling.h" +#include "nnacl/fp32/roi_pooling.h" namespace mindspore::kernel { class ROIPoolingCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/scale.h b/mindspore/lite/src/runtime/kernel/arm/fp32/scale.h index b07fb52139..5125e17f1b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/scale.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/scale.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/scale.h" +#include "nnacl/scale.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd.h b/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd.h index c1a3ed52f1..48dd88f82f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/scatter_nd.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/scatter_nd.h" +#include "nnacl/scatter_nd.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/shape.h b/mindspore/lite/src/runtime/kernel/arm/fp32/shape.h index 0f1fae6ce9..087c6ed1e9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/shape.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/shape.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/shape.h" +#include "nnacl/shape.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/slice.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/slice.cc index fe4efe59fb..d81023a373 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/slice.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/slice.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/slice.h" +#include "nnacl/fp32/slice.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/softmax.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/softmax.cc index 5e9a7c5f43..280bdada8e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/softmax.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/softmax.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/fp32/softmax.h" #include #include -#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch.cc index 3cfdad473b..81d6e9dee4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch.cc @@ -18,8 +18,8 @@ #include "schema/ops_generated.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h" -#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/errorcode.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc index 7b3a3de852..4e927e736b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h" +#include "nnacl/fp32/space_to_depth.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.cc index 4591e7e823..16f89d1819 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "schema/ops_generated.h" -#include "src/runtime/kernel/arm/nnacl/sparse_to_dense.h" +#include "nnacl/sparse_to_dense.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/sparse_to_dense.h b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.h index 70e68c11a4..9dcfdc2a94 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/sparse_to_dense.h" +#include "nnacl/sparse_to_dense.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/split.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/split.cc index 98e58b578f..7fe0f68eae 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/split.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/split.cc @@ -16,8 +16,8 @@ #include "src/runtime/kernel/arm/fp32/split.h" #include "src/runtime/kernel/arm/base/split_base.h" -#include "src/runtime/kernel/arm/nnacl/split.h" -#include "src/runtime/kernel/arm/nnacl/split_parameter.h" +#include "nnacl/split.h" +#include "nnacl/split_parameter.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/squeeze.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/squeeze.cc index a8baa45911..b334b72366 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/squeeze.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/squeeze.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/squeeze.h" #include -#include "src/runtime/kernel/arm/nnacl/squeeze.h" +#include "nnacl/squeeze.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/stack.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/stack.cc index 7beb89e83b..81ae87979b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/stack.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/stack.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/stack.h" +#include "nnacl/fp32/stack.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/tile.h b/mindspore/lite/src/runtime/kernel/arm/fp32/tile.h index 51d741f41f..49e9d93e7a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/tile.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/tile.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/tile.h" +#include "nnacl/fp32/tile.h" namespace mindspore::kernel { class TileCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/topk.h b/mindspore/lite/src/runtime/kernel/arm/fp32/topk.h index 80270e579a..9a8d0785cc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/topk.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/topk.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/topk.h" +#include "nnacl/fp32/topk.h" namespace mindspore::kernel { class TopKCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/transpose.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/transpose.cc index 5ceb5f2cc4..a8fff82ddf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/transpose.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/transpose.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/transpose.h" #include -#include "src/runtime/kernel/arm/nnacl/transpose.h" +#include "nnacl/transpose.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/unique.h b/mindspore/lite/src/runtime/kernel/arm/fp32/unique.h index ab6558674e..d9072cd7bc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/unique.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/unique.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/unique.h" +#include "nnacl/fp32/unique.h" namespace mindspore::kernel { class UniqueCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze.h b/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze.h index b488ec2042..119662a1e5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h" +#include "nnacl/fp32/unsqueeze.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/unstack.h b/mindspore/lite/src/runtime/kernel/arm/fp32/unstack.h index 2746c5a349..4280afaf4c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/unstack.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/unstack.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/unstack.h" +#include "nnacl/unstack.h" namespace mindspore::kernel { class UnstackCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/where.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/where.cc index a6f20753dd..4a853aa2c0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/where.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/where.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/where.h" #include #include "schema/model_generated.h" -#include "src/runtime/kernel/arm/nnacl/where.h" +#include "nnacl/where.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.h b/mindspore/lite/src/runtime/kernel/arm/fp32/where.h index b213068772..0b704a87b9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/where.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/where.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/where.h" +#include "nnacl/where.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/zeroslike.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/zeroslike.cc index e1536f4525..9a2fe6a11f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/zeroslike.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/zeroslike.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/zeroslike.h" #include #include "schema/model_generated.h" -#include "src/runtime/kernel/arm/nnacl/zeroslike.h" +#include "nnacl/zeroslike.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h index cc0d5126bb..b6236385b2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h @@ -21,7 +21,7 @@ #include "src/lite_kernel.h" #include "ir/anf.h" -#include "src/runtime/kernel/arm/nnacl/activation_grad.h" +#include "nnacl/activation_grad.h" namespace mindspore::kernel { class ActivationGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc index 37fe1dbcac..83edebb78f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc @@ -16,8 +16,8 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/reduce_grad.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/arithmetic_grad.h" +#include "nnacl/fp32_grad/reduce_grad.h" +#include "nnacl/fp32_grad/arithmetic_grad.h" #include "src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h index 90ac24e197..7b5b94e0d1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic.h" #include "schema/model_generated.h" #include "ir/anf.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h index e2260e31f3..1b8596210b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h @@ -21,7 +21,7 @@ #include "src/lite_kernel.h" #include "ir/anf.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic.h" namespace mindspore::kernel { class BiasGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bn_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bn_grad.cc index f9243aa080..dedaa8f0f5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bn_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bn_grad.cc @@ -19,7 +19,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/runtime/kernel/arm/fp32_grad/bn_grad.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/batch_norm.h" +#include "nnacl/fp32_grad/batch_norm.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_filter.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_filter.cc index 632187f29e..ca4030e962 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_filter.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_filter.cc @@ -16,9 +16,9 @@ #include "src/runtime/kernel/arm/fp32_grad/convolution_grad_filter.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/gemm.h" +#include "nnacl/pack.h" +#include "nnacl/fp32_grad/pack_ext.h" +#include "nnacl/fp32_grad/gemm.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_input.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_input.cc index d6d4896555..c067053c41 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_input.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_input.cc @@ -16,9 +16,9 @@ #include "src/runtime/kernel/arm/fp32_grad/convolution_grad_input.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/pack_ext.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/gemm.h" +#include "nnacl/pack.h" +#include "nnacl/fp32_grad/pack_ext.h" +#include "nnacl/fp32_grad/gemm.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc index 91f7276396..fda7fc1a21 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc @@ -17,8 +17,8 @@ #include "src/runtime/kernel/arm/fp32_grad/pooling_grad.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.h" +#include "nnacl/fp32/pooling.h" +#include "nnacl/fp32_grad/pooling_grad.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc index 360acd905f..8cd1c6ee6b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc @@ -18,7 +18,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; 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 10d80634e6..60f406d04f 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 @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "ir/anf.h" -#include "src/runtime/kernel/arm/nnacl/power.h" +#include "nnacl/power.h" namespace mindspore::kernel { class PowerGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc index 6e07dc27d1..ee906eb686 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc @@ -15,8 +15,8 @@ */ #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h" -#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h" +#include "nnacl/softmax_parameter.h" +#include "nnacl/fp32/softmax.h" #include "src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h index 0c619692ed..1e243ef542 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h @@ -20,8 +20,8 @@ #include #include "src/lite_kernel.h" #include "ir/anf.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/softmax_grad.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "nnacl/fp32_grad/softmax_grad.h" +#include "nnacl/fp32/arithmetic.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.cc index be93ddb0a0..b4a8a341b1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.cc @@ -17,8 +17,8 @@ #include "src/runtime/kernel/arm/int8/add_int8.h" #include #include -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/arithmetic_common.h" +#include "nnacl/quantization/quantize.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.h index 065992ed65..be83375b0d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/add_int8.h" +#include "nnacl/int8/add_int8.h" #include "src/runtime/runtime_api.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.cc index b92d3c9b2f..02ebbee4b9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h" +#include "nnacl/int8/arg_min_max_int8.h" #include "include/errorcode.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.h index 0d618103d1..0fa4166d4f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/argminmax_int8.h @@ -18,7 +18,7 @@ #include #include "src/runtime/kernel/arm/base/arg_min_max_base.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" namespace mindspore::kernel { class ArgMinMaxInt8CPUKernel : public ArgMinMaxBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.cc index 21e65d7754..c05aac9896 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/arithmetic_int8.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "nnacl/arithmetic_common.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.h index c109cdbd93..104b742060 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "schema/model_generated.h" -#include "src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h" +#include "nnacl/int8/arithmetic_int8.h" namespace mindspore::kernel { class ArithmeticInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_self_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_self_int8.h index c8d08a2b8d..d9e7ee7515 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_self_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_self_int8.h @@ -19,8 +19,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h" -#include "src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h" +#include "nnacl/arithmetic_self_parameter.h" +#include "nnacl/int8/arithmetic_self_int8.h" #include "schema/model_generated.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/batch_to_space_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/batch_to_space_int8.cc index f17fdda38a..574c385782 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/batch_to_space_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/batch_to_space_int8.cc @@ -17,8 +17,8 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/batch_to_space.h" -#include "src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h" +#include "nnacl/batch_to_space.h" +#include "nnacl/int8/batch_to_space_int8.h" #include "include/errorcode.h" using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.cc index fe598e1201..e702bcc27d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.cc @@ -20,7 +20,7 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" -#include "src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" +#include "nnacl/batchnorm_parameter.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.h index 45409d3002..d1b92d62f8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/batchnorm_int8.h @@ -20,8 +20,8 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.h" -#include "src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" +#include "nnacl/int8/batchnorm_int8.h" +#include "nnacl/batchnorm_parameter.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.cc index a94519e516..f7abe0df3a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/int8/bias_add_int8.h" -#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" -#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "nnacl/fp32/arithmetic.h" +#include "nnacl/errorcode.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.h index 71fd21f5e0..78a6d44d32 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.h @@ -18,8 +18,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/unique.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "nnacl/fp32/unique.h" +#include "nnacl/arithmetic_common.h" namespace mindspore::kernel { class BiasAddInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/concat_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/concat_int8.cc index 0795b4cb00..d60bde5f3e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/concat_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/concat_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/concat_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/concat_int8.h" +#include "nnacl/int8/concat_int8.h" #include "schema/model_generated.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc index ee885217fe..5dbddbaba2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/convolution_3x3_int8.h" -#include "src/runtime/kernel/arm/nnacl/int8/conv_int8.h" +#include "nnacl/int8/conv_int8.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.h index 9ffa1096a1..aba4428b9c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_3x3_int8.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" +#include "nnacl/winograd_transform.h" #include "src/runtime/kernel/arm/base/convolution_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.cc index 716b696fa8..33683f54cf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.cc @@ -18,7 +18,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h" +#include "nnacl/int8/conv_depthwise_int8.h" #include "src/runtime/runtime_api.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.h index 57cafca3d7..cef519df8d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_int8.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class ConvolutionDepthwiseInt8CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc index 95b0bd5e10..36760454eb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/convolution_int8.h" #include "src/runtime/kernel/arm/int8/convolution_3x3_int8.h" -#include "src/runtime/kernel/arm/nnacl/int8/conv_int8.h" +#include "nnacl/int8/conv_int8.h" #include "src/runtime/kernel/arm/base/layout_transform.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.h index 4b6ddacf5b..13841fd765 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_int8.h @@ -20,8 +20,8 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/conv_int8.h" +#include "nnacl/optimized_kernel.h" +#include "nnacl/int8/conv_int8.h" namespace mindspore::kernel { class ConvolutionInt8CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/crop_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/crop_int8.cc index 04ed3ba4bd..0feb6e6614 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/crop_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/crop_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/crop_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/crop_int8.h" +#include "nnacl/int8/crop_int8.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.cc index f878f95276..4f51bdc6ef 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.cc @@ -18,7 +18,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h" +#include "nnacl/int8/conv_depthwise_int8.h" #include "src/runtime/runtime_api.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.h index ee07bad693..4437a412d0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_depthwise_int8.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class DeconvolutionDepthwiseInt8CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.cc index d7a9f8e960..55e8f60d50 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/deconvolution_int8.h" #include "src/runtime/runtime_api.h" -#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" +#include "nnacl/optimized_kernel.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h index 1cffed22bd..51a4b97210 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h @@ -21,13 +21,13 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" -#include "src/runtime/kernel/arm/nnacl/int8/deconv.h" -#include "src/runtime/kernel/arm/nnacl/int8/common_func.h" -#include "src/runtime/kernel/arm/nnacl/int8/matmul_int8.h" +#include "nnacl/matmul_parameter.h" +#include "nnacl/int8/deconv.h" +#include "nnacl/int8/common_func.h" +#include "nnacl/int8/matmul_int8.h" #include "src/runtime/kernel/arm/base/layout_transform.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "nnacl/arithmetic_common.h" namespace mindspore::kernel { class DeConvInt8CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.cc index 5e4dcb0285..5e1753b4f9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.cc @@ -17,8 +17,8 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" -#include "src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h" +#include "nnacl/depth_to_space.h" +#include "nnacl/int8/depth_to_space_int8.h" #include "include/errorcode.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.h index 9649c27dad..2b569ae8eb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/depth_to_space_int8.h @@ -18,7 +18,7 @@ #include #include "src/runtime/kernel/arm/base/depth_to_space_base.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" namespace mindspore::kernel { class DepthToSpaceInt8CPUKernel : public DepthToSpaceBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.cc index 7a76970ed0..1c8754b5b4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/int8/div_int8.h" #include #include -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "nnacl/arithmetic_common.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.h index 0e240bb054..fb2d7a12b3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/div_int8.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/div_int8.h" +#include "nnacl/int8/div_int8.h" #include "src/runtime/runtime_api.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.cc index 45e2809221..9a092eb994 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/int8/fullconnection_int8.h" -#include "src/runtime/kernel/arm/nnacl/int8/matmul_int8.h" -#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "nnacl/int8/matmul_int8.h" +#include "nnacl/common_func.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h index c4db0aa640..9af8b850fa 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h @@ -19,9 +19,9 @@ #include #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" #include "src/runtime/kernel/arm/base/fullconnection_base.h" -#include "src/runtime/kernel/arm/nnacl/int8/common_func.h" +#include "nnacl/int8/common_func.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.cc index e34330e9f1..686e14cf61 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/hswish_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/hswish_int8.h" +#include "nnacl/int8/hswish_int8.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h index 6f39a5e23f..ce11075b21 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h @@ -19,8 +19,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/hswish_int8.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/int8/hswish_int8.h" +#include "nnacl/quantization/quantize.h" namespace mindspore::kernel { class HswishInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc index 6b5f8ada55..9bc770b1cb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/leaky_relu_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/leaky_relu_int8.h" +#include "nnacl/int8/leaky_relu_int8.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.cc index 913e7c420c..7c7c798ee6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/int8/matmul_int8.h" -#include "src/runtime/kernel/arm/nnacl/int8/matmul_int8.h" -#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "nnacl/int8/matmul_int8.h" +#include "nnacl/common_func.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.h index 7dde20d2e7..7e6d66f8fb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.h @@ -19,7 +19,7 @@ #include #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" #include "src/runtime/kernel/arm/base/matmul_base.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.cc index d06a24926e..e8c67c4c79 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.cc @@ -17,8 +17,8 @@ #include "src/runtime/kernel/arm/int8/mul_int8.h" #include #include -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" -#include "src/runtime/kernel/arm/nnacl/int8/mul_int8.h" +#include "nnacl/arithmetic_common.h" +#include "nnacl/int8/mul_int8.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.h index 3b2917d2e8..36d9984cac 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/mul_int8.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/mul_parameter.h" +#include "nnacl/mul_parameter.h" #include "src/runtime/runtime_api.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/pad_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/pad_int8.h index d65b673345..91cd01c8a1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/pad_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/pad_int8.h @@ -20,8 +20,8 @@ #include "include/errorcode.h" #include "src/lite_kernel.h" #include "src/runtime/runtime_api.h" -#include "src/runtime/kernel/arm/nnacl/pad_parameter.h" -#include "src/runtime/kernel/arm/nnacl/int8/pad.h" +#include "nnacl/pad_parameter.h" +#include "nnacl/int8/pad.h" namespace mindspore::kernel { class PadInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/pooling_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/pooling_int8.cc index 1b88ce4519..f9e990bab4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/pooling_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/pooling_int8.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/int8/pooling_int8.h" -#include "src/runtime/kernel/arm/nnacl/int8/pooling_int8.h" -#include "src/runtime/kernel/arm/nnacl/fp32/cast.h" +#include "nnacl/int8/pooling_int8.h" +#include "nnacl/fp32/cast.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.cc index 175f4b87af..9e7aa10d62 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/power_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/power_int8.h" +#include "nnacl/int8/power_int8.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.h index 14fe5bfd93..c02cbff9d8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/power_int8.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/arm/base/power_base.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" namespace mindspore::kernel { class PowerInt8CPUKernel : public PowerBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h index 21d54e61bb..336d2b1c89 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h @@ -19,8 +19,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" -#include "src/runtime/kernel/arm/nnacl/int8/relux_int8.h" +#include "nnacl/fp32/activation.h" +#include "nnacl/int8/relux_int8.h" namespace mindspore::kernel { class ReluXInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/reshape_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/reshape_int8.cc index f08875b45b..02149c3847 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/reshape_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/reshape_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/reshape_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/reshape_int8.h" +#include "nnacl/int8/reshape_int8.h" #include "schema/model_generated.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.cc index 00d2047fbc..750fdcea9f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.cc @@ -16,8 +16,8 @@ #include "src/runtime/kernel/arm/int8/sigmoid_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/sigmoid_int8.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/int8/sigmoid_int8.h" +#include "nnacl/quantization/quantize.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.h index 0f243a1b59..9a86bac3f3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/sigmoid_int8.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/sigmoid_int8.h" +#include "nnacl/int8/sigmoid_int8.h" namespace mindspore::kernel { class SigmoidInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.cc index f81bf6c504..1ba2df8f25 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.cc @@ -16,8 +16,8 @@ #include "src/runtime/kernel/arm/int8/slice_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/slice_parameter.h" -#include "src/runtime/kernel/arm/nnacl/int8/slice_int8.h" +#include "nnacl/slice_parameter.h" +#include "nnacl/int8/slice_int8.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.h index ad9fa7741a..c9247421f0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/slice_int8.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/arm/base/slice_base.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" namespace mindspore::kernel { class SliceInt8CPUKernel : public SliceBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.cc index 18025196f6..20f52429e7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/softmax_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/int8/softmax_int8.h" +#include "nnacl/int8/softmax_int8.h" #include "schema/model_generated.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.h index 1300bdb324..97bcc62e39 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/arm/base/softmax_base.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/quantization/quantize.h" namespace mindspore::kernel { class SoftmaxInt8CPUKernel : public SoftmaxBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/split_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/split_int8.cc index 92cff84c32..b69891f45d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/split_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/split_int8.cc @@ -16,8 +16,8 @@ #include "src/runtime/kernel/arm/int8/split_int8.h" #include -#include "src/runtime/kernel/arm/nnacl/split_parameter.h" -#include "src/runtime/kernel/arm/nnacl/int8/split_int8.h" +#include "nnacl/split_parameter.h" +#include "nnacl/int8/split_int8.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/squeeze_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/squeeze_int8.cc index 34ccfc2d52..311a3e41f4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/squeeze_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/squeeze_int8.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/nnacl/int8/squeeze_int8.h" +#include "nnacl/int8/squeeze_int8.h" #include "src/runtime/kernel/arm/int8/squeeze_int8.h" -#include "src/runtime/kernel/arm/nnacl/squeeze_parameter.h" +#include "nnacl/squeeze_parameter.h" #include "schema/model_generated.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.cc index 61aaf47c03..4a68c8034f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.cc @@ -17,8 +17,8 @@ #include "src/runtime/kernel/arm/int8/sub_int8.h" #include #include -#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" -#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "nnacl/arithmetic_common.h" +#include "nnacl/quantization/quantize.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.h index d662cc2beb..96cd4732c6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/sub_int8.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/sub_int8.h" +#include "nnacl/int8/sub_int8.h" #include "src/runtime/runtime_api.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/topk_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/topk_int8.h index 0f7c153c6c..91c204c27e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/topk_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/topk_int8.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/int8/topk_int8.h" +#include "nnacl/int8/topk_int8.h" namespace mindspore::kernel { class TopKInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.cc index 16a6ff5c99..35c7200b56 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/nnacl/int8/unsqueeze_int8.h" +#include "nnacl/int8/unsqueeze_int8.h" #include "src/runtime/kernel/arm/int8/unsqueeze_int8.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.h index 7e42e818c0..9e127f3d82 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/unsqueeze_int8.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "src/runtime/kernel/arm/nnacl/int8/unsqueeze_int8.h" +#include "nnacl/int8/unsqueeze_int8.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::Context; diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_parameter.h deleted file mode 100644 index c64179bd63..0000000000 --- a/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_parameter.h +++ /dev/null @@ -1,22 +0,0 @@ -/** - * 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_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_ - -#include "nnacl/op_attribute.h" - -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h index 910cf3f2a5..c4ee6779b0 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h @@ -21,7 +21,7 @@ #include "src/runtime/opencl/opencl_runtime.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "nnacl/fp32/activation.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h index f27556e060..fbfd2a18dc 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h @@ -21,7 +21,7 @@ #include "ir/anf.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "src/runtime/opencl/opencl_runtime.h" -#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" +#include "nnacl/fp32/batchnorm.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h index ff6e84689c..d8f05d6118 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "nnacl/conv_parameter.h" #include "src/runtime/opencl/opencl_runtime.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h index 373b703f52..4ad51a15a4 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h @@ -23,7 +23,7 @@ #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "schema/model_generated.h" #include "src/runtime/opencl/opencl_runtime.h" -#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "nnacl/conv_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc index 16a9d5db39..fbd146992c 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc @@ -22,7 +22,7 @@ #include "src/runtime/opencl/opencl_runtime.h" #include "src/runtime/kernel/arm/fp32/convolution_depthwise.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #ifndef PROGRAM_WITH_IL diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.h index a137cef78d..22c167b964 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "nnacl/conv_parameter.h" #include "src/runtime/opencl/opencl_runtime.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc index 88673b9dfc..9593cc419d 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc @@ -18,7 +18,7 @@ #include #include "src/kernel_registry.h" #include "src/runtime/opencl/opencl_runtime.h" -#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul.h" #include "src/runtime/kernel/opencl/kernel/matmul.h" #ifndef PROGRAM_WITH_IL #include "src/runtime/kernel/opencl/cl/matmul.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.h index f5f90d6307..35540767c7 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.h @@ -20,7 +20,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "nnacl/conv_parameter.h" #include "src/runtime/opencl/opencl_runtime.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h index 56859a4a95..dcf0f0dd09 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h @@ -20,7 +20,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling.h" #include "src/runtime/opencl/opencl_runtime.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc index 02eae73164..4f4e39a63a 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc @@ -24,7 +24,7 @@ #include "src/runtime/kernel/opencl/kernel/prelu.h" #include "src/runtime/opencl/opencl_runtime.h" #include "src/runtime/kernel/opencl/cl/activation.cl.inc" -#include "src/runtime/kernel/arm/nnacl/prelu_parameter.h" +#include "nnacl/prelu_parameter.h" using mindspore::kernel::KERNEL_ARCH::kGPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/slice.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/slice.h index 11439660ae..2df3f3f3e1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/slice.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/slice.h @@ -21,7 +21,7 @@ #include "ir/anf.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "src/runtime/opencl/opencl_runtime.h" -#include "src/runtime/kernel/arm/nnacl/fp32/slice.h" +#include "nnacl/fp32/slice.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.h index 565aaf988d..029cb7ec52 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.h @@ -20,7 +20,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax.h" #include "src/runtime/opencl/opencl_runtime.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/utils.h b/mindspore/lite/src/runtime/kernel/opencl/utils.h index d1c0d130f3..07a87547bb 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/utils.h +++ b/mindspore/lite/src/runtime/kernel/opencl/utils.h @@ -21,7 +21,7 @@ #include #include "CL/cl2.hpp" #include "utils/log_adapter.h" -#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "nnacl/op_base.h" #include "src/lite_kernel.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/runtime/opencl/opencl_executor.cc b/mindspore/lite/src/runtime/opencl/opencl_executor.cc index 92a6e47e46..500f22f52a 100644 --- a/mindspore/lite/src/runtime/opencl/opencl_executor.cc +++ b/mindspore/lite/src/runtime/opencl/opencl_executor.cc @@ -16,7 +16,7 @@ #include "src/runtime/opencl/opencl_executor.h" #include "src/runtime/kernel/opencl/utils.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #include "src/common/ms_tensor_utils.h" #include "include/errorcode.h" diff --git a/mindspore/lite/test/CMakeLists.txt b/mindspore/lite/test/CMakeLists.txt index d773c2434f..3aea9e8ace 100644 --- a/mindspore/lite/test/CMakeLists.txt +++ b/mindspore/lite/test/CMakeLists.txt @@ -86,14 +86,14 @@ file(GLOB KERNEL_OP_SRC ${LITE_DIR}/src/runtime/kernel/arm/base/*.cc ${LITE_DIR}/src/runtime/kernel/arm/fp32/*.cc ${LITE_DIR}/src/runtime/kernel/arm/int8/*.cc - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/*.c - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/fp32/*.c - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/int8/*.c - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/quantization/*.c + ${LITE_DIR}/nnacl/*.c + ${LITE_DIR}/nnacl/fp32/*.c + ${LITE_DIR}/nnacl/int8/*.c + ${LITE_DIR}/nnacl/quantization/*.c ) file(GLOB KERNEL_OP_TRAIN_SRC - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/fp32_grad/*.c + ${LITE_DIR}/nnacl/fp32_grad/*.c ${LITE_DIR}/src/runtime/kernel/arm/fp32_grad/*.cc ) @@ -103,8 +103,8 @@ endif() if (PLATFORM_ARM64) # assembly - file(GLOB TEST_ASSEMBLY_SRC ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm64/*.s - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm64/*.S) + file(GLOB TEST_ASSEMBLY_SRC ${LITE_DIR}/nnacl/assembly/arm64/*.s + ${LITE_DIR}/nnacl/assembly/arm64/*.S) set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C) set(KERNEL_OP_SRC @@ -116,8 +116,8 @@ endif() if (PLATFORM_ARM32) # assembly file(GLOB TEST_ASSEMBLY_SRC - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.S - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.s) + ${LITE_DIR}/nnacl/assembly/arm32/*.S + ${LITE_DIR}/nnacl/assembly/arm32/*.s) set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C) set(KERNEL_OP_SRC ${KERNEL_OP_SRC} @@ -128,7 +128,7 @@ endif() if (ENABLE_FP16) file(GLOB KERNEL_OP_FP16_SRC ${LITE_DIR}/src/runtime/kernel/arm/fp16/*.cc - ${LITE_DIR}/src/runtime/kernel/arm/nnacl/fp16/*.c + ${LITE_DIR}/nnacl/fp16/*.c ) set(KERNEL_OP_SRC ${KERNEL_OP_SRC} diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/common/pack_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/common/pack_tests.cc index 7c3099bd4b..5ad46139ba 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/common/pack_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/common/pack_tests.cc @@ -19,7 +19,7 @@ #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/common/file_utils.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h" +#include "mindspore/lite/nnacl/pack.h" namespace mindspore { class TestPack : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc index 11eb9c65f2..4ef77d515c 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.h" +#include "mindspore/lite/nnacl/strided_slice.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/convolution_fp16_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/convolution_fp16_tests.cc index f29be92676..599e75739b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/convolution_fp16_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/convolution_fp16_tests.cc @@ -22,7 +22,7 @@ #include "src/common/file_utils.h" #include "mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.h" #include "mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h" -#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" +#include "nnacl/fp16/conv_fp16.h" namespace mindspore { class TestConvolutionFp16 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/activation_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/activation_fp32_test.cc index 9a9f84d31f..9b1c8fcd99 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/activation_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/activation_fp32_test.cc @@ -16,7 +16,7 @@ #include #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/argminmax_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/argminmax_fp32_test.cc index 03e89a48f3..d27402733b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/argminmax_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/argminmax_fp32_test.cc @@ -15,9 +15,9 @@ */ #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "mindspore/lite/nnacl/fp32/arg_min_max.h" +#include "mindspore/lite/nnacl/arg_min_max.h" +#include "mindspore/lite/nnacl/arithmetic_common.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc index 514e64c1f6..0b0967e64f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc @@ -18,7 +18,7 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "mindspore/lite/nnacl/fp32/arithmetic.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batch_to_space_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batch_to_space_fp32_test.cc index ebaf1ae920..70875856fe 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batch_to_space_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batch_to_space_fp32_test.cc @@ -15,8 +15,8 @@ */ #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "mindspore/lite/nnacl/batch_to_space.h" +#include "mindspore/lite/nnacl/arithmetic_common.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc index c85fde74ea..4ac9b4473d 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc @@ -16,7 +16,7 @@ #include #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" +#include "mindspore/lite/nnacl/fp32/batchnorm.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/conv1x1_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/conv1x1_fp32_tests.cc index 465cc28df3..9ad190d410 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/conv1x1_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/conv1x1_fp32_tests.cc @@ -20,8 +20,8 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "src/runtime/kernel/arm/fp32/convolution_1x1.h" -#include "src/runtime/kernel/arm/nnacl/matmul_parameter.h" -#include "src/runtime/kernel/arm/nnacl/strassen_matmul.h" +#include "nnacl/matmul_parameter.h" +#include "nnacl/strassen_matmul.h" namespace mindspore { using mindspore::lite::tensor::Tensor; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc index 5452e80f46..d8220719c5 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h" +#include "mindspore/lite/nnacl/fp32/crop.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/crop.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc index e9e6fbbd74..2cb2f522f6 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h" +#include "mindspore/lite/nnacl/fp32/deconv.h" namespace mindspore { class TestDeConvolutionFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/depth_to_space_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/depth_to_space_fp32_test.cc index be9303ea02..85060e1f87 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/depth_to_space_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/depth_to_space_fp32_test.cc @@ -15,8 +15,8 @@ */ #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "mindspore/lite/nnacl/depth_to_space.h" +#include "mindspore/lite/nnacl/arithmetic_common.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc index 9bc94e9eaf..e1856ae126 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc @@ -16,7 +16,7 @@ #include #include "src/runtime/kernel/arm/fp32/elu.h" -#include "src/runtime/kernel/arm/nnacl/fp32/elu.h" +#include "nnacl/fp32/elu.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "utils/log_adapter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc index 45ed9b8689..ff9ec8c554 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc @@ -16,7 +16,7 @@ #include #include "src/runtime/kernel/arm/fp32/embedding_lookup.h" -#include "src/runtime/kernel/arm/nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/embedding_lookup.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "utils/log_adapter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/fullconnection_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/fullconnection_fp32_tests.cc index a2e5ef95c9..f4da518bd2 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/fullconnection_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/fullconnection_fp32_tests.cc @@ -21,7 +21,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "src/runtime/kernel/arm/fp32/fullconnection.h" -#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul.h" namespace mindspore { using mindspore::lite::tensor::Tensor; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lstm_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lstm_fp32_tests.cc index 47d1d6c0f7..108815e73e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lstm_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lstm_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h" +#include "mindspore/lite/nnacl/fp32/lstm.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc index 0ed7a05f73..8f968c443f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc @@ -17,7 +17,7 @@ #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/matmul.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h" +#include "mindspore/lite/nnacl/fp32/matmul.h" #include "src/kernel_registry.h" #include "src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc index 3d2be11e0f..5940775d61 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc @@ -16,7 +16,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h" +#include "mindspore/lite/nnacl/fp32/reduce.h" namespace mindspore { 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 9c8c9c30f8..a948947f5c 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/src/runtime/kernel/arm/nnacl/reverse_sequence.h" +#include "mindspore/lite/nnacl/reverse_sequence.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc index 1300f946a5..69f9441314 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_batch_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h" +#include "mindspore/lite/nnacl/fp32/space_to_batch.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_depth_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_depth_fp32_tests.cc index e8d1b92980..0444d8bd3a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_depth_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/space_to_depth_fp32_tests.cc @@ -18,7 +18,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h" +#include "mindspore/lite/nnacl/fp32/space_to_depth.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strassen_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strassen_fp32_tests.cc index 022bd4fab7..f1c76c7676 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strassen_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strassen_fp32_tests.cc @@ -18,9 +18,9 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "mindspore/lite/nnacl/pack.h" +#include "mindspore/lite/nnacl/fp32/strassen_matmul.h" +#include "mindspore/lite/nnacl/conv_parameter.h" namespace mindspore { class TestStrassenFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc index b8fe7ca185..f8985a6ec1 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/tile.h" +#include "mindspore/lite/nnacl/fp32/tile.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/topk_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/topk_fp32_tests.cc index d86c3f2a1a..f7d2429858 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/topk_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/topk_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h" +#include "mindspore/lite/nnacl/fp32/topk.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc index ef19a5780b..9c6d3e9359 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc @@ -19,7 +19,7 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/transpose.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h" +#include "mindspore/lite/nnacl/transpose.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc index 61281b0f6d..420912e578 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unique.h" +#include "mindspore/lite/nnacl/fp32/unique.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc index 9504a99cbb..f9d7fb83db 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h" +#include "mindspore/lite/nnacl/unstack.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc index e4b78e4b2e..1d317bbd2f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc @@ -20,7 +20,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "src/common/file_utils_ext.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h" +#include "mindspore/lite/nnacl/fp32/reduce.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h" #include "mindspore/lite/src/kernel_registry.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc index 1ccd2f023c..cb8b72cff1 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc @@ -23,7 +23,7 @@ #include "src/common/file_utils_ext.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_filter.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32_grad/convolution_grad_input.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "mindspore/lite/nnacl/conv_parameter.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc index 858fffa78e..e1a9053e3e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc @@ -23,7 +23,7 @@ #include "src/common/utils.h" #include "src/common/file_utils.h" #include "src/runtime/kernel/arm/fp32_grad/pooling_grad.h" -#include "src/runtime/kernel/arm/nnacl/fp32_grad/pooling_grad.h" +#include "nnacl/fp32_grad/pooling_grad.h" namespace mindspore { class TestPoolingGradFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc index 5e50ae45a2..09ba8ca312 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h" +#include "mindspore/lite/nnacl/arithmetic_self_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc index 42c91c3dfa..b14eafba3a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc @@ -17,8 +17,8 @@ #include "schema/inner/model_generated.h" #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/batchnorm_parameter.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batchnorm_int8.h" +#include "mindspore/lite/nnacl/batchnorm_parameter.h" +#include "mindspore/lite/nnacl/int8/batchnorm_int8.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc index 1b04a943e3..9554a59c06 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h" +#include "mindspore/lite/nnacl/concat_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc index 12ae5e6650..f5ed79d72c 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h" +#include "mindspore/lite/nnacl/crop_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/deconv_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/deconv_int8_tests.cc index 2b9e281017..0791019c47 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/deconv_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/deconv_int8_tests.cc @@ -20,9 +20,9 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h" +#include "mindspore/lite/nnacl/pack.h" +#include "mindspore/lite/nnacl/fp32/matmul.h" +#include "mindspore/lite/nnacl/int8/deconv.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h" using mindspore::lite::DeviceType; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc index e6dfdb831e..60f1c2c5c7 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc @@ -17,8 +17,8 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "mindspore/lite/nnacl/common_func.h" +#include "mindspore/lite/nnacl/quantization/quantize.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc index 5caeff4be8..b3df1eab89 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/activation.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/include/context.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc index d2ba684883..017a7657b7 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc @@ -18,8 +18,8 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/matmul_int8.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h" +#include "mindspore/lite/nnacl/quantization/quantize.h" +#include "mindspore/lite/nnacl/common_func.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc index 6732ae4014..a818c536ba 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h" +#include "mindspore/lite/nnacl/mul_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc index 00220e4ace..373cafa471 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc @@ -20,7 +20,7 @@ #include "src/ir/tensor.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "src/runtime/kernel/arm/nnacl/pad_parameter.h" +#include "nnacl/pad_parameter.h" #include "src/runtime/kernel/arm/int8/pad_int8.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc index 03f0cd2d56..91eaac5a40 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/power_int8.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/power_parameter.h" +#include "mindspore/lite/nnacl/power_parameter.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc index e31210ba07..012a1643f4 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h" +#include "mindspore/lite/nnacl/quantization/quantize.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc index cc89cf0bba..2fa92efaa6 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc @@ -19,7 +19,7 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h" +#include "mindspore/lite/nnacl/int8/quant_dtype_cast.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc index 583c03fe6b..a6313f8d19 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h" +#include "mindspore/lite/nnacl/reshape_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc index f4de2f8fcb..152c2549ce 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc @@ -17,7 +17,7 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/include/context.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc index 89776a1626..e3363cb752 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h" +#include "mindspore/lite/nnacl/softmax_parameter.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc index e73242c7ed..348ae0f0df 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h" +#include "mindspore/lite/nnacl/split_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc index cabb2f4b02..fb52a780d8 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze_parameter.h" +#include "mindspore/lite/nnacl/squeeze_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc index d4d3656ea1..4ef7ba3631 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc @@ -18,7 +18,7 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h" +#include "mindspore/lite/nnacl/fp32/topk.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc index 9e0835f5bb..8a6d37e946 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/unsqueeze_parameter.h" +#include "mindspore/lite/nnacl/unsqueeze_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/activation_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/activation_tests.cc index 2f9fd94767..c861a4378f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/activation_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/activation_tests.cc @@ -21,7 +21,7 @@ #include "mindspore/lite/src/runtime/opencl/opencl_runtime.h" #include "mindspore/lite/src/runtime/opencl/opencl_allocator.h" #include "mindspore/lite/src/runtime/kernel/opencl/subgraph_opencl_kernel.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation.h" #include "mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h" using mindspore::kernel::LiteKernel; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/caffe_prelu_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/caffe_prelu_tests.cc index eee01623c9..ac6591be4e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/caffe_prelu_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/caffe_prelu_tests.cc @@ -18,11 +18,11 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/common/file_utils.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #include "mindspore/lite/src/runtime/opencl/opencl_runtime.h" #include "mindspore/lite/src/runtime/kernel/opencl/subgraph_opencl_kernel.h" #include "mindspore/lite/src/runtime/kernel/opencl/kernel/caffe_prelu.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/prelu_parameter.h" +#include "mindspore/lite/nnacl/prelu_parameter.h" using mindspore::kernel::CaffePReluOpenCLKernel; using mindspore::kernel::LiteKernel; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/convolution_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/convolution_tests.cc index 7a2307036d..ecf7310701 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/convolution_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/convolution_tests.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #include "mindspore/lite/src/common/file_utils.h" #include "mindspore/lite/src/runtime/opencl/opencl_runtime.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #include "mindspore/lite/src/runtime/kernel/opencl/subgraph_opencl_kernel.h" #include "mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/depthwise_conv2d_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/depthwise_conv2d_tests.cc index 0e29b96476..a2747c3586 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/depthwise_conv2d_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/depthwise_conv2d_tests.cc @@ -18,7 +18,7 @@ #include "utils/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/common/file_utils.h" -#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "nnacl/pack.h" #include "mindspore/lite/src/runtime/opencl/opencl_runtime.h" #include "mindspore/lite/src/runtime/kernel/opencl/subgraph_opencl_kernel.h" #include "mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/prelu_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/prelu_tests.cc index e67923bd1d..91dc9c6559 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/prelu_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/prelu_tests.cc @@ -22,7 +22,7 @@ #include "mindspore/lite/src/runtime/opencl/opencl_runtime.h" #include "mindspore/lite/src/runtime/kernel/opencl/subgraph_opencl_kernel.h" #include "mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.h" -#include "mindspore/lite/src/runtime/kernel/arm/nnacl/prelu_parameter.h" +#include "mindspore/lite/nnacl/prelu_parameter.h" using mindspore::kernel::LiteKernel; using mindspore::kernel::PReluOpenCLKernel; diff --git a/mindspore/lite/tools/converter/CMakeLists.txt b/mindspore/lite/tools/converter/CMakeLists.txt index 3fdcf20afc..cc6fc7e1ee 100644 --- a/mindspore/lite/tools/converter/CMakeLists.txt +++ b/mindspore/lite/tools/converter/CMakeLists.txt @@ -73,7 +73,7 @@ if (WIN32) ${CMAKE_CURRENT_SOURCE_DIR}/../../src/scheduler.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/lite_kernel.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/ms_tensor_utils.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/runtime/kernel/arm/nnacl/pack.c + ${CMAKE_CURRENT_SOURCE_DIR}../../nnacl/pack.c ${CMAKE_CURRENT_SOURCE_DIR}/../../src/populate_parameter.cc ) endif() @@ -136,19 +136,19 @@ set(LITE_SRC set(ARM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../src/runtime/kernel/arm) file(GLOB KERNEL_SRC ${ARM_DIR}/base/*.cc - ${ARM_DIR}/nnacl/*.c - ${ARM_DIR}/nnacl/fp32/*.c - ${ARM_DIR}/nnacl/int8/*.c - ${ARM_DIR}/nnacl/quantization/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/fp32/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/int8/*.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/quantization/*.c ${ARM_DIR}/fp32/*.cc ${ARM_DIR}/int8/*.cc ) -list(REMOVE_ITEM KERNEL_SRC ${ARM_DIR}/nnacl/opt_op_handler.c) +list(REMOVE_ITEM KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/opt_op_handler.c) if (PLATFORM_ARM64) # assembly - file(GLOB ASSEMBLY_SRC nnacl/assembly/arm64/*.s - nnacl/assembly/arm64/*.S) + file(GLOB ASSEMBLY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/assembly/arm64/*.s + ${CMAKE_CURRENT_SOURCE_DIR}/../../nnacl/assembly/arm64/*.S) set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C) set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC}) endif ()