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_