move nnacl to lite/

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

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)

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

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 <math.h>
 #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_

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_

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_

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 <arm_neon.h>
@@ -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_

mindspore/lite/nnacl/arithmetic_parameter.h

@@ -14,9 +14,9 @@
  * 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_
+#ifndef MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_
+#define MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_
 
 #include "nnacl/op_attribute.h"
 
-#endif  // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_
+#endif  // MINDSPORE_LITE_NNACL_ARTITHMETIC_PARAMETER_H_

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_

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_

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_

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 <stdint.h>
 #include <stdio.h>
@@ -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_ */

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_

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 <arm_neon.h>
@@ -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_

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_

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_

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_

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_

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_

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 <arm_neon.h>
@@ -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_

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 <arm_neon.h>
 #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_

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 <stdint.h>
 #include <stdio.h>
@@ -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_ */

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_

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_

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 <arm_neon.h>
 #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_

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 <string.h>
 #include <arm_neon.h>
@@ -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_

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 <string.h>
 #include <float.h>
@@ -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_

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 <arm_neon.h>
@@ -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_

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 <arm_neon.h>
@@ -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_

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 <arm_neon.h>
@@ -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_

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 <arm_neon.h>
 #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_

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_

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 <arm_neon.h>
 #include <string.h>
@@ -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_