move gllo under tools

mindspore/lite/src/executor.cc

@@ -15,7 +15,7 @@
  */
 
 #include "mindspore/lite/src/executor.h"
-#include "src/runtime/kernel/arm/opclib/pack.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
 #include "include/errorcode.h"
 #include "src/common/ms_tensor_utils.h"
 

mindspore/lite/src/kernel_registry.cc

@@ -20,7 +20,7 @@
 #include <asm/hwcap.h>
 #include "common/utils.h"
 #include "utils/log_adapter.h"
-#include "src/runtime/kernel/arm/opclib/optimized_kernel.h"
+#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h"
 #endif
 
 using mindspore::kernel::kCPU;

mindspore/lite/src/lite_kernel.h

@@ -21,7 +21,7 @@
 #ifdef ENABLE_ARM
 #include <arm_neon.h>
 #endif
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 #include "include/context.h"
 #include "src/ir/tensor.h"
 #include "src/ops/ops.h"

mindspore/lite/src/ops/resize.cc

@@ -18,7 +18,7 @@
 #include "include/errorcode.h"
 #include "utils/log_adapter.h"
 #include "src/ir/tensor.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 
 namespace mindspore::lite {
 namespace {

mindspore/lite/src/ops/strided_slice.cc

@@ -17,7 +17,7 @@
 #include <vector>
 #include "include/errorcode.h"
 #include "src/ops/ops.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 #include "utils/log_adapter.h"
 #include "src/ir/tensor.h"
 

mindspore/lite/src/populate_parameter.cc

@@ -19,56 +19,56 @@
 #include "src/ops/ops.h"
 #include "utils/log_adapter.h"
 #include "schema/ops_generated.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arg_min_max.h"
-#include "src/runtime/kernel/arm/opclib/fp32/cast.h"
-#include "src/runtime/kernel/arm/opclib/concat_parameter.h"
-#include "src/runtime/kernel/arm/opclib/fp32/slice.h"
-#include "src/runtime/kernel/arm/opclib/fp32/broadcast_to.h"
-#include "src/runtime/kernel/arm/opclib/reshape_parameter.h"
-#include "src/runtime/kernel/arm/opclib/fp32/stack.h"
-#include "src/runtime/kernel/arm/opclib/unstack.h"
-#include "src/runtime/kernel/arm/opclib/depth_to_space.h"
-#include "src/runtime/kernel/arm/opclib/conv_parameter.h"
-#include "src/runtime/kernel/arm/opclib/fp32/pooling.h"
-#include "src/runtime/kernel/arm/opclib/matmul.h"
-#include "src/runtime/kernel/arm/opclib/softmax_parameter.h"
-#include "src/runtime/kernel/arm/opclib/tile.h"
-#include "src/runtime/kernel/arm/opclib/fp32/topk.h"
-#include "src/runtime/kernel/arm/opclib/fp32/reduce.h"
-#include "src/runtime/kernel/arm/opclib/fp32/activation.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h"
-#include "src/runtime/kernel/arm/opclib/fused_batchnorm.h"
-#include "src/runtime/kernel/arm/opclib/fp32/batchnorm.h"
-#include "src/runtime/kernel/arm/opclib/power.h"
-#include "src/runtime/kernel/arm/opclib/fp32/range.h"
-#include "src/runtime/kernel/arm/opclib/fp32/local_response_norm.h"
-#include "src/runtime/kernel/arm/opclib/fp32/expandDims.h"
-#include "src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h"
-#include "src/runtime/kernel/arm/opclib/pad_parameter.h"
-#include "src/runtime/kernel/arm/opclib/fp32/fill.h"
-#include "src/runtime/kernel/arm/opclib/transpose.h"
-#include "src/runtime/kernel/arm/opclib/split_parameter.h"
-#include "src/runtime/kernel/arm/opclib/squeeze.h"
-#include "src/runtime/kernel/arm/opclib/fp32/gather.h"
-#include "src/runtime/kernel/arm/opclib/fp32/reverse.h"
-#include "src/runtime/kernel/arm/opclib/reverse_sequence.h"
-#include "src/runtime/kernel/arm/opclib/unique.h"
-#include "src/runtime/kernel/arm/opclib/scale.h"
-#include "src/runtime/kernel/arm/opclib/fp32/gatherNd.h"
-#include "src/runtime/kernel/arm/opclib/resize.h"
-#include "src/runtime/kernel/arm/opclib/scatter_nd.h"
-#include "src/runtime/kernel/arm/opclib/batch_to_space.h"
-#include "src/runtime/kernel/arm/opclib/fp32/crop.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/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/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.h"
+#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/tile.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/topk.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/reduce.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/fused_batchnorm.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/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.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 "src/runtime/kernel/arm/fp32/flatten.h"
-#include "src/runtime/kernel/arm/opclib/fp32/unsqueeze.h"
-#include "src/runtime/kernel/arm/opclib/fp32/one_hot.h"
-#include "src/runtime/kernel/arm/opclib/strided_slice.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 "src/runtime/kernel/arm/base/prior_box.h"
-#include "src/runtime/kernel/arm/opclib/fp32/space_to_depth.h"
-#include "src/runtime/kernel/arm/opclib/fp32/space_to_batch.h"
-#include "src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h"
-#include "src/runtime/kernel/arm/opclib/fp32/lstm.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"
 
 namespace mindspore::kernel {
 OpParameter *PopulateBatchNorm(const lite::Primitive *primitive) {

mindspore/lite/src/populate_parameter.h

@@ -19,7 +19,7 @@
 
 #include "schema/model_generated.h"
 #include "src/ops/ops.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 
 namespace mindspore::kernel {
 typedef OpParameter *(*PopulateParameterFunc)(const lite::Primitive *);

mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt

@@ -1,29 +1,29 @@
 file(GLOB KERNEL_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/base/*.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/opclib/*.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/opclib/fp32/*.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/opclib/int8/*.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/opclib/quantization/*.cc
+        nnacl/*.cc
+        nnacl/fp32/*.cc
+        nnacl/int8/*.cc
+        nnacl/quantization/*.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/fp32/*.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/int8/*.cc
         )
 
 if (PLATFORM_ARM64)
     # assembly
-    file(GLOB ASSEMBLY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm64/*.s
-            ${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm64/*.S)
+    file(GLOB ASSEMBLY_SRC nnacl/assembly/arm64/*.s
+            nnacl/assembly/arm64/*.S)
     set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
     set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC})
 endif()
 
 if (PLATFORM_ARM32)
     # assembly
-    file(GLOB ASSEMBLY_SRC ${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm32/*.s
-            ${CMAKE_CURRENT_SOURCE_DIR}/opclib/assembly/arm32/*.S
+    file(GLOB ASSEMBLY_SRC nnacl/assembly/arm32/*.s
+            nnacl/assembly/arm32/*.S
             )
     set_property(SOURCE ${ASSEMBLY_SRC} PROPERTY LANGUAGE C)
     set(KERNEL_SRC ${KERNEL_SRC} ${ASSEMBLY_SRC})
 endif()
 
 add_library(cpu_kernel_mid_ OBJECT ${KERNEL_SRC})
-add_subdirectory(opclib)
+add_subdirectory(nnacl)

mindspore/lite/src/runtime/kernel/arm/base/arg_min_max_base.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "src/runtime/kernel/arm/base/arg_min_max_base.h"
-#include "src/runtime/kernel/arm/opclib/arg_min_max.h"
+#include "src/runtime/kernel/arm/nnacl/arg_min_max.h"
 #include "src/runtime/kernel/arm/fp32/argminmax.h"
 #include "src/runtime/kernel/arm/int8/argminmax_int8.h"
 #include "schema/model_generated.h"

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/opclib/batch_to_space.h"
+#include "src/runtime/kernel/arm/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"

mindspore/lite/src/runtime/kernel/arm/base/batch_to_space_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/concat_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/concat_parameter.h"
 
 namespace mindspore::kernel {
 class BatchToSpaceBaseCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc

@@ -17,7 +17,7 @@
 #include <vector>
 #include "src/runtime/kernel/arm/int8/concat_int8.h"
 #include "src/runtime/kernel/arm/fp32/concat.h"
-#include "src/runtime/kernel/arm/opclib/fp32/concat.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/concat.h"
 #include "schema/model_generated.h"
 #include "src/kernel_factory.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/base/concat_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/concat_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/concat_parameter.h"
 #include "src/runtime/kernel/arm/base/layout_transform.h"
 
 using mindspore::lite::Context;

mindspore/lite/src/runtime/kernel/arm/base/crop_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/crop_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/crop_parameter.h"
 
 using mindspore::lite::Context;
 

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/opclib/depth_to_space.h"
+#include "src/runtime/kernel/arm/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/opclib/arithmetic_common.h"
+#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h"
 #include "schema/model_generated.h"
 #include "src/kernel_factory.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/base/depth_to_space_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/depth_to_space.h"
+#include "src/runtime/kernel/arm/nnacl/depth_to_space.h"
 
 namespace mindspore::kernel {
 class DepthToSpaceBaseCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/base/fullconnection_base.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "include/context.h"
-#include "src/runtime/kernel/arm/opclib/matmul.h"
+#include "src/runtime/kernel/arm/nnacl/matmul.h"
 
 using mindspore::lite::Context;
 

mindspore/lite/src/runtime/kernel/arm/base/layout_transform.h

@@ -20,7 +20,7 @@
 #ifdef ENABLE_FP16
 #include <arm_neon.h>
 #endif
-#include "src/runtime/kernel/arm/opclib/pack.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
 #include "ir/dtype/type_id.h"
 #include "schema/ops_generated.h"
 

mindspore/lite/src/runtime/kernel/arm/base/matmul_base.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "include/context.h"
-#include "src/runtime/kernel/arm/opclib/matmul.h"
+#include "src/runtime/kernel/arm/nnacl/matmul.h"
 
 using mindspore::lite::Context;
 

mindspore/lite/src/runtime/kernel/arm/base/matrix.h

@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/winograd_utils.h"
+#include "src/runtime/kernel/arm/nnacl/winograd_utils.h"
 
 namespace mindspore::kernel {
 class Matrix {

mindspore/lite/src/runtime/kernel/arm/base/pooling_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/pooling.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h"
 #include "include/errorcode.h"
 
 using mindspore::lite::Context;

mindspore/lite/src/runtime/kernel/arm/base/prior_box.h

@@ -19,8 +19,8 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/reshape_parameter.h"
-#include "src/runtime/kernel/arm/opclib/prior_box.h"
+#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/prior_box.h"
 
 using mindspore::lite::Context;
 

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 <vector>
-#include "src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h"
+#include "src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h"
 #include "src/runtime/runtime_api.h"
 #include "src/kernel_registry.h"
 #include "schema/model_generated.h"

mindspore/lite/src/runtime/kernel/arm/base/reshape_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/reshape_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h"
 
 using mindspore::lite::Context;
 

mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc

@@ -18,7 +18,7 @@
 #include <vector>
 #include "src/runtime/kernel/arm/int8/softmax_int8.h"
 #include "src/runtime/kernel/arm/fp32/softmax.h"
-#include "src/runtime/kernel/arm/opclib/fp32/softmax.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h"
 #include "schema/model_generated.h"
 #include "src/kernel_factory.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/base/softmax_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/softmax_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h"
 
 namespace mindspore::kernel {
 class SoftmaxBaseCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/base/split_base.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/split_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/split_parameter.h"
 
 using mindspore::lite::Context;
 

mindspore/lite/src/runtime/kernel/arm/base/strided_slice.cc

@@ -16,7 +16,7 @@
 
 #include "src/runtime/kernel/arm/base/strided_slice.h"
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/strided_slice.h"
+#include "src/runtime/kernel/arm/nnacl/strided_slice.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.cc

@@ -15,9 +15,9 @@
  */
 
 #include "src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h"
-#include "src/runtime/kernel/arm/opclib/fp16/conv_fp16.h"
-#include "src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.h"
-#include "src/runtime/kernel/arm/opclib/fp16/pack_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h"
+#include "src/runtime/kernel/arm/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"

mindspore/lite/src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h

@@ -21,7 +21,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/optimized_kernel.h"
+#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h"
 
 namespace mindspore::kernel {
 class Convolution3x3FP16CPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.cc

@@ -15,7 +15,7 @@
  */
 
 #include "src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h"
-#include "src/runtime/kernel/arm/opclib/fp16/pack_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp16/convolution_depthwise_fp16.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h"
 
 namespace mindspore::kernel {
 class ConvolutionDepthwiseFp16CPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc

@@ -16,8 +16,8 @@
 
 #include "src/runtime/kernel/arm/fp16/convolution_fp16.h"
 #include "src/runtime/kernel/arm/fp16/convolution_3x3_fp16.h"
-#include "src/runtime/kernel/arm/opclib/fp16/conv_fp16.h"
-#include "src/runtime/kernel/arm/opclib/fp16/pack_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h"
+#include "src/runtime/kernel/arm/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"
@@ -242,7 +242,7 @@ int ConvolutionFP16CPUKernel::Run() {
   auto out_tensor = outputs_.at(kOutputIndex);
   auto output_addr = reinterpret_cast<float *>(out_tensor->Data());
   for (int j = 0; j < out_tensor->ElementsNum(); ++j) {
-    output_addr[j] = (float)fp16_out_[j];
+    output_addr[j] = static_cast<float >(fp16_out_[j]);
   }
   return RET_OK;
 }

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/opclib/fp16/pack_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp16/deconvolution_depthwise_fp16.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h"
 
 namespace mindspore::kernel {
 class DeconvolutionDepthwiseFp16CPUKernel : public ConvolutionBaseCPUKernel {

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/opclib/fp16/pack_fp16.h"
+#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h"
 #include "schema/ops_generated.h"
 #include "mindspore/core/utils/log_adapter.h"
 

mindspore/lite/src/runtime/kernel/arm/fp32/activation.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/activation.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/activation.h"
 
 namespace mindspore::kernel {
 class ActivationCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/activation_grad.h

@@ -21,7 +21,7 @@
 #include "src/lite_kernel.h"
 #include "ir/anf.h"
 
-#include "src/runtime/kernel/arm/opclib/activation_grad.h"
+#include "src/runtime/kernel/arm/nnacl/activation_grad.h"
 
 namespace mindspore::kernel {
 class ActivationGradCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/addn.cc

@@ -50,7 +50,7 @@ int AddNCPUKernel::AddNParallelRun(int thread_id) {
   int count = MSMIN(count_per_thread, elements_num_ - thread_id * count_per_thread);
   auto stride = count_per_thread * thread_id;
   auto ret = ElementAdd(in1_addr_ + stride, in2_addr_ + stride, out_addr_ + stride, count);
-  if (ret != OPCLIB_OK) {
+  if (ret != NNACL_OK) {
     MS_LOG(ERROR) << "ElementAdd fail! ret: " << ret;
     return RET_ERROR;
   }

mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc

@@ -18,7 +18,7 @@
 #include <vector>
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/arg_min_max.h"
+#include "src/runtime/kernel/arm/nnacl/arg_min_max.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h"
 #include "schema/model_generated.h"
 
 using mindspore::schema::PrimitiveType_Add;

mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.cc

@@ -16,9 +16,9 @@
 
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/fp32/reduce_grad.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/reduce_grad.h"
 #include "src/runtime/kernel/arm/fp32/arithmetic_grad.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h"
 #include "schema/model_generated.h"
 #include "ir/anf.h"
 

mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self.h

@@ -19,8 +19,8 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic_self.h"
-#include "src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h"
+#include "src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h"
 #include "schema/model_generated.h"
 #include "include/context.h"
 

mindspore/lite/src/runtime/kernel/arm/fp32/batch_to_space.cc

@@ -17,7 +17,7 @@
 #include <vector>
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/batch_to_space.h"
+#include "src/runtime/kernel/arm/nnacl/batch_to_space.h"
 #include "include/errorcode.h"
 
 using mindspore::lite::RET_OK;

mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "include/context.h"
-#include "src/runtime/kernel/arm/opclib/fp32/batchnorm.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h"
 
 using mindspore::lite::Context;
 

mindspore/lite/src/runtime/kernel/arm/fp32/bias.h

@@ -18,7 +18,7 @@
 #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BIAS_H_
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h"
 
 namespace mindspore::kernel {
 class BiasCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/bias_grad.h

@@ -21,7 +21,7 @@
 #include "src/lite_kernel.h"
 #include "ir/anf.h"
 
-#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h"
 
 namespace mindspore::kernel {
 class BiasGradCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/bngrad_input.cc

@@ -19,7 +19,7 @@
 #include "schema/model_generated.h"
 #include "src/kernel_factory.h"
 #include "src/runtime/kernel/arm/fp32/bngrad_input.h"
-#include "src/runtime//kernel/arm/opclib/batch_norm.h"
+#include "src/runtime//kernel/arm/nnacl/batch_norm.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to.h

@@ -19,7 +19,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 
-#include "src/runtime/kernel/arm/opclib/fp32/broadcast_to.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h"
 
 namespace mindspore::kernel {
 class BroadcastToCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/cast.cc

@@ -17,8 +17,8 @@
 #include <vector>
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/fp32/cast.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/cast.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 #include "src/runtime/runtime_api.h"
 #include "include/errorcode.h"
 

mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc

@@ -16,7 +16,7 @@
 
 #include "src/runtime/kernel/arm/fp32/concat.h"
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/fp32/concat.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/concat.h"
 #include "src/kernel_registry.h"
 #include "schema/model_generated.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc

@@ -18,8 +18,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/opclib/fp32/conv.h"
-#include "src/runtime/kernel/arm/opclib/common_func.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/conv.h"
+#include "src/runtime/kernel/arm/nnacl/common_func.h"
 #include "schema/model_generated.h"
 #include "src/kernel_factory.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h

@@ -19,9 +19,9 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/fp32/conv.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/conv.h"
 
 namespace mindspore::kernel {
 class ConvolutionCPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1.h

@@ -21,14 +21,14 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "include/errorcode.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
-#include "src/runtime/kernel/arm/opclib/winograd_transform.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
+#include "src/runtime/kernel/arm/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/opclib/fp32/conv.h"
-#include "src/runtime/kernel/arm/opclib/fp32/common_func.h"
-#include "src/runtime/kernel/arm/opclib/matmul.h"
-#include "src/runtime/kernel/arm/opclib/fp32/matmul.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.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h"
 
 namespace mindspore::kernel {
 class Convolution1x1CPUKernel : public ConvolutionBaseCPUKernel {

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/opclib/fp32/conv.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/conv.h"
 #include "src/runtime/kernel/arm/base/layout_transform.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"

mindspore/lite/src/runtime/kernel/arm/fp32/convolution_3x3.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/winograd_transform.h"
+#include "src/runtime/kernel/arm/nnacl/winograd_transform.h"
 
 namespace mindspore::kernel {
 class Convolution3x3CPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h"
 
 namespace mindspore::kernel {
 class ConvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_filter.cc

@@ -16,9 +16,9 @@
 
 #include "src/runtime/kernel/arm/fp32/convolution_grad_filter.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/pack.h"
-#include "src/runtime/kernel/arm/opclib/pack_ext.h"
-#include "src/runtime/kernel/arm/opclib/fp32/gemm.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
+#include "src/runtime/kernel/arm/nnacl/pack_ext.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/gemm.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_input.cc

@@ -16,9 +16,9 @@
 
 #include "src/runtime/kernel/arm/fp32/convolution_grad_input.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/pack.h"
-#include "src/runtime/kernel/arm/opclib/pack_ext.h"
-#include "src/runtime/kernel/arm/opclib/fp32/gemm.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
+#include "src/runtime/kernel/arm/nnacl/pack_ext.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/gemm.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

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/opclib/fp32/conv.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/conv.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 
-#include "src/runtime/kernel/arm/opclib/winograd_transform.h"
+#include "src/runtime/kernel/arm/nnacl/winograd_transform.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
 #include "src/runtime/kernel/arm/base/matrix.h"
 

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/opclib/fp32/crop.h"
-#include "src/runtime/kernel/arm/opclib/crop_parameter.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/crop.h"
+#include "src/runtime/kernel/arm/nnacl/crop_parameter.h"
 #include "include/errorcode.h"
 #include "src/runtime/runtime_api.h"
 

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/opclib/fp32/deconv.h"
-#include "src/runtime/kernel/arm/opclib/fp32/matmul.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/deconv.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h"
 
 namespace mindspore::kernel {
 class DeConvolutionCPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "src/runtime/kernel/arm/base/convolution_base.h"
-#include "src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h"
 
 namespace mindspore::kernel {
 class DeconvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/depth_to_space.cc

@@ -17,8 +17,8 @@
 #include <vector>
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/arithmetic_common.h"
-#include "src/runtime/kernel/arm/opclib/depth_to_space.h"
+#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h"
+#include "src/runtime/kernel/arm/nnacl/depth_to_space.h"
 #include "include/errorcode.h"
 
 using mindspore::lite::KernelRegistrar;

mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/expandDims.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/expandDims.h"
 #include "schema/model_generated.h"
 
 #include "include/context.h"

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/opclib/fp32/fill.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/fill.h"
 
 using mindspore::lite::Context;
 

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/opclib/flatten.h"
+#include "src/runtime/kernel/arm/nnacl/flatten.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

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/opclib/flatten.h"
+#include "src/runtime/kernel/arm/nnacl/flatten.h"
 
 using mindspore::lite::Context;
 

mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "include/errorcode.h"
 #include "include/context.h"
-#include "src/runtime/kernel/arm/opclib/fp32/matmul.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h"
 #include "src/runtime/kernel/arm/base/fullconnection_base.h"
 
 using mindspore::lite::Context;

mindspore/lite/src/runtime/kernel/arm/fp32/fused_batchnorm.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fused_batchnorm.h"
+#include "src/runtime/kernel/arm/nnacl/fused_batchnorm.h"
 
 namespace mindspore::kernel {
 class FusedBatchnormCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/gather.h

@@ -18,7 +18,7 @@
 #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GATHER_H_
 
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/fp32/gather.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/gather.h"
 #include "src/lite_kernel.h"
 
 namespace mindspore::kernel {

mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd.h

@@ -18,11 +18,11 @@
 #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GATHERND_H_
 
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/fp32/gatherNd.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/gatherNd.h"
 #include "src/lite_kernel.h"
 
 #include "include/context.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 
 using mindspore::lite::Context;
 

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 <vector>
-#include "src/runtime/kernel/arm/opclib/fp32/local_response_norm.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h"
 #include "src/lite_kernel.h"
 
 namespace mindspore::kernel {

mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/lstm.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/lstm.h"
 
 namespace mindspore::kernel {
 class LstmCPUKernel : public LiteKernel {

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/opclib/fp32/matmul.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h"
 #include "src/runtime/runtime_api.h"
 #include "include/errorcode.h"
 

mindspore/lite/src/runtime/kernel/arm/fp32/matmul.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/matmul.h"
+#include "src/runtime/kernel/arm/nnacl/matmul.h"
 #include "src/runtime/kernel/arm/base/matmul_base.h"
 
 namespace mindspore::kernel {

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/opclib/pack.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
 
 namespace mindspore::kernel {
 class Nchw2NhwcCPUKernel : public LiteKernel {

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/opclib/pack.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
 
 namespace mindspore::kernel {
 class Nhwc2NchwCPUKernel : public LiteKernel {

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/opclib/fp32/one_hot.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/one_hot.h"
 #include "schema/model_generated.h"
 #include "src/runtime/runtime_api.h"
 #include "src/kernel_registry.h"

mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc

@@ -19,7 +19,7 @@
 #include "src/kernel_registry.h"
 #include "src/runtime/kernel/arm/fp32/pad.h"
 #include "include/errorcode.h"
-#include "src/runtime/kernel/arm/opclib/errorcode.h"
+#include "src/runtime/kernel/arm/nnacl/errorcode.h"
 #include "src/runtime/runtime_api.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;
@@ -65,7 +65,7 @@ int PadCPUKernel::Init() {
 int PadImpl(int task_id, LiteParallelGroupEnv *penv, void *cdata) {
   auto padKernel = reinterpret_cast<PadCPUKernel *>(cdata);
   int error_code = padKernel->RunImpl(task_id);
-  if (error_code != OPCLIB_OK) {
+  if (error_code != NNACL_OK) {
     MS_LOG(ERROR) << "Pad Run error task_id[" << task_id << "] error_code[" << error_code << "]";
     return RET_ERROR;
   }

mindspore/lite/src/runtime/kernel/arm/fp32/pad.h

@@ -19,7 +19,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 
-#include "src/runtime/kernel/arm/opclib/fp32/pad.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/pad.h"
 #include "src/runtime/kernel/arm/base/layout_transform.h"
 
 namespace mindspore::kernel {

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/opclib/fp32/pooling.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h"
 #include "src/kernel_registry.h"
 #include "src/runtime/runtime_api.h"
 #include "include/errorcode.h"
-#include "src/runtime/kernel/arm/opclib/op_base.h"
+#include "src/runtime/kernel/arm/nnacl/op_base.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;
 using mindspore::lite::KernelRegistrar;

mindspore/lite/src/runtime/kernel/arm/fp32/pooling_grad.cc

@@ -17,8 +17,8 @@
 #include "src/runtime/kernel/arm/fp32/pooling_grad.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/fp32/pooling.h"
-#include "src/runtime/kernel/arm/opclib/fp32/pooling_grad.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/pooling_grad.h"
 #include "include/errorcode.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;

mindspore/lite/src/runtime/kernel/arm/fp32/power.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "include/context.h"
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/power.h"
+#include "src/runtime/kernel/arm/nnacl/power.h"
 
 namespace mindspore::kernel {
 class PowerCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/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/opclib/fp32/arithmetic.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h"
 
 using mindspore::lite::KernelRegistrar;
 using mindspore::lite::RET_ERROR;

mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 #include "ir/anf.h"
-#include "src/runtime/kernel/arm/opclib/power.h"
+#include "src/runtime/kernel/arm/nnacl/power.h"
 
 namespace mindspore::kernel {
 class PowerGradCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/prelu.cc

@@ -16,7 +16,7 @@
 #include "src/runtime/kernel/arm/fp32/prelu.h"
 #include <vector>
 #include "schema/model_generated.h"
-#include "src/runtime/kernel/arm/opclib/prelu.h"
+#include "src/runtime/kernel/arm/nnacl/prelu.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"
 #include "src/runtime/runtime_api.h"

mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h

@@ -20,7 +20,7 @@
 #include "src/lite_kernel.h"
 
 #include "include/context.h"
-#include "src/runtime/kernel/arm/opclib/prelu.h"
+#include "src/runtime/kernel/arm/nnacl/prelu.h"
 #include "src/runtime/kernel/arm/base/layout_transform.h"
 
 using mindspore::lite::Context;

mindspore/lite/src/runtime/kernel/arm/fp32/range.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/range.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/range.h"
 
 namespace mindspore::kernel {
 class RangeCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/rank.h

@@ -19,7 +19,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/fp32/rank.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/rank.h"
 
 namespace mindspore::kernel {
 class RankCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/reduce.cc

@@ -19,7 +19,7 @@
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"
 #include "src/runtime/runtime_api.h"
-#include "src/runtime/kernel/arm/opclib/fp32/reduce.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/reduce.h"
 
 using mindspore::kernel::KERNEL_ARCH::kCPU;
 using mindspore::lite::KernelRegistrar;

mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include "src/lite_kernel.h"
 
-#include "src/runtime/kernel/arm/opclib/fp32/reduce.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/reduce.h"
 #include "ir/anf.h"
 using mindspore::schema::ReduceMode;
 

mindspore/lite/src/runtime/kernel/arm/fp32/reshape.cc

@@ -16,7 +16,7 @@
 
 #include "src/runtime/kernel/arm/fp32/reshape.h"
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/reshape.h"
+#include "src/runtime/kernel/arm/nnacl/reshape.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"

mindspore/lite/src/runtime/kernel/arm/fp32/resize.cc

@@ -18,8 +18,8 @@
 #include <vector>
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/resize.h"
-#include "src/runtime/kernel/arm/opclib/pack.h"
+#include "src/runtime/kernel/arm/nnacl/resize.h"
+#include "src/runtime/kernel/arm/nnacl/pack.h"
 #include "include/errorcode.h"
 #include "src/runtime/runtime_api.h"
 
@@ -140,7 +140,7 @@ int ResizeCPUKernel::Init() {
 int ResizeImpl(int task_id, LiteParallelGroupEnv *penv, void *cdata) {
   auto resize = reinterpret_cast<ResizeCPUKernel *>(cdata);
   auto error_code = resize->RunImpl(task_id);
-  if (error_code != OPCLIB_OK) {
+  if (error_code != NNACL_OK) {
     MS_LOG(ERROR) << "Resize Run error task_id[" << task_id << "] error_code[" << error_code << "]";
     return RET_ERROR;
   }
@@ -198,7 +198,7 @@ int ResizeCPUKernel::RunImpl(int task_id) {
     case schema::ResizeMethod_UNKNOW:
     default: {
       MS_LOG(ERROR) << "Resize unknown method " << method_;
-      ret = OPCLIB_ERR;
+      ret = NNACL_ERR;
     }
   }
   return ret;

mindspore/lite/src/runtime/kernel/arm/fp32/resize.h

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/resize.h"
+#include "src/runtime/kernel/arm/nnacl/resize.h"
 #include "src/runtime/kernel/arm/base/layout_transform.h"
 
 using mindspore::schema::PrimitiveType_Resize;

mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc

@@ -18,7 +18,7 @@
 #include <vector>
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
-#include "src/runtime/kernel/arm/opclib/fp32/reverse.h"
+#include "src/runtime/kernel/arm/nnacl/fp32/reverse.h"
 #include "include/errorcode.h"
 #include "src/runtime/runtime_api.h"
 

mindspore/lite/src/runtime/kernel/arm/fp32/reverse_sequence.h

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include "src/lite_kernel.h"
-#include "src/runtime/kernel/arm/opclib/reverse_sequence.h"
+#include "src/runtime/kernel/arm/nnacl/reverse_sequence.h"
 
 namespace mindspore::kernel {
 class ReverseSequenceCPUKernel : public LiteKernel {

mindspore/lite/src/runtime/kernel/arm/fp32/scale.cc

@@ -17,7 +17,7 @@
 #include "src/runtime/kernel/arm/fp32/scale.h"
 #include <string.h>
 #include <vector>
-#include "src/runtime/kernel/arm/opclib/scale.h"
+#include "src/runtime/kernel/arm/nnacl/scale.h"
 #include "schema/model_generated.h"
 #include "src/kernel_registry.h"
 #include "include/errorcode.h"