From 35514d36b7d05720bb61e346deaf11769fde51a2 Mon Sep 17 00:00:00 2001 From: zhaizhiqiang Date: Fri, 7 Aug 2020 11:37:21 +0800 Subject: [PATCH] move gllo under tools --- mindspore/lite/src/executor.cc | 2 +- mindspore/lite/src/kernel_registry.cc | 2 +- mindspore/lite/src/lite_kernel.h | 2 +- mindspore/lite/src/ops/resize.cc | 2 +- mindspore/lite/src/ops/strided_slice.cc | 2 +- mindspore/lite/src/populate_parameter.cc | 96 +++++++++---------- mindspore/lite/src/populate_parameter.h | 2 +- .../src/runtime/kernel/arm/CMakeLists.txt | 18 ++-- .../kernel/arm/base/arg_min_max_base.cc | 2 +- .../kernel/arm/base/batch_to_space_base.cc | 2 +- .../kernel/arm/base/batch_to_space_base.h | 2 +- .../runtime/kernel/arm/base/concat_base.cc | 2 +- .../src/runtime/kernel/arm/base/concat_base.h | 2 +- .../src/runtime/kernel/arm/base/crop_base.h | 2 +- .../kernel/arm/base/depth_to_space_base.cc | 4 +- .../kernel/arm/base/depth_to_space_base.h | 2 +- .../kernel/arm/base/fullconnection_base.h | 2 +- .../kernel/arm/base/layout_transform.h | 2 +- .../src/runtime/kernel/arm/base/matmul_base.h | 2 +- .../lite/src/runtime/kernel/arm/base/matrix.h | 2 +- .../runtime/kernel/arm/base/pooling_base.h | 2 +- .../src/runtime/kernel/arm/base/prior_box.h | 4 +- .../kernel/arm/base/quant_dtype_cast.cc | 2 +- .../runtime/kernel/arm/base/reshape_base.h | 2 +- .../runtime/kernel/arm/base/softmax_base.cc | 2 +- .../runtime/kernel/arm/base/softmax_base.h | 2 +- .../src/runtime/kernel/arm/base/split_base.h | 2 +- .../runtime/kernel/arm/base/strided_slice.cc | 2 +- .../kernel/arm/fp16/convolution_3x3_fp16.cc | 6 +- .../kernel/arm/fp16/convolution_3x3_fp16.h | 2 +- .../arm/fp16/convolution_depthwise_fp16.cc | 2 +- .../arm/fp16/convolution_depthwise_fp16.h | 2 +- .../kernel/arm/fp16/convolution_fp16.cc | 6 +- .../arm/fp16/deconvolution_depthwise_fp16.cc | 2 +- .../arm/fp16/deconvolution_depthwise_fp16.h | 2 +- .../kernel/arm/fp16/layout_transform_fp16.cc | 2 +- .../src/runtime/kernel/arm/fp32/activation.h | 2 +- .../runtime/kernel/arm/fp32/activation_grad.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/addn.cc | 2 +- .../src/runtime/kernel/arm/fp32/argminmax.cc | 2 +- .../src/runtime/kernel/arm/fp32/arithmetic.h | 2 +- .../kernel/arm/fp32/arithmetic_grad.cc | 4 +- .../runtime/kernel/arm/fp32/arithmetic_grad.h | 2 +- .../runtime/kernel/arm/fp32/arithmetic_self.h | 4 +- .../runtime/kernel/arm/fp32/batch_to_space.cc | 2 +- .../src/runtime/kernel/arm/fp32/batchnorm.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/bias.h | 2 +- .../src/runtime/kernel/arm/fp32/bias_grad.h | 2 +- .../runtime/kernel/arm/fp32/bngrad_input.cc | 2 +- .../runtime/kernel/arm/fp32/broadcast_to.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/cast.cc | 4 +- .../src/runtime/kernel/arm/fp32/concat.cc | 2 +- .../runtime/kernel/arm/fp32/convolution.cc | 4 +- .../src/runtime/kernel/arm/fp32/convolution.h | 4 +- .../runtime/kernel/arm/fp32/convolution_1x1.h | 12 +-- .../kernel/arm/fp32/convolution_3x3.cc | 2 +- .../runtime/kernel/arm/fp32/convolution_3x3.h | 2 +- .../kernel/arm/fp32/convolution_depthwise.h | 2 +- .../arm/fp32/convolution_grad_filter.cc | 6 +- .../kernel/arm/fp32/convolution_grad_input.cc | 6 +- .../kernel/arm/fp32/convolution_winograd.cc | 2 +- .../kernel/arm/fp32/convolution_winograd.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/crop.cc | 4 +- .../runtime/kernel/arm/fp32/deconvolution.h | 4 +- .../kernel/arm/fp32/deconvolution_depthwise.h | 2 +- .../runtime/kernel/arm/fp32/depth_to_space.cc | 4 +- .../src/runtime/kernel/arm/fp32/expandDims.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/fill.h | 2 +- .../src/runtime/kernel/arm/fp32/flatten.cc | 2 +- .../src/runtime/kernel/arm/fp32/flatten.h | 2 +- .../runtime/kernel/arm/fp32/fullconnection.h | 2 +- .../runtime/kernel/arm/fp32/fused_batchnorm.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/gather.h | 2 +- .../src/runtime/kernel/arm/fp32/gatherNd.h | 4 +- .../kernel/arm/fp32/local_response_norm.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/lstm.h | 2 +- .../src/runtime/kernel/arm/fp32/matmul.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/matmul.h | 2 +- .../src/runtime/kernel/arm/fp32/nchw2nhwc.h | 2 +- .../src/runtime/kernel/arm/fp32/nhwc2nchw.h | 2 +- .../src/runtime/kernel/arm/fp32/one_hot.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/pad.cc | 4 +- .../lite/src/runtime/kernel/arm/fp32/pad.h | 2 +- .../src/runtime/kernel/arm/fp32/pooling.cc | 4 +- .../runtime/kernel/arm/fp32/pooling_grad.cc | 4 +- .../lite/src/runtime/kernel/arm/fp32/power.h | 2 +- .../src/runtime/kernel/arm/fp32/power_grad.cc | 2 +- .../src/runtime/kernel/arm/fp32/power_grad.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/prelu.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/prelu.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/range.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/rank.h | 2 +- .../src/runtime/kernel/arm/fp32/reduce.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/reduce.h | 2 +- .../src/runtime/kernel/arm/fp32/reshape.cc | 2 +- .../src/runtime/kernel/arm/fp32/resize.cc | 8 +- .../lite/src/runtime/kernel/arm/fp32/resize.h | 2 +- .../src/runtime/kernel/arm/fp32/reverse.cc | 2 +- .../kernel/arm/fp32/reverse_sequence.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/scale.cc | 2 +- .../src/runtime/kernel/arm/fp32/scatter_nd.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/shape.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/slice.cc | 2 +- .../src/runtime/kernel/arm/fp32/softmax.cc | 2 +- .../runtime/kernel/arm/fp32/space_to_batch.cc | 6 +- .../runtime/kernel/arm/fp32/space_to_depth.cc | 2 +- ...parse_softmax_cross_entropy_with_logits.cc | 2 +- ...sparse_softmax_cross_entropy_with_logits.h | 4 +- .../kernel/arm/fp32/sparse_to_dense.cc | 2 +- .../runtime/kernel/arm/fp32/sparse_to_dense.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/split.cc | 4 +- .../src/runtime/kernel/arm/fp32/squeeze.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/stack.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/tile.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/topk.h | 2 +- .../src/runtime/kernel/arm/fp32/transpose.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/unique.h | 2 +- .../src/runtime/kernel/arm/fp32/unsqueeze.h | 2 +- .../src/runtime/kernel/arm/fp32/unstack.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/where.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/where.h | 2 +- .../src/runtime/kernel/arm/fp32/zeroslike.cc | 2 +- .../src/runtime/kernel/arm/int8/add_int8.cc | 2 +- .../src/runtime/kernel/arm/int8/add_int8.h | 2 +- .../runtime/kernel/arm/int8/argminmax_int8.cc | 2 +- .../runtime/kernel/arm/int8/argminmax_int8.h | 2 +- .../kernel/arm/int8/arithmetic_int8.cc | 4 +- .../kernel/arm/int8/arithmetic_self_int8.h | 4 +- .../kernel/arm/int8/batch_to_space_int8.cc | 4 +- .../runtime/kernel/arm/int8/bias_add_int8.cc | 12 +-- .../runtime/kernel/arm/int8/bias_add_int8.h | 4 +- .../runtime/kernel/arm/int8/concat_int8.cc | 2 +- .../kernel/arm/int8/convolution_3x3_int8.cc | 2 +- .../kernel/arm/int8/convolution_3x3_int8.h | 2 +- .../arm/int8/convolution_depthwise_int8.cc | 2 +- .../arm/int8/convolution_depthwise_int8.h | 2 +- .../kernel/arm/int8/convolution_int8.cc | 2 +- .../kernel/arm/int8/convolution_int8.h | 4 +- .../src/runtime/kernel/arm/int8/crop_int8.cc | 2 +- .../arm/int8/deconvolution_depthwise_int8.cc | 2 +- .../arm/int8/deconvolution_depthwise_int8.h | 2 +- .../kernel/arm/int8/deconvolution_int8.cc | 2 +- .../kernel/arm/int8/deconvolution_int8.h | 6 +- .../kernel/arm/int8/depth_to_space_int8.cc | 4 +- .../kernel/arm/int8/fullconnection_int8.cc | 4 +- .../kernel/arm/int8/fullconnection_int8.h | 2 +- .../runtime/kernel/arm/int8/hswish_int8.cc | 2 +- .../src/runtime/kernel/arm/int8/hswish_int8.h | 2 +- .../runtime/kernel/arm/int8/matmul_int8.cc | 4 +- .../src/runtime/kernel/arm/int8/matmul_int8.h | 2 +- .../src/runtime/kernel/arm/int8/mul_int8.cc | 4 +- .../src/runtime/kernel/arm/int8/mul_int8.h | 2 +- .../src/runtime/kernel/arm/int8/pad_int8.h | 4 +- .../runtime/kernel/arm/int8/pooling_int8.cc | 4 +- .../src/runtime/kernel/arm/int8/relu_int8.h | 4 +- .../runtime/kernel/arm/int8/reshape_int8.cc | 2 +- .../runtime/kernel/arm/int8/softmax_int8.cc | 2 +- .../src/runtime/kernel/arm/int8/split_int8.cc | 4 +- .../src/runtime/kernel/arm/int8/topk_int8.h | 2 +- .../arm/{opclib => nnacl}/CMakeLists.txt | 26 ++--- .../arm/{opclib => nnacl}/activation_grad.h | 26 ++--- .../kernel/arm/{opclib => nnacl}/add_int8.cc | 4 +- .../kernel/arm/{opclib => nnacl}/add_int8.h | 8 +- .../arm/{opclib => nnacl}/arg_min_max.cc | 4 +- .../arm/{opclib => nnacl}/arg_min_max.h | 12 +-- .../{opclib => nnacl}/arg_min_max_parameter.h | 8 +- .../{opclib => nnacl}/arithmetic_common.cc | 2 +- .../arm/{opclib => nnacl}/arithmetic_common.h | 10 +- .../{opclib => nnacl}/arithmetic_parameter.h | 8 +- .../arithmetic_self_parameter.h | 10 +- .../assembly/arm32/ConvDwFp32Center.S | 0 .../assembly/arm32/ConvDwInt8Center.S | 0 .../assembly/arm32/DeconvDwFp32Center.S | 0 .../assembly/arm32/DeconvDwInt8Center.S | 0 .../assembly/arm32/IndirectGemmFp32_8x4.S | 0 .../arm32/IndirectGemmInt16to32_8x4.S | 0 .../assembly/arm32/IndirectGemmInt8_2x4.S | 0 .../assembly/arm64/C4BiasAdd.S | 0 .../assembly/arm64/C4BiasAddRelu.S | 0 .../assembly/arm64/C4BiasAddRelu6.S | 0 .../{opclib => nnacl}/assembly/arm64/C4Relu.S | 0 .../assembly/arm64/C4Relu6.S | 0 .../assembly/arm64/ConvDwFp32Center.S | 0 .../assembly/arm64/ConvDwInt8Center.S | 0 .../assembly/arm64/DeconvDwFp32Center.S | 0 .../assembly/arm64/DeconvDwInt8Center.S | 0 .../assembly/arm64/IndirectGemmFp32_8x8.S | 0 .../arm64/IndirectGemmInt16to32_8x4.S | 0 .../assembly/arm64/IndirectGemmInt8_4x4.S | 0 .../assembly/arm64/bias_add.S | 0 .../assembly/arm64/bias_add_relu.S | 0 .../assembly/arm64/bias_add_relu6.S | 0 .../{opclib => nnacl}/assembly/arm64/matmul.s | 0 .../assembly/arm64/matrix_add.S | 0 .../assembly/arm64/matrix_sub.S | 0 .../{opclib => nnacl}/assembly/arm64/relu.S | 0 .../{opclib => nnacl}/assembly/arm64/relu6.S | 0 .../assembly/opt/ConvDwFp16Center.S | 0 .../assembly/opt/DeconvDwFp16Center.S | 0 .../assembly/opt/IndirectGemmFp16_16x8.S | 0 .../assembly/opt/IndirectGemmInt8_24x4_dp.S | 0 .../arm/{opclib => nnacl}/batch_norm.cc | 2 +- .../kernel/arm/{opclib => nnacl}/batch_norm.h | 0 .../arm/{opclib => nnacl}/batch_to_space.cc | 4 +- .../arm/{opclib => nnacl}/batch_to_space.h | 8 +- .../arm/{opclib => nnacl}/common_func.cc | 4 +- .../arm/{opclib => nnacl}/common_func.h | 10 +- .../arm/{opclib => nnacl}/concat_parameter.h | 8 +- .../arm/{opclib => nnacl}/conv_parameter.h | 10 +- .../arm/{opclib => nnacl}/crop_parameter.h | 8 +- .../arm/{opclib => nnacl}/depth_to_space.cc | 2 +- .../arm/{opclib => nnacl}/depth_to_space.h | 8 +- .../depth_to_space_parameter.h | 8 +- .../src/runtime/kernel/arm/nnacl/errorcode.h | 47 +++++++++ .../kernel/arm/{opclib => nnacl}/flatten.cc | 2 +- .../kernel/arm/{opclib => nnacl}/flatten.h | 8 +- .../arm/{opclib => nnacl}/fp16/common_func.h | 10 +- .../fp16/conv_depthwise_fp16.cc | 4 +- .../fp16/conv_depthwise_fp16.h | 10 +- .../arm/{opclib => nnacl}/fp16/conv_fp16.cc | 6 +- .../arm/{opclib => nnacl}/fp16/conv_fp16.h | 8 +- .../arm/{opclib => nnacl}/fp16/pack_fp16.cc | 2 +- .../arm/{opclib => nnacl}/fp16/pack_fp16.h | 10 +- .../fp16/winograd_transform_fp16.cc | 2 +- .../fp16/winograd_transform_fp16.h | 10 +- .../arm/{opclib => nnacl}/fp32/activation.h | 24 ++--- .../arm/{opclib => nnacl}/fp32/arg_min_max.cc | 2 +- .../arm/{opclib => nnacl}/fp32/arg_min_max.h | 8 +- .../arm/{opclib => nnacl}/fp32/arithmetic.cc | 42 ++++---- .../arm/{opclib => nnacl}/fp32/arithmetic.h | 12 +-- .../{opclib => nnacl}/fp32/arithmetic_grad.cc | 2 +- .../{opclib => nnacl}/fp32/arithmetic_grad.h | 6 +- .../{opclib => nnacl}/fp32/arithmetic_self.cc | 32 +++---- .../{opclib => nnacl}/fp32/arithmetic_self.h | 10 +- .../arm/{opclib => nnacl}/fp32/batchnorm.cc | 2 +- .../arm/{opclib => nnacl}/fp32/batchnorm.h | 8 +- .../{opclib => nnacl}/fp32/broadcast_to.cc | 4 +- .../arm/{opclib => nnacl}/fp32/broadcast_to.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/cast.cc | 2 +- .../kernel/arm/{opclib => nnacl}/fp32/cast.h | 8 +- .../arm/{opclib => nnacl}/fp32/common_func.cc | 2 +- .../arm/{opclib => nnacl}/fp32/common_func.h | 10 +- .../arm/{opclib => nnacl}/fp32/concat.cc | 2 +- .../arm/{opclib => nnacl}/fp32/concat.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/conv.cc | 4 +- .../kernel/arm/{opclib => nnacl}/fp32/conv.h | 18 ++-- .../{opclib => nnacl}/fp32/conv_depthwise.cc | 4 +- .../{opclib => nnacl}/fp32/conv_depthwise.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/crop.cc | 6 +- .../kernel/arm/{opclib => nnacl}/fp32/crop.h | 10 +- .../arm/{opclib => nnacl}/fp32/deconv.cc | 6 +- .../arm/{opclib => nnacl}/fp32/deconv.h | 14 +-- .../arm/{opclib => nnacl}/fp32/expandDims.cc | 6 +- .../arm/{opclib => nnacl}/fp32/expandDims.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/fill.cc | 4 +- .../kernel/arm/{opclib => nnacl}/fp32/fill.h | 10 +- .../arm/{opclib => nnacl}/fp32/gather.cc | 2 +- .../arm/{opclib => nnacl}/fp32/gather.h | 8 +- .../arm/{opclib => nnacl}/fp32/gatherNd.cc | 6 +- .../arm/{opclib => nnacl}/fp32/gatherNd.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/gemm.cc | 2 +- .../kernel/arm/{opclib => nnacl}/fp32/gemm.h | 6 +- .../fp32/local_response_norm.cc | 2 +- .../fp32/local_response_norm.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/lstm.cc | 6 +- .../kernel/arm/{opclib => nnacl}/fp32/lstm.h | 8 +- .../arm/{opclib => nnacl}/fp32/matmul.cc | 2 +- .../arm/{opclib => nnacl}/fp32/matmul.h | 12 +-- .../arm/{opclib => nnacl}/fp32/one_hot.cc | 10 +- .../arm/{opclib => nnacl}/fp32/one_hot.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/pad.cc | 4 +- .../kernel/arm/{opclib => nnacl}/fp32/pad.h | 10 +- .../arm/{opclib => nnacl}/fp32/pooling.cc | 2 +- .../arm/{opclib => nnacl}/fp32/pooling.h | 8 +- .../{opclib => nnacl}/fp32/pooling_grad.cc | 2 +- .../arm/{opclib => nnacl}/fp32/pooling_grad.h | 8 +- .../arm/{opclib => nnacl}/fp32/range.cc | 2 +- .../kernel/arm/{opclib => nnacl}/fp32/range.h | 8 +- .../kernel/arm/{opclib => nnacl}/fp32/rank.cc | 2 +- .../kernel/arm/{opclib => nnacl}/fp32/rank.h | 8 +- .../arm/{opclib => nnacl}/fp32/reduce.cc | 28 +++--- .../arm/{opclib => nnacl}/fp32/reduce.h | 8 +- .../arm/{opclib => nnacl}/fp32/reduce_grad.cc | 2 +- .../arm/{opclib => nnacl}/fp32/reduce_grad.h | 6 +- .../arm/{opclib => nnacl}/fp32/reverse.cc | 8 +- .../arm/{opclib => nnacl}/fp32/reverse.h | 8 +- .../arm/{opclib => nnacl}/fp32/slice.cc | 6 +- .../kernel/arm/{opclib => nnacl}/fp32/slice.h | 8 +- .../arm/{opclib => nnacl}/fp32/softmax.cc | 2 +- .../arm/{opclib => nnacl}/fp32/softmax.h | 10 +- .../arm/{opclib => nnacl}/fp32/softmax_grad.h | 8 +- .../{opclib => nnacl}/fp32/space_to_batch.cc | 14 +-- .../{opclib => nnacl}/fp32/space_to_batch.h | 8 +- .../{opclib => nnacl}/fp32/space_to_depth.cc | 16 ++-- .../{opclib => nnacl}/fp32/space_to_depth.h | 8 +- .../arm/{opclib => nnacl}/fp32/stack.cc | 4 +- .../kernel/arm/{opclib => nnacl}/fp32/stack.h | 8 +- .../{opclib => nnacl}/fp32/strassen_matmul.cc | 10 +- .../{opclib => nnacl}/fp32/strassen_matmul.h | 16 ++-- .../kernel/arm/{opclib => nnacl}/fp32/topk.cc | 2 +- .../kernel/arm/{opclib => nnacl}/fp32/topk.h | 8 +- .../arm/{opclib => nnacl}/fp32/unsqueeze.cc | 6 +- .../arm/{opclib => nnacl}/fp32/unsqueeze.h | 8 +- .../arm/{opclib => nnacl}/fused_batchnorm.cc | 2 +- .../arm/{opclib => nnacl}/fused_batchnorm.h | 8 +- .../int8/arg_min_max_int8.cc | 2 +- .../{opclib => nnacl}/int8/arg_min_max_int8.h | 10 +- .../{opclib => nnacl}/int8/arithmetic_int8.cc | 16 ++-- .../{opclib => nnacl}/int8/arithmetic_int8.h | 8 +- .../int8/arithmetic_self_int8.cc | 32 +++---- .../int8/arithmetic_self_int8.h | 10 +- .../int8/batch_to_space_int8.cc | 4 +- .../int8/batch_to_space_int8.h | 10 +- .../arm/{opclib => nnacl}/int8/common_func.h | 10 +- .../arm/{opclib => nnacl}/int8/concat_int8.cc | 2 +- .../arm/{opclib => nnacl}/int8/concat_int8.h | 8 +- .../int8/conv_depthwise_int8.cc | 6 +- .../int8/conv_depthwise_int8.h | 10 +- .../arm/{opclib => nnacl}/int8/conv_int8.cc | 6 +- .../arm/{opclib => nnacl}/int8/conv_int8.h | 18 ++-- .../arm/{opclib => nnacl}/int8/crop_int8.cc | 4 +- .../arm/{opclib => nnacl}/int8/crop_int8.h | 10 +- .../arm/{opclib => nnacl}/int8/deconv.cc | 6 +- .../arm/{opclib => nnacl}/int8/deconv.h | 18 ++-- .../int8/depth_to_space_int8.cc | 2 +- .../int8/depth_to_space_int8.h | 10 +- .../arm/{opclib => nnacl}/int8/hswish_int8.cc | 4 +- .../arm/{opclib => nnacl}/int8/hswish_int8.h | 12 +-- .../arm/{opclib => nnacl}/int8/matmul.cc | 4 +- .../arm/{opclib => nnacl}/int8/matmul.h | 10 +- .../arm/{opclib => nnacl}/int8/mul_int8.cc | 8 +- .../arm/{opclib => nnacl}/int8/mul_int8.h | 10 +- .../kernel/arm/{opclib => nnacl}/int8/pad.cc | 4 +- .../kernel/arm/{opclib => nnacl}/int8/pad.h | 10 +- .../{opclib => nnacl}/int8/pooling_int8.cc | 4 +- .../arm/{opclib => nnacl}/int8/pooling_int8.h | 10 +- .../int8/quant_dtype_cast.cc | 12 +-- .../{opclib => nnacl}/int8/quant_dtype_cast.h | 8 +- .../arm/{opclib => nnacl}/int8/relu_int8.h | 12 +-- .../{opclib => nnacl}/int8/reshape_int8.cc | 2 +- .../arm/{opclib => nnacl}/int8/reshape_int8.h | 8 +- .../{opclib => nnacl}/int8/softmax_int8.cc | 2 +- .../arm/{opclib => nnacl}/int8/softmax_int8.h | 10 +- .../arm/{opclib => nnacl}/int8/split_int8.cc | 10 +- .../arm/{opclib => nnacl}/int8/split_int8.h | 10 +- .../arm/{opclib => nnacl}/int8/topk_int8.cc | 2 +- .../arm/{opclib => nnacl}/int8/topk_int8.h | 10 +- .../kernel/arm/{opclib => nnacl}/matmul.h | 8 +- .../arm/{opclib => nnacl}/matrix_table.h | 6 +- .../arm/{opclib => nnacl}/mul_parameter.h | 8 +- .../opclib_utils.cc => nnacl/nnacl_utils.cc} | 2 +- .../opclib_utils.h => nnacl/nnacl_utils.h} | 6 +- .../kernel/arm/{opclib => nnacl}/op_base.h | 8 +- .../arm/{opclib => nnacl}/opt_op_handler.c | 0 .../arm/{opclib => nnacl}/optimized_kernel.h | 8 +- .../kernel/arm/{opclib => nnacl}/pack.cc | 2 +- .../kernel/arm/{opclib => nnacl}/pack.h | 10 +- .../kernel/arm/{opclib => nnacl}/pack_ext.cc | 2 +- .../kernel/arm/{opclib => nnacl}/pack_ext.h | 8 +- .../arm/{opclib => nnacl}/pad_parameter.h | 8 +- .../kernel/arm/{opclib => nnacl}/power.cc | 2 +- .../kernel/arm/{opclib => nnacl}/power.h | 8 +- .../kernel/arm/{opclib => nnacl}/prelu.cc | 2 +- .../kernel/arm/{opclib => nnacl}/prelu.h | 8 +- .../kernel/arm/{opclib => nnacl}/prior_box.cc | 6 +- .../kernel/arm/{opclib => nnacl}/prior_box.h | 8 +- .../quantization/fixed_point.h | 6 +- .../quantization/quantize.cc | 2 +- .../{opclib => nnacl}/quantization/quantize.h | 8 +- .../kernel/arm/{opclib => nnacl}/reshape.cc | 2 +- .../kernel/arm/{opclib => nnacl}/reshape.h | 8 +- .../arm/{opclib => nnacl}/reshape_parameter.h | 8 +- .../kernel/arm/{opclib => nnacl}/resize.cc | 10 +- .../kernel/arm/{opclib => nnacl}/resize.h | 10 +- .../arm/{opclib => nnacl}/reverse_sequence.cc | 4 +- .../arm/{opclib => nnacl}/reverse_sequence.h | 8 +- .../kernel/arm/{opclib => nnacl}/scale.cc | 8 +- .../kernel/arm/{opclib => nnacl}/scale.h | 9 +- .../arm/{opclib => nnacl}/scatter_nd.cc | 8 +- .../kernel/arm/{opclib => nnacl}/scatter_nd.h | 8 +- .../kernel/arm/{opclib => nnacl}/shape.h | 8 +- .../arm/{opclib => nnacl}/softmax_parameter.h | 8 +- .../arm/{opclib => nnacl}/sparse_to_dense.cc | 2 +- .../arm/{opclib => nnacl}/sparse_to_dense.h | 8 +- .../kernel/arm/{opclib => nnacl}/split.cc | 10 +- .../kernel/arm/{opclib => nnacl}/split.h | 10 +- .../arm/{opclib => nnacl}/split_parameter.h | 8 +- .../kernel/arm/{opclib => nnacl}/squeeze.cc | 2 +- .../kernel/arm/{opclib => nnacl}/squeeze.h | 8 +- .../arm/{opclib => nnacl}/strassen_matmul.h | 8 +- .../arm/{opclib => nnacl}/strided_slice.cc | 10 +- .../arm/{opclib => nnacl}/strided_slice.h | 8 +- .../kernel/arm/{opclib => nnacl}/tile.cc | 2 +- .../kernel/arm/{opclib => nnacl}/tile.h | 8 +- .../kernel/arm/{opclib => nnacl}/transpose.cc | 12 +-- .../kernel/arm/{opclib => nnacl}/transpose.h | 8 +- .../kernel/arm/{opclib => nnacl}/unique.cc | 2 +- .../kernel/arm/{opclib => nnacl}/unique.h | 8 +- .../kernel/arm/{opclib => nnacl}/unstack.cc | 2 +- .../kernel/arm/{opclib => nnacl}/unstack.h | 8 +- .../kernel/arm/{opclib => nnacl}/where.cc | 2 +- .../kernel/arm/{opclib => nnacl}/where.h | 8 +- .../{opclib => nnacl}/winograd_transform.cc | 2 +- .../{opclib => nnacl}/winograd_transform.h | 14 +-- .../arm/{opclib => nnacl}/winograd_utils.cc | 2 +- .../arm/{opclib => nnacl}/winograd_utils.h | 12 +-- .../kernel/arm/{opclib => nnacl}/zeroslike.cc | 2 +- .../kernel/arm/{opclib => nnacl}/zeroslike.h | 8 +- .../src/runtime/kernel/arm/opclib/errorcode.h | 47 --------- .../kernel/opencl/kernel/conv2d_transpose.h | 4 +- .../kernel/opencl/kernel/convolution.h | 2 +- .../kernel/opencl/kernel/depthwise_conv2d.cc | 2 +- .../kernel/opencl/kernel/depthwise_conv2d.h | 3 +- .../runtime/kernel/opencl/kernel/matmul.cc | 2 +- .../src/runtime/kernel/opencl/kernel/matmul.h | 3 +- .../runtime/kernel/opencl/kernel/pooling2d.h | 2 +- .../runtime/kernel/opencl/kernel/softmax.h | 2 +- .../lite/src/runtime/kernel/opencl/utils.h | 2 +- .../src/runtime/opencl/opencl_executor.cc | 2 +- mindspore/lite/test/CMakeLists.txt | 44 ++++----- .../runtime/kernel/arm/common/pack_tests.cc | 2 +- .../kernel/arm/common/strided_slice_tests.cc | 2 +- .../kernel/arm/fp16/convolution_fp16_tests.cc | 2 +- .../kernel/arm/fp32/activation_fp32_test.cc | 2 +- .../kernel/arm/fp32/argminmax_fp32_test.cc | 6 +- .../arm/fp32/arithmetic_grad_fp32_tests.cc | 2 +- .../arm/fp32/batch_to_space_fp32_test.cc | 4 +- .../kernel/arm/fp32/batchnorm_fp32_tests.cc | 4 +- .../kernel/arm/fp32/conv1x1_fp32_tests.cc | 4 +- .../arm/fp32/convolution_grad_fp32_tests.cc | 2 +- .../runtime/kernel/arm/fp32/crop_fp32_test.cc | 2 +- .../arm/fp32/deconvolution_fp32_tests.cc | 2 +- .../arm/fp32/depth_to_space_fp32_test.cc | 4 +- .../arm/fp32/fullconnection_fp32_tests.cc | 2 +- .../kernel/arm/fp32/lstm_fp32_tests.cc | 2 +- .../kernel/arm/fp32/matmul_fp32_tests.cc | 2 +- .../arm/fp32/pooling_grad_fp32_tests.cc | 2 +- .../arm/fp32/space_to_batch_fp32_tests.cc | 2 +- .../arm/fp32/space_to_depth_fp32_tests.cc | 2 +- .../kernel/arm/fp32/strassen_fp32_tests.cc | 6 +- .../kernel/arm/fp32/topk_fp32_tests.cc | 2 +- .../arm/int8/arithmetic_self_int8_tests.cc | 2 +- .../kernel/arm/int8/crop_int8_tests.cc | 2 +- .../kernel/arm/int8/deconv_int8_tests.cc | 6 +- .../arm/int8/fullconnection_int8_tests.cc | 4 +- .../kernel/arm/int8/hswish_int8_tests.cc | 2 +- .../kernel/arm/int8/matmul_int8_tests.cc | 4 +- .../runtime/kernel/arm/int8/pad_int8_tests.cc | 2 +- .../kernel/arm/int8/quant_dtype_cast_tests.cc | 2 +- .../kernel/arm/int8/softmax_int8_tests.cc | 2 +- .../kernel/arm/int8/split_int8_tests.cc | 2 +- .../kernel/arm/int8/topk_int8_tests.cc | 2 +- .../kernel/opencl/depthwise_conv2d_tests.cc | 2 +- .../fusion/conv_activation_fusion_test.cc | 0 .../fusion/conv_biasadd_fusion_test.cc | 0 .../optimizer}/fusion/conv_bn_fusion_test.cc | 0 .../fusion/conv_scale_fusion_test.cc | 0 mindspore/lite/tools/converter/CMakeLists.txt | 20 ++-- .../lite/tools/converter/anf_transform.cc | 8 +- .../tools/converter/graphdef_transform.cc | 58 +++++------ .../lite/tools/converter/graphdef_transform.h | 2 +- .../CMakeLists.txt | 0 .../const_fold/CMakeLists.txt | 0 .../const_fold/add_const_fold_pass.cc | 2 +- .../const_fold/add_const_fold_pass.h | 0 .../const_fold/cast_const_fold_pass.cc | 2 +- .../const_fold/cast_const_fold_pass.h | 0 .../const_fold/concat_v2_const_fold_pass.cc | 2 +- .../const_fold/concat_v2_const_fold_pass.h | 0 .../const_fold/const_fold_pass.cc | 2 +- .../const_fold/const_fold_pass.h | 0 .../const_fold/expand_dims_const_fold_pass.cc | 2 +- .../const_fold/expand_dims_const_fold_pass.h | 0 .../const_fold/mul_const_fold_pass.cc | 2 +- .../const_fold/mul_const_fold_pass.h | 0 .../const_fold/range_const_fold_pass.cc | 2 +- .../const_fold/range_const_fold_pass.h | 0 .../const_fold/reshape_const_fold_pass.cc | 2 +- .../const_fold/reshape_const_fold_pass.h | 0 .../const_fold/rsqrt_const_fold_pass.cc | 2 +- .../const_fold/rsqrt_const_fold_pass.h | 0 .../const_fold/shape_const_fold_pass.cc | 2 +- .../const_fold/shape_const_fold_pass.h | 0 .../const_fold/slice_const_fold_pass.cc | 2 +- .../const_fold/slice_const_fold_pass.h | 0 .../const_fold/stack_const_fold_pass.cc | 2 +- .../const_fold/stack_const_fold_pass.h | 0 .../strided_slice_const_fold_pass.cc | 2 +- .../strided_slice_const_fold_pass.h | 0 .../const_fold/sub_const_fold_pass.cc | 2 +- .../const_fold/sub_const_fold_pass.h | 0 .../const_fold/tile_const_fold_pass.cc | 2 +- .../const_fold/tile_const_fold_pass.h | 0 .../const_fold/transpose_const_fold_pass.cc | 2 +- .../const_fold/transpose_const_fold_pass.h | 0 .../fusion/CMakeLists.txt | 0 .../fusion/batchnorm_fold_fusion_pass.cc | 2 +- .../fusion/batchnorm_fold_fusion_pass.h | 2 +- .../fusion/conv_activation_fusion_pass.cc | 2 +- .../fusion/conv_activation_fusion_pass.h | 2 +- .../fusion/conv_biasadd_fusion_pass.cc | 2 +- .../fusion/conv_biasadd_fusion_pass.h | 2 +- .../fusion/conv_bn_fusion_pass.cc | 2 +- .../fusion/conv_bn_fusion_pass.h | 4 +- .../fusion/conv_relu6_fusion_pass.cc | 2 +- .../fusion/conv_relu6_fusion_pass.h | 2 +- .../fusion/conv_relu_fusion_pass.cc | 2 +- .../fusion/conv_relu_fusion_pass.h | 2 +- .../fusion/conv_scale_bias_fusion_pass.cc | 2 +- .../fusion/conv_scale_bias_fusion_pass.h | 2 +- .../fusion/conv_scale_fusion_pass.cc | 2 +- .../fusion/conv_scale_fusion_pass.h | 2 +- .../fusion/format_trans_fusion_pass.cc | 2 +- .../fusion/format_trans_fusion_pass.h | 2 +- .../fusion/fusion_pass.cc | 2 +- .../fusion/fusion_pass.h | 2 +- .../fusion/fusion_pattern.cc | 2 +- .../fusion/fusion_pattern.h | 0 .../fusion/matmul_biasadd_fusion_pass.cc | 2 +- .../fusion/matmul_biasadd_fusion_pass.h | 2 +- .../fusion/quant_cast_fusion_pass.cc | 2 +- .../fusion/quant_cast_fusion_pass.h | 2 +- .../graph/CMakeLists.txt | 0 .../graph/format_trans_pass.cc | 2 +- .../graph/format_trans_pass.h | 0 .../graph/isolated_node_remove_pass.cc | 2 +- .../graph/isolated_node_remove_pass.h | 0 .../model_input_format_preprocess_pass.cc | 2 +- .../model_input_format_preprocess_pass.h | 0 .../graph/topological_sort_pass.cc | 2 +- .../graph/topological_sort_pass.h | 0 .../graph/unused_node_remove_pass.cc | 2 +- .../graph/unused_node_remove_pass.h | 0 .../node/CMakeLists.txt | 0 .../node/weight_format_pass.cc | 2 +- .../node/weight_format_pass.h | 0 .../optimizer}/common/gllo_utils.cc | 2 +- .../optimizer}/common/gllo_utils.h | 0 .../optimizer}/common/node_pass.cc | 2 +- .../optimizer}/common/optimizer.cc | 2 +- .../optimizer}/common/optimizer.h | 2 +- .../gllo => tools/optimizer}/common/pass.h | 0 .../optimizer}/common/pass_manager.cc | 0 .../fusion/conv_activation_fusion.cc | 4 +- .../fusion/conv_activation_fusion.h | 2 +- .../optimizer}/fusion/conv_biasadd_fusion.cc | 4 +- .../optimizer}/fusion/conv_biasadd_fusion.h | 2 +- .../optimizer}/fusion/conv_bn_fusion.cc | 4 +- .../optimizer}/fusion/conv_bn_fusion.h | 2 +- .../optimizer}/fusion/conv_scale_fusion.cc | 4 +- .../optimizer}/fusion/conv_scale_fusion.h | 2 +- .../fusion/conv_transform_fusion.cc | 4 +- .../optimizer}/fusion/conv_transform_fusion.h | 2 +- 553 files changed, 1341 insertions(+), 1338 deletions(-) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/CMakeLists.txt (60%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/activation_grad.h (80%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/add_int8.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/add_int8.h (84%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arg_min_max.cc (96%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arg_min_max.h (64%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arg_min_max_parameter.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arithmetic_common.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arithmetic_common.h (82%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arithmetic_parameter.h (67%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/arithmetic_self_parameter.h (68%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/ConvDwFp32Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/ConvDwInt8Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/DeconvDwFp32Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/DeconvDwInt8Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/IndirectGemmFp32_8x4.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/IndirectGemmInt16to32_8x4.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm32/IndirectGemmInt8_2x4.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/C4BiasAdd.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/C4BiasAddRelu.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/C4BiasAddRelu6.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/C4Relu.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/C4Relu6.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/ConvDwFp32Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/ConvDwInt8Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/DeconvDwFp32Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/DeconvDwInt8Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/IndirectGemmFp32_8x8.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/IndirectGemmInt16to32_8x4.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/IndirectGemmInt8_4x4.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/bias_add.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/bias_add_relu.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/bias_add_relu6.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/matmul.s (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/matrix_add.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/matrix_sub.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/relu.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/arm64/relu6.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/opt/ConvDwFp16Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/opt/DeconvDwFp16Center.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/opt/IndirectGemmFp16_16x8.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/assembly/opt/IndirectGemmInt8_24x4_dp.S (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/batch_norm.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/batch_norm.h (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/batch_to_space.cc (96%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/batch_to_space.h (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/common_func.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/common_func.h (90%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/concat_parameter.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/conv_parameter.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/crop_parameter.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/depth_to_space.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/depth_to_space.h (71%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/depth_to_space_parameter.h (75%) create mode 100644 mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/flatten.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/flatten.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/common_func.h (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/conv_depthwise_fp16.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/conv_depthwise_fp16.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/conv_fp16.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/conv_fp16.h (84%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/pack_fp16.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/pack_fp16.h (86%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/winograd_transform_fp16.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp16/winograd_transform_fp16.h (80%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/activation.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arg_min_max.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arg_min_max.h (85%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arithmetic.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arithmetic.h (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arithmetic_grad.cc (94%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arithmetic_grad.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arithmetic_self.cc (85%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/arithmetic_self.h (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/batchnorm.cc (94%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/batchnorm.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/broadcast_to.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/broadcast_to.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/cast.cc (96%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/cast.h (83%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/common_func.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/common_func.h (90%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/concat.cc (96%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/concat.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/conv.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/conv.h (80%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/conv_depthwise.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/conv_depthwise.h (83%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/crop.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/crop.h (74%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/deconv.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/deconv.h (74%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/expandDims.cc (85%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/expandDims.h (74%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/fill.cc (90%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/fill.h (74%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/gather.cc (96%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/gather.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/gatherNd.cc (86%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/gatherNd.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/gemm.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/gemm.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/local_response_norm.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/local_response_norm.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/lstm.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/lstm.h (80%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/matmul.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/matmul.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/one_hot.cc (87%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/one_hot.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/pad.cc (92%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/pad.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/pooling.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/pooling.h (83%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/pooling_grad.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/pooling_grad.h (74%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/range.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/range.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/rank.cc (92%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/rank.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/reduce.cc (92%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/reduce.h (88%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/reduce_grad.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/reduce_grad.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/reverse.cc (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/reverse.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/slice.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/slice.h (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/softmax.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/softmax.h (68%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/softmax_grad.h (74%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/space_to_batch.cc (94%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/space_to_batch.h (84%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/space_to_depth.cc (84%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/space_to_depth.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/stack.cc (92%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/stack.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/strassen_matmul.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/strassen_matmul.h (71%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/topk.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/topk.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/unsqueeze.cc (85%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fp32/unsqueeze.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fused_batchnorm.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/fused_batchnorm.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/arg_min_max_int8.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/arg_min_max_int8.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/arithmetic_int8.cc (89%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/arithmetic_int8.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/arithmetic_self_int8.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/arithmetic_self_int8.h (82%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/batch_to_space_int8.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/batch_to_space_int8.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/common_func.h (88%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/concat_int8.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/concat_int8.h (72%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/conv_depthwise_int8.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/conv_depthwise_int8.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/conv_int8.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/conv_int8.h (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/crop_int8.cc (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/crop_int8.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/deconv.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/deconv.h (64%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/depth_to_space_int8.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/depth_to_space_int8.h (67%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/hswish_int8.cc (96%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/hswish_int8.h (71%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/matmul.cc (94%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/matmul.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/mul_int8.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/mul_int8.h (69%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/pad.cc (91%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/pad.h (71%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/pooling_int8.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/pooling_int8.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/quant_dtype_cast.cc (83%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/quant_dtype_cast.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/relu_int8.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/reshape_int8.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/reshape_int8.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/softmax_int8.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/softmax_int8.h (69%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/split_int8.cc (92%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/split_int8.h (69%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/topk_int8.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/int8/topk_int8.h (70%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/matmul.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/matrix_table.h (98%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/mul_parameter.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib/opclib_utils.cc => nnacl/nnacl_utils.cc} (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib/opclib_utils.h => nnacl/nnacl_utils.h} (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/op_base.h (84%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/opt_op_handler.c (100%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/optimized_kernel.h (87%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/pack.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/pack.h (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/pack_ext.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/pack_ext.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/pad_parameter.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/power.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/power.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/prelu.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/prelu.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/prior_box.cc (89%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/prior_box.h (83%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/quantization/fixed_point.h (91%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/quantization/quantize.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/quantization/quantize.h (94%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/reshape.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/reshape.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/reshape_parameter.h (71%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/resize.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/resize.h (81%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/reverse_sequence.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/reverse_sequence.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/scale.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/scale.h (79%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/scatter_nd.cc (87%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/scatter_nd.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/shape.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/softmax_parameter.h (73%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/sparse_to_dense.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/sparse_to_dense.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/split.cc (89%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/split.h (71%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/split_parameter.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/squeeze.cc (94%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/squeeze.h (75%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/strassen_matmul.h (77%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/strided_slice.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/strided_slice.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/tile.cc (97%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/tile.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/transpose.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/transpose.h (83%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/unique.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/unique.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/unstack.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/unstack.h (76%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/where.cc (95%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/where.h (78%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/winograd_transform.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/winograd_transform.h (87%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/winograd_utils.cc (99%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/winograd_utils.h (85%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/zeroslike.cc (93%) rename mindspore/lite/src/runtime/kernel/arm/{opclib => nnacl}/zeroslike.h (72%) delete mode 100644 mindspore/lite/src/runtime/kernel/arm/opclib/errorcode.h rename mindspore/lite/test/ut/{src/gllo => tools/optimizer}/fusion/conv_activation_fusion_test.cc (100%) rename mindspore/lite/test/ut/{src/gllo => tools/optimizer}/fusion/conv_biasadd_fusion_test.cc (100%) rename mindspore/lite/test/ut/{src/gllo => tools/optimizer}/fusion/conv_bn_fusion_test.cc (100%) rename mindspore/lite/test/ut/{src/gllo => tools/optimizer}/fusion/conv_scale_fusion_test.cc (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/CMakeLists.txt (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/CMakeLists.txt (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/add_const_fold_pass.cc (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/add_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/cast_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/cast_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/concat_v2_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/concat_v2_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/const_fold_pass.cc (98%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/expand_dims_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/expand_dims_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/mul_const_fold_pass.cc (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/mul_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/range_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/range_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/reshape_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/reshape_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/rsqrt_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/rsqrt_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/shape_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/shape_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/slice_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/slice_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/stack_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/stack_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/strided_slice_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/strided_slice_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/sub_const_fold_pass.cc (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/sub_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/tile_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/tile_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/transpose_const_fold_pass.cc (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/const_fold/transpose_const_fold_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/CMakeLists.txt (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/batchnorm_fold_fusion_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/batchnorm_fold_fusion_pass.h (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_activation_fusion_pass.cc (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_activation_fusion_pass.h (95%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_biasadd_fusion_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_biasadd_fusion_pass.h (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_bn_fusion_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_bn_fusion_pass.h (91%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_relu6_fusion_pass.cc (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_relu6_fusion_pass.h (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_relu_fusion_pass.cc (95%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_relu_fusion_pass.h (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_scale_bias_fusion_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_scale_bias_fusion_pass.h (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_scale_fusion_pass.cc (98%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/conv_scale_fusion_pass.h (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/format_trans_fusion_pass.cc (98%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/format_trans_fusion_pass.h (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/fusion_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/fusion_pass.h (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/fusion_pattern.cc (98%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/fusion_pattern.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/matmul_biasadd_fusion_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/matmul_biasadd_fusion_pass.h (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/quant_cast_fusion_pass.cc (98%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/fusion/quant_cast_fusion_pass.h (96%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/CMakeLists.txt (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/format_trans_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/format_trans_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/isolated_node_remove_pass.cc (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/isolated_node_remove_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/model_input_format_preprocess_pass.cc (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/model_input_format_preprocess_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/topological_sort_pass.cc (97%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/topological_sort_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/unused_node_remove_pass.cc (94%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/graph/unused_node_remove_pass.h (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/node/CMakeLists.txt (100%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/node/weight_format_pass.cc (99%) rename mindspore/lite/tools/converter/{optimizer => legacy_optimizer}/node/weight_format_pass.h (100%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/gllo_utils.cc (99%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/gllo_utils.h (100%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/node_pass.cc (98%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/optimizer.cc (98%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/optimizer.h (98%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/pass.h (100%) rename mindspore/lite/{src/gllo => tools/optimizer}/common/pass_manager.cc (100%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_activation_fusion.cc (96%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_activation_fusion.h (97%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_biasadd_fusion.cc (98%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_biasadd_fusion.h (96%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_bn_fusion.cc (98%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_bn_fusion.h (95%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_scale_fusion.cc (97%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_scale_fusion.h (95%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_transform_fusion.cc (98%) rename mindspore/lite/{src/gllo => tools/optimizer}/fusion/conv_transform_fusion.h (97%) diff --git a/mindspore/lite/src/executor.cc b/mindspore/lite/src/executor.cc index 02e33be455..a82d7cd1ed 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/opclib/pack.h" +#include "src/runtime/kernel/arm/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 53019e77ec..4917d93dcc 100644 --- a/mindspore/lite/src/kernel_registry.cc +++ b/mindspore/lite/src/kernel_registry.cc @@ -20,7 +20,7 @@ #include #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; diff --git a/mindspore/lite/src/lite_kernel.h b/mindspore/lite/src/lite_kernel.h index f7f342047b..1dba44c862 100644 --- a/mindspore/lite/src/lite_kernel.h +++ b/mindspore/lite/src/lite_kernel.h @@ -21,7 +21,7 @@ #ifdef ENABLE_ARM #include #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" diff --git a/mindspore/lite/src/ops/resize.cc b/mindspore/lite/src/ops/resize.cc index 9b7edd2d9e..7ef277b6fb 100644 --- a/mindspore/lite/src/ops/resize.cc +++ b/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 { diff --git a/mindspore/lite/src/ops/strided_slice.cc b/mindspore/lite/src/ops/strided_slice.cc index 159a6bf8f2..6127c8a601 100644 --- a/mindspore/lite/src/ops/strided_slice.cc +++ b/mindspore/lite/src/ops/strided_slice.cc @@ -17,7 +17,7 @@ #include #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" diff --git a/mindspore/lite/src/populate_parameter.cc b/mindspore/lite/src/populate_parameter.cc index a85682d94e..ced8133048 100644 --- a/mindspore/lite/src/populate_parameter.cc +++ b/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) { diff --git a/mindspore/lite/src/populate_parameter.h b/mindspore/lite/src/populate_parameter.h index be92c856cb..4bfde44d8d 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/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 *); diff --git a/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt b/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt index 79342ea9ec..2a66748ecf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/CMakeLists.txt +++ b/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) 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 4574065528..0e356a5315 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,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" 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 5362884e75..e816153411 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/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" 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 320065d209..131b512e76 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/opclib/concat_parameter.h" +#include "src/runtime/kernel/arm/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 152647aa7d..ed1e5416b9 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/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" 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 de0760eb13..9c7f558083 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/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; 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 bad3b111e8..f4ad763b5f 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/opclib/crop_parameter.h" +#include "src/runtime/kernel/arm/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 9d83f21177..b18f7dc9bb 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/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" 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 bf21ba141e..32974271aa 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/opclib/depth_to_space.h" +#include "src/runtime/kernel/arm/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 22cca3d997..3d29519370 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/opclib/matmul.h" +#include "src/runtime/kernel/arm/nnacl/matmul.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 7a6c4e93f6..99f37d923f 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/opclib/pack.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" #include "ir/dtype/type_id.h" #include "schema/ops_generated.h" 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 e29271eb19..d8bc0624a2 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/opclib/matmul.h" +#include "src/runtime/kernel/arm/nnacl/matmul.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 d3b49393a4..eb0c5e4cb2 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/opclib/winograd_utils.h" +#include "src/runtime/kernel/arm/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 ff19d98e65..a601db0bb3 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/opclib/fp32/pooling.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" #include "include/errorcode.h" using mindspore::lite::Context; 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 1183da4f30..d4867c620f 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/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; 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 9fb087cd8b..ef5516be2d 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/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" 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 9255228345..2c0ca7ea30 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/opclib/reshape_parameter.h" +#include "src/runtime/kernel/arm/nnacl/reshape_parameter.h" using mindspore::lite::Context; 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 abe6136ab8..f5f348e9ee 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/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" 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 d2ac003ccf..4e8873aec0 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/opclib/softmax_parameter.h" +#include "src/runtime/kernel/arm/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 d5ffffbd54..0f90604cfc 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/opclib/split_parameter.h" +#include "src/runtime/kernel/arm/nnacl/split_parameter.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 4f95dfb468..886bec2e68 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/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" 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 6deb79a83c..0f2e18111c 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,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" 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 dc9777f2e8..e6f8862e9b 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/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 { 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 dc8a70e3d8..ec027deacd 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,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" 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 a66e31da31..5b81404e3e 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/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 { 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 31ff338e50..92277efdf6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp16/convolution_fp16.cc +++ b/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(out_tensor->Data()); for (int j = 0; j < out_tensor->ElementsNum(); ++j) { - output_addr[j] = (float)fp16_out_[j]; + output_addr[j] = static_cast(fp16_out_[j]); } return RET_OK; } 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 ce758358d7..4a0097b75c 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/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" 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 51a50b5bc5..0e3a31682c 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/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 { 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 dc7fd5720b..419c10b06e 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/activation.h b/mindspore/lite/src/runtime/kernel/arm/fp32/activation.h index 2bcc7622a4..2e21629d79 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/opclib/fp32/activation.h" +#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" namespace mindspore::kernel { class ActivationCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/activation_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32/activation_grad.h index 4fc4265d49..c3de590123 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/activation_grad.h +++ b/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 { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/addn.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/addn.cc index a9d01b1351..226843c805 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/addn.cc +++ b/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; } diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/argminmax.cc index b2615315c5..a89eb715fd 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/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic.h index c81701b96e..968f5fbb4e 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/opclib/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/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_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.cc index a9d62c8ee9..b3f9075bef 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.cc +++ b/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.h index a11ef24a44..cea0c0e659 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.h @@ -19,7 +19,7 @@ #include #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" 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 7e23a702af..bcc56820db 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/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" 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 1bc4dd27c6..a24cae52de 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/opclib/batch_to_space.h" +#include "src/runtime/kernel/arm/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.h b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h index 2aadad2c09..e29aa20a2f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm.h @@ -20,7 +20,7 @@ #include #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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/bias.h b/mindspore/lite/src/runtime/kernel/arm/fp32/bias.h index 70808d7390..a4d88378fd 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/opclib/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" namespace mindspore::kernel { class BiasCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/bias_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32/bias_grad.h index 0e7ac18692..797abfd162 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/bias_grad.h +++ b/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 { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/bngrad_input.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/bngrad_input.cc index a9492b2644..2a07167058 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/bngrad_input.cc +++ b/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; 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 8952d4deb6..cfb8969448 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/opclib/fp32/broadcast_to.h" +#include "src/runtime/kernel/arm/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 03b89bdfc1..b17bc4bb7a 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/concat.cc index bc820ac2fb..df3ba83c5c 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc index 9d7a3bfe35..bee5e46e75 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.cc +++ b/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution.h index a184c7df1c..9e79609280 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/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 { 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 1352b0329a..6d5840e017 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/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 { 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 ebe739a478..aa1f363010 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/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" 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 4b70909d86..90dbac5a6f 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/opclib/winograd_transform.h" +#include "src/runtime/kernel/arm/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 dedcdf5016..e0d742c6ae 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/opclib/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" namespace mindspore::kernel { class ConvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_filter.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_filter.cc index 89cba44768..3deb6a2017 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_filter.cc +++ b/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_input.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_input.cc index 29bb49a8c8..6e0683b301 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_input.cc +++ b/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; 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 0ddcd76a59..3204ee8e05 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/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" 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 1fe90cf032..d11cc8ae4b 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/crop.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/crop.cc index 8fc811a6e3..5282c6cada 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h index 4d3adf09e9..165ebf5d28 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/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 { 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 5db24df3b6..f2ed4b5d95 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/opclib/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/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 2218a328d3..c28a9cd4cd 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/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h b/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims.h index 0ae103ea11..3ed5b12eae 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/opclib/fp32/expandDims.h" +#include "src/runtime/kernel/arm/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 3ba2348d44..2010681f56 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/opclib/fp32/fill.h" +#include "src/runtime/kernel/arm/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 fcd734d9f4..3adddbf91f 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/opclib/flatten.h" +#include "src/runtime/kernel/arm/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 3b2db2523d..e84104f50f 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/opclib/flatten.h" +#include "src/runtime/kernel/arm/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 c654945f49..be4c1f72b5 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/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; 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 0ab0e2e8a9..bce0660be9 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/opclib/fused_batchnorm.h" +#include "src/runtime/kernel/arm/nnacl/fused_batchnorm.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 1e6146461e..3204144c52 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/opclib/fp32/gather.h" +#include "src/runtime/kernel/arm/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 7667d94787..6c8a6064a6 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/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; 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 d85216970d..ea65a3e923 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/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 { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h b/mindspore/lite/src/runtime/kernel/arm/fp32/lstm.h index 35ec4a115d..61488ca2c4 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/opclib/fp32/lstm.h" +#include "src/runtime/kernel/arm/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 ee6606d66c..ca20fb76b6 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/opclib/fp32/matmul.h" +#include "src/runtime/kernel/arm/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 14594dc3f0..0f617d0179 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/opclib/matmul.h" +#include "src/runtime/kernel/arm/nnacl/matmul.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 1a5fe9c064..df45cdd2d6 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/opclib/pack.h" +#include "src/runtime/kernel/arm/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 b2de852b9a..8165283ecb 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/opclib/pack.h" +#include "src/runtime/kernel/arm/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 37abc0f8c7..afff5d42de 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc index 18aaf9eb42..511c7f9d87 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.cc +++ b/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(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; } diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pad.h b/mindspore/lite/src/runtime/kernel/arm/fp32/pad.h index f13faa9416..c48ddf581c 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/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 { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/pooling.cc index cee6090408..960734f994 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/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_grad.cc index 9b10cbf369..23606e6fa7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_grad.cc +++ b/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/power.h b/mindspore/lite/src/runtime/kernel/arm/fp32/power.h index 89fc8de702..b2ee1f6b62 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/opclib/power.h" +#include "src/runtime/kernel/arm/nnacl/power.h" namespace mindspore::kernel { class PowerCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.cc index 7368fa6235..f99bd3e743 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.cc +++ b/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.h index 316b55e1eb..00b2e882f7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/power_grad.h @@ -20,7 +20,7 @@ #include #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 { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.cc index 709dda85f4..952392761d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/prelu.h" #include #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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h index c0963bc56f..63da37c8f5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu.h +++ b/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/range.h b/mindspore/lite/src/runtime/kernel/arm/fp32/range.h index cf90593df2..0306440aba 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/opclib/fp32/range.h" +#include "src/runtime/kernel/arm/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 e167508404..13ef53dc79 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/opclib/fp32/rank.h" +#include "src/runtime/kernel/arm/nnacl/fp32/rank.h" namespace mindspore::kernel { class RankCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.cc index c5a2a217ac..43bdfe9351 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.cc +++ b/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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce.h index 41a1220353..2273465c27 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/opclib/fp32/reduce.h" +#include "src/runtime/kernel/arm/nnacl/fp32/reduce.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 7cd932c33f..dc45381b84 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/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" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/resize.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/resize.cc index fcc2cf842c..ea89861d32 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/resize.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/resize.cc @@ -18,8 +18,8 @@ #include #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(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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/resize.h b/mindspore/lite/src/runtime/kernel/arm/fp32/resize.h index 2624d136cf..6d4f681be2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/resize.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/resize.h @@ -18,7 +18,7 @@ #include #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; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse.cc index 4ee5d25289..9e3b6bb557 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/opclib/fp32/reverse.h" +#include "src/runtime/kernel/arm/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 e98eb02019..4723745afd 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/opclib/reverse_sequence.h" +#include "src/runtime/kernel/arm/nnacl/reverse_sequence.h" namespace mindspore::kernel { class ReverseSequenceCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/scale.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/scale.cc index 376baea21e..2323e4ce95 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/scale.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/scale.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/fp32/scale.h" #include #include -#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" 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 0a95167634..6877fe8704 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/opclib/scatter_nd.h" +#include "src/runtime/kernel/arm/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 e3c6ce333f..25634db0b0 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/opclib/shape.h" +#include "src/runtime/kernel/arm/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 95dd93c4a2..91d02b5623 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/opclib/fp32/slice.h" +#include "src/runtime/kernel/arm/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 2eb8129d6d..ffdb5080e0 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/opclib/fp32/softmax.h" +#include "src/runtime/kernel/arm/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 431a445d95..5ac8d4db97 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/opclib/fp32/space_to_batch.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; @@ -70,7 +70,7 @@ int SpaceToBatchCPUKernel::Run() { } else { ret = SpaceToBatch(input_ptr_, output_ptr_, *param, tmp_space); } - if (ret != OPCLIB_OK) { + if (ret != NNACL_OK) { MS_LOG(ERROR) << "Do space to batch fails!"; return RET_OP_EXECUTE_FAILURE; } 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 fe253cda56..13aa702567 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/opclib/fp32/space_to_depth.h" +#include "src/runtime/kernel/arm/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_softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.cc index 005b091fb6..fec15c1e00 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.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_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.h b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.h index ae9a4dd0a9..a8dd3439cd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_softmax_cross_entropy_with_logits.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/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/opclib/fp32/softmax_grad.h" -#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/nnacl/fp32/softmax_grad.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" namespace mindspore::kernel { 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 352bba7cf1..359a379985 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/opclib/sparse_to_dense.h" +#include "src/runtime/kernel/arm/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 449408ba75..813e572979 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/opclib/sparse_to_dense.h" +#include "src/runtime/kernel/arm/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 eae295a8fc..81942f7a37 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/opclib/split.h" -#include "src/runtime/kernel/arm/opclib/split_parameter.h" +#include "src/runtime/kernel/arm/nnacl/split.h" +#include "src/runtime/kernel/arm/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 30cb56540a..fbc102eec0 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/opclib/squeeze.h" +#include "src/runtime/kernel/arm/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 293d220b0e..344e6762ca 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/opclib/fp32/stack.h" +#include "src/runtime/kernel/arm/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 b545780254..bc05c8b8ed 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/opclib/tile.h" +#include "src/runtime/kernel/arm/nnacl/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 d6906b2dc6..9ed7af2f39 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/opclib/fp32/topk.h" +#include "src/runtime/kernel/arm/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 9eca36125d..a6473114fa 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/opclib/transpose.h" +#include "src/runtime/kernel/arm/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 320c1bd0d6..349b1e63d3 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/opclib/unique.h" +#include "src/runtime/kernel/arm/nnacl/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 bf495be058..77e60e0f57 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/opclib/fp32/unsqueeze.h" +#include "src/runtime/kernel/arm/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 cbc9abdbdd..e652ad6adf 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/opclib/unstack.h" +#include "src/runtime/kernel/arm/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 8abb126233..f2bf03fc46 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/opclib/where.h" +#include "src/runtime/kernel/arm/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 02b1e1cffe..ad9c73a9fa 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/opclib/where.h" +#include "src/runtime/kernel/arm/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 c73ef7f8a3..6fcd25dc48 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/opclib/zeroslike.h" +#include "src/runtime/kernel/arm/nnacl/zeroslike.h" #include "src/kernel_registry.h" #include "include/errorcode.h" 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 4259a1995b..18bb5e80c6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/int8/add_int8.h" #include #include -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/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/add_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/add_int8.h index 2c0e69449a..b57aab2279 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/opclib/add_int8.h" +#include "src/runtime/kernel/arm/nnacl/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 0510c5fd45..03cae3aa86 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/opclib/int8/arg_min_max_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h" #include "include/errorcode.h" using mindspore::lite::RET_OK; 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 63e3938bc4..919acd2037 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/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/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 f9e3bbf959..a0f470467e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_int8.cc @@ -15,8 +15,8 @@ */ #include "src/runtime/kernel/arm/int8/arithmetic_int8.h" -#include "src/runtime/kernel/arm/opclib/int8/arithmetic_int8.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h" +#include "src/runtime/kernel/arm/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_self_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/arithmetic_self_int8.h index d2566e08fa..7dfe7d14ad 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/opclib/arithmetic_self_parameter.h" -#include "src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h" +#include "src/runtime/kernel/arm/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 12dcd76a84..bdf49bf14e 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/opclib/batch_to_space.h" -#include "src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.h" +#include "src/runtime/kernel/arm/nnacl/batch_to_space.h" +#include "src/runtime/kernel/arm/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/bias_add_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.cc index 3c0f0d3a6e..f80daade18 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/opclib/fp32/arithmetic.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" #include "src/kernel_registry.h" #include "include/errorcode.h" @@ -35,10 +35,10 @@ int BiasAddInt8CPUKernel::Init() { bias_param->out_shape_[i] = dims[i]; } bias_param->in_shape1_[3] = dims[3]; - return OPCLIB_OK; + return NNACL_OK; } -int BiasAddInt8CPUKernel::ReSize() { return OPCLIB_OK; } +int BiasAddInt8CPUKernel::ReSize() { return NNACL_OK; } int BiasAddInt8CPUKernel::Run() { auto in = reinterpret_cast(inputs_.at(0)->Data()); @@ -49,12 +49,12 @@ int BiasAddInt8CPUKernel::Run() { auto tile_bias = static_cast(ctx_->allocator->Malloc(data_size)); if (tile_in == nullptr || tile_bias == nullptr) { MS_LOG(ERROR) << "Failed to malloc momery"; - return OPCLIB_ERR; + return NNACL_ERR; } BroadcastAddInt8(in, bias, tile_in, tile_bias, out, data_size, reinterpret_cast(opParameter)); ctx_->allocator->Free(tile_in); ctx_->allocator->Free(tile_bias); - return OPCLIB_OK; + return NNACL_OK; } kernel::LiteKernel *CpuBiasAddInt8KernelCreator(const std::vector &inputs, 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 5be829958d..3ced965318 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/opclib/unique.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/unique.h" +#include "src/runtime/kernel/arm/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 ae284550e1..ea88847f16 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/concat_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/concat_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/concat_int8.h" -#include "src/runtime/kernel/arm/opclib/int8/concat_int8.h" +#include "src/runtime/kernel/arm/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 6240d7e01a..e3c9471514 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/opclib/int8/conv_int8.h" +#include "src/runtime/kernel/arm/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 555ed0522b..ef0a8a5560 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/opclib/winograd_transform.h" +#include "src/runtime/kernel/arm/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 0a68b1301c..87fa4e1690 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/opclib/int8/conv_depthwise_int8.h" +#include "src/runtime/kernel/arm/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 5e5f687006..e0ce121dad 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/opclib/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/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 1cc73c2c8b..00415cc542 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/opclib/int8/conv_int8.h" +#include "src/runtime/kernel/arm/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 cc264392ee..3250cfa112 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/opclib/optimized_kernel.h" -#include "src/runtime/kernel/arm/opclib/int8/conv_int8.h" +#include "src/runtime/kernel/arm/nnacl/optimized_kernel.h" +#include "src/runtime/kernel/arm/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 8ec38d849c..4e73001954 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/opclib/int8/crop_int8.h" +#include "src/runtime/kernel/arm/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 b2e59c7255..6de3c47211 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/opclib/int8/conv_depthwise_int8.h" +#include "src/runtime/kernel/arm/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 74f658b2d2..3e56264aae 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/opclib/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/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 cd69a8911c..f21c5bc1c4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/deconvolution_int8.h" -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" 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 ba73bafc52..b63633f9a5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h @@ -21,11 +21,11 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "src/runtime/kernel/arm/opclib/int8/deconv.h" -#include "src/runtime/kernel/arm/opclib/int8/matmul.h" +#include "src/runtime/kernel/arm/nnacl/int8/deconv.h" +#include "src/runtime/kernel/arm/nnacl/int8/matmul.h" #include "src/runtime/kernel/arm/base/layout_transform.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/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 ba6205780b..b70624aa18 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/opclib/depth_to_space.h" -#include "src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.h" +#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" +#include "src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h" #include "include/errorcode.h" using mindspore::lite::RET_OK; 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 8d58b9a8ac..a14438c815 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/opclib/int8/matmul.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" +#include "src/runtime/kernel/arm/nnacl/int8/matmul.h" +#include "src/runtime/kernel/arm/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 08c9673b71..30aef2d45f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/fullconnection_int8.h @@ -19,7 +19,7 @@ #include #include "include/context.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" #include "src/runtime/kernel/arm/base/fullconnection_base.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 8d69b92a40..7b5f9795eb 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/opclib/int8/hswish_int8.h" +#include "src/runtime/kernel/arm/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 ee5fcae8c9..b907f2c338 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/hswish_int8.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/opclib/int8/hswish_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/hswish_int8.h" namespace mindspore::kernel { class HswishInt8CPUKernel : public LiteKernel { 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 926d282679..5015fa0cea 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/opclib/int8/matmul.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" +#include "src/runtime/kernel/arm/nnacl/int8/matmul.h" +#include "src/runtime/kernel/arm/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 9081babe85..dc8f5ec0b6 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/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/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 d51751d33d..a9fd7c1378 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/opclib/arithmetic_common.h" -#include "src/runtime/kernel/arm/opclib/int8/mul_int8.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "src/runtime/kernel/arm/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 685327267b..7725591a06 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/opclib/mul_parameter.h" +#include "src/runtime/kernel/arm/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 f088d89289..3d9dda740b 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/opclib/pad_parameter.h" -#include "src/runtime/kernel/arm/opclib/int8/pad.h" +#include "src/runtime/kernel/arm/nnacl/pad_parameter.h" +#include "src/runtime/kernel/arm/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 f52e8aebdb..9a810d27f8 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/opclib/int8/pooling_int8.h" -#include "src/runtime/kernel/arm/opclib/fp32/cast.h" +#include "src/runtime/kernel/arm/nnacl/int8/pooling_int8.h" +#include "src/runtime/kernel/arm/nnacl/fp32/cast.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/relu_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/relu_int8.h index 1fa4146331..5f8f81a3a5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/relu_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/relu_int8.h @@ -19,8 +19,8 @@ #include #include "src/lite_kernel.h" -#include "src/runtime/kernel/arm/opclib/fp32/activation.h" -#include "src/runtime/kernel/arm/opclib/int8/relu_int8.h" +#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "src/runtime/kernel/arm/nnacl/int8/relu_int8.h" namespace mindspore::kernel { class ReluInt8CPUKernel : 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 52a46f9381..7969b89a78 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/reshape_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/reshape_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/reshape_int8.h" -#include "src/runtime/kernel/arm/opclib/int8/reshape_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/reshape_int8.h" #include "schema/model_generated.h" #include "include/errorcode.h" 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 a78a9bc500..2a3ef9d6ca 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/softmax_int8.h" -#include "src/runtime/kernel/arm/opclib/int8/softmax_int8.h" +#include "src/runtime/kernel/arm/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/split_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/split_int8.cc index 63a621f0dc..80f9cdf61c 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/opclib/split_parameter.h" -#include "src/runtime/kernel/arm/opclib/int8/split_int8.h" +#include "src/runtime/kernel/arm/nnacl/split_parameter.h" +#include "src/runtime/kernel/arm/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/topk_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/topk_int8.h index ab762c3c9d..1216033e9c 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/opclib/int8/topk_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/topk_int8.h" namespace mindspore::kernel { class TopKInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/CMakeLists.txt b/mindspore/lite/src/runtime/kernel/arm/nnacl/CMakeLists.txt similarity index 60% rename from mindspore/lite/src/runtime/kernel/arm/opclib/CMakeLists.txt rename to mindspore/lite/src/runtime/kernel/arm/nnacl/CMakeLists.txt index dc8e2dc410..9836fd3c8d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/CMakeLists.txt +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/CMakeLists.txt @@ -1,22 +1,22 @@ -project(optimize) +project(nnacl) -set(OPTIMIZED_OP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(LITE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../) -include_directories(OPTIMIZED_OP_DIR) +set(NNACL_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../..) +include_directories(NNACL_DIR) ########################### optimized files ########################### file(GLOB OPTIMIZED_ASSEMBLY - ${OPTIMIZED_OP_DIR}/assembly/opt/*.s - ${OPTIMIZED_OP_DIR}/assembly/opt/*.S + ${NNACL_DIR}/assembly/opt/*.s + ${NNACL_DIR}/assembly/opt/*.S ) file(GLOB FP16_SRC - ${OPTIMIZED_OP_DIR}/fp16/*.cc - ${OPTIMIZED_OP_DIR}/../fp16/*.cc + ${NNACL_DIR}/fp16/*.cc + ${NNACL_DIR}/../fp16/*.cc ) ########################### share library build ######################## -set(OPTIMIZED_OPS ${OPTIMIZED_OP_DIR}/opt_op_handler.c) +set(OPTIMIZED_OPS ${NNACL_DIR}/opt_op_handler.c) set_property(SOURCE ${OPTIMIZED_ASSEMBLY} PROPERTY LANGUAGE C) list(APPEND OPTIMIZED_OPS ${OPTIMIZED_ASSEMBLY} ${FP16_SRC}) @@ -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 - ${LITE_DIR}/build/src/runtime/kernel/arm/opclib/liboptimize.so) + ${TOP_DIR}/build/src/runtime/kernel/arm/nnacl/liboptimize.so) add_custom_command(TARGET optimize POST_BUILD - COMMAND rm -rf ${LITE_DIR}/output/lib/liboptimize.so - COMMAND mkdir -pv ${LITE_DIR}/output/lib - COMMAND cp ${LITE_DIR}/build/src/runtime/kernel/arm/opclib/liboptimize.so ${LITE_DIR}/output/lib) + 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) endif () diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/activation_grad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/opclib/activation_grad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.h index ac49b8567a..c0ebfc368a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/activation_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/activation_grad.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ACTIVATION_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ACTIVATION_GRAD_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_GRAD_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_GRAD_H_ #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" struct ActivationGradParameter { OpParameter op_parameter{}; @@ -32,7 +32,7 @@ inline int ReluGrad(float *src0, float *src1, int length, float *dst) { dst[i] = src1[i] > 0 ? 1.0f : 0.0f; } ElementMul(src0, dst, dst, length); - return OPCLIB_OK; + return NNACL_OK; } inline int Relu6Grad(float *src0, float *src1, int length, float *dst) { @@ -44,7 +44,7 @@ inline int Relu6Grad(float *src0, float *src1, int length, float *dst) { } } ElementMul(src0, dst, dst, length); - return OPCLIB_OK; + return NNACL_OK; } inline int LReluGrad(float *src0, float *src1, int length, float *dst, float alpha) { @@ -52,21 +52,21 @@ inline int LReluGrad(float *src0, float *src1, int length, float *dst, float alp dst[i] = src1[i] > 0.0f ? 1.0f : alpha; } ElementMul(src0, dst, dst, length); - return OPCLIB_OK; + return NNACL_OK; } inline int SigmoidGrad(float *src0, float *src1, int length, float *dst) { for (int i = 0; i < length; ++i) { dst[i] = src0[i] * (src1[i] * (1.0f - src1[i])); } - return OPCLIB_OK; + return NNACL_OK; } inline int TanhGrad(float *src0, float *src1, int length, float *dst) { for (int i = 0; i < length; ++i) { dst[i] = (1.0f - (src1[i] * src1[i])) * src0[i]; } - return OPCLIB_OK; + return NNACL_OK; } inline int HSwishGrad(float *src0, float *src1, int length, float *dst) { @@ -74,7 +74,7 @@ inline int HSwishGrad(float *src0, float *src1, int length, float *dst) { float tmp = (src1[i] > 3.0f ? 1.0f : (src1[i] < -3.0f ? 0.0f : (2.0f * src1[i] + 3.0f) / 6.0f)); dst[i] = tmp * src0[i]; } - return OPCLIB_OK; + return NNACL_OK; } inline int HSigmoidGrad(float *src0, float *src1, int length, float *dst) { @@ -82,7 +82,7 @@ inline int HSigmoidGrad(float *src0, float *src1, int length, float *dst) { float tmp = (src1[i] > 3.0f ? 1.0f : (src1[i] < -3.0f ? 0.0f : 1.0f / 6.0f)); dst[i] = tmp * src0[i]; } - return OPCLIB_OK; + return NNACL_OK; } -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ACTIVATION_GRAD_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/add_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/add_int8.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/add_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/add_int8.cc index 870af87a5d..a11e76f77c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/add_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/add_int8.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/add_int8.h" +#include "src/runtime/kernel/arm/nnacl/add_int8.h" #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" #ifdef ENABLE_NEON int16x8_t LoadAndAddOffset(int8_t *data, int index, int offset) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/add_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/add_int8.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/opclib/add_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/add_int8.h index b947e76285..ee667f1713 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/add_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/add_int8.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ADD_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ADD_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ADD_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ADD_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct AddQuantParameter { int input0_offset_; @@ -50,5 +50,5 @@ void AddInt8(int8_t *input0_data, int8_t *input1_data, int8_t *output_data, int6 int16x8_t LoadAndAddOffset(int8_t *data, int index, int offset); #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ADD_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ADD_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.cc index 816aef4c1b..fd1a6f7c72 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/arg_min_max.h" -#include "src/runtime/kernel/arm/opclib/fp32/arg_min_max.h" +#include "src/runtime/kernel/arm/nnacl/arg_min_max.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h" #define FLOAT_DATA_TYPE 43 diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h similarity index 64% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h index 91580106aa..a308f65c51 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max.h @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARG_MIN_MAX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARG_MIN_MAX_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/arg_min_max_parameter.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" void ArgMinMax(const void *input, void *output, const int *in_shape, ArgMinMaxParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARG_MIN_MAX_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h index e339adcbf4..c403f2a7c5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARG_MIN_MAX_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARG_MIN_MAX_PARAMETER_H_ +#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_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ArgElement { uint32_t index_; @@ -43,4 +43,4 @@ struct ArgMinMaxParameter { ArgElement *arg_elements_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARG_MIN_MAX_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARG_MIN_MAX_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.cc index a39b894232..b136fd8d42 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" void TileOneDimension(float *inData, float *outData, int dim, size_t ndim, int *inShape, int *inStrides, int *outStrides, int *multiple) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h index 57ac591572..dc9f3d48f7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_COMMON_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_COMMON_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_COMMON_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_COMMON_H_ #ifdef ENABLE_NEON #include #endif #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" struct ArithmeticParameter { OpParameter op_parameter_; @@ -48,5 +48,5 @@ void TileDimensionsUint8(uint8_t *data0, uint8_t *data1, uint8_t *tile_data0, ui void TileDimensionsInt8(int8_t *data0, int8_t *data1, int8_t *tile_data0, int8_t *tile_data1, ArithmeticParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_COMMON_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_COMMON_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_parameter.h similarity index 67% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_parameter.h index af48c7c5c8..132ad4a0ab 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_parameter.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARTITHMETIC_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARTITHMETIC_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_attribute.h" +#include "src/runtime/kernel/arm/nnacl/op_attribute.h" -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARTITHMETIC_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARTITHMETIC_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h similarity index 68% rename from mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h index 98fbe698a7..35669c5518 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_self_parameter.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_SELF_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_SELF_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" // For Abs, Cos, Exp, Log, Square, Sqrt, Rsqrt ops. struct ArithmeticSelfParameter { @@ -26,4 +26,4 @@ struct ArithmeticSelfParameter { ArithSelfQuantArg quant_arg_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_SELF_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/ConvDwFp32Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/ConvDwFp32Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/ConvDwInt8Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/ConvDwInt8Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/ConvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/DeconvDwFp32Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/DeconvDwFp32Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/DeconvDwInt8Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/DeconvDwInt8Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/DeconvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/IndirectGemmFp32_8x4.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmFp32_8x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/IndirectGemmFp32_8x4.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmFp32_8x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/IndirectGemmInt16to32_8x4.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/IndirectGemmInt16to32_8x4.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/IndirectGemmInt8_2x4.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm32/IndirectGemmInt8_2x4.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4BiasAdd.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAdd.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4BiasAdd.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAdd.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4BiasAddRelu.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4BiasAddRelu.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4BiasAddRelu6.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4BiasAddRelu6.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4BiasAddRelu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4Relu.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4Relu.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4Relu6.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/C4Relu6.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/C4Relu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/ConvDwFp32Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/ConvDwFp32Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/ConvDwInt8Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/ConvDwInt8Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/ConvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/DeconvDwFp32Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwFp32Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/DeconvDwFp32Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwFp32Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/DeconvDwInt8Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwInt8Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/DeconvDwInt8Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/DeconvDwInt8Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/IndirectGemmFp32_8x8.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmFp32_8x8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/IndirectGemmFp32_8x8.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmFp32_8x8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/IndirectGemmInt16to32_8x4.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/IndirectGemmInt16to32_8x4.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/IndirectGemmInt8_4x4.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt8_4x4.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/IndirectGemmInt8_4x4.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/IndirectGemmInt8_4x4.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/bias_add.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/bias_add.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/bias_add_relu.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/bias_add_relu.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/bias_add_relu6.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/bias_add_relu6.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/bias_add_relu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/matmul.s b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matmul.s similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/matmul.s rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matmul.s diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/matrix_add.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_add.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/matrix_add.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_add.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/matrix_sub.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_sub.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/matrix_sub.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/matrix_sub.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/relu.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/relu.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/relu6.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu6.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/arm64/relu6.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/arm64/relu6.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/ConvDwFp16Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/ConvDwFp16Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/ConvDwFp16Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/ConvDwFp16Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/DeconvDwFp16Center.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/DeconvDwFp16Center.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/DeconvDwFp16Center.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/DeconvDwFp16Center.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/IndirectGemmFp16_16x8.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmFp16_16x8.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/IndirectGemmFp16_16x8.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmFp16_16x8.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/IndirectGemmInt8_24x4_dp.S b/mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmInt8_24x4_dp.S similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/assembly/opt/IndirectGemmInt8_24x4_dp.S rename to mindspore/lite/src/runtime/kernel/arm/nnacl/assembly/opt/IndirectGemmInt8_24x4_dp.S diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_norm.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_norm.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/batch_norm.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/batch_norm.cc index c11819a1d9..bbe4dc1f3c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_norm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_norm.cc @@ -15,7 +15,7 @@ */ #include #include -#include "src/runtime/kernel/arm/opclib/batch_norm.h" +#include "src/runtime/kernel/arm/nnacl/batch_norm.h" static void sumSpatialBatch(const float *in, int size, int ch, float *out) { std::fill(out, out + ch, 0.f); diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_norm.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_norm.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/batch_norm.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/batch_norm.h diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_to_space.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/opclib/batch_to_space.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.cc index 5c69d98052..e114f59cbf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_to_space.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/batch_to_space.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/batch_to_space.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" void BatchToSpaceNoCropForNHWC(const void *input, void *output, const int *in_shape, int out_n, const int *block, int data_size) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_to_space.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/batch_to_space.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h index cbd1a41e87..0cee0f071b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/batch_to_space.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_BATCH_TO_SPACE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_BATCH_TO_SPACE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCH_TO_SPACE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_BATCH_TO_SPACE_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define BATCH_TO_SPACE_BLOCK_SHAPE_SIZE 2 #define BATCH_TO_SPACE_CROPS_SIZE 4 @@ -30,4 +30,4 @@ void BatchToSpaceNoCropForNHWC(const void *input, void *output, const int *in_sh int data_size); void BatchToSpaceForNHWC(const void *input, void *output, const int *in_shape, int out_n, const int *block, const int *crops, int data_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_BATCH_TO_SPACE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCH_TO_SPACE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/common_func.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/common_func.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.cc index a32e0f52c8..7e83fded24 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/common_func.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/common_func.h" -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" #ifndef ENABLE_ARM64 void IndirectGemmFp32(float *output, const float *input, const float *weight, const float *bias, size_t step, int ic4, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/common_func.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h similarity index 90% rename from mindspore/lite/src/runtime/kernel/arm/opclib/common_func.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h index f35d158dfb..82daa49f25 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/common_func.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/common_func.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_COMMON_FUNC_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_COMMON_FUNC_H_ #include #include #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #ifdef __cplusplus extern "C" { @@ -68,4 +68,4 @@ void Relu(float *data, size_t element4); } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/concat_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/concat_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h index 55a6dd0e3c..5b998a4d2d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/concat_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/concat_parameter.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CONCAT_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CONCAT_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONCAT_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONCAT_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ConcatParameter { OpParameter op_parameter_; ConcatQuantArg *concat_quant_arg_; @@ -25,5 +25,5 @@ struct ConcatParameter { int thread_count_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CONCAT_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONCAT_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/conv_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/conv_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h index 9ac4c95ce0..8a4d0ef843 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/conv_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/conv_parameter.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CONV_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CONV_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONV_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONV_PARAMETER_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" struct ConvParameter { OpParameter op_parameter_; @@ -55,5 +55,5 @@ struct ConvParameter { bool is_relu6_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CONV_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CONV_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/crop_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/crop_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h index 16dece28cb..93907046d1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/crop_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/crop_parameter.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CROP_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CROP_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CROP_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CROP_PARAMETER_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define CROP_OFFSET_MAX_SIZE 4 @@ -34,4 +34,4 @@ struct CropParameter { int input_dim_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CROP_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CROP_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.cc index ab890566d5..6ded162136 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/depth_to_space.h" +#include "src/runtime/kernel/arm/nnacl/depth_to_space.h" #include void DepthToSpaceForNHWC(const void *input, void *output, int *in_shape, DepthToSpaceParameter *param) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h similarity index 71% rename from mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h index d2b282b967..88ae21c840 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_DEPTH_TO_SPACE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_DEPTH_TO_SPACE_H_ -#include "src/runtime/kernel/arm/opclib/depth_to_space_parameter.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_H_ +#include "src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h" void DepthToSpaceForNHWC(const void *input, void *output, int *in_shape, DepthToSpaceParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_DEPTH_TO_SPACE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h index 9d4e0e5065..0a44d45dba 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/depth_to_space_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_DEPTH_TO_SPACE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_DEPTH_TO_SPACE_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#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_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct DepthToSpaceParameter { OpParameter op_parameter_; @@ -29,4 +29,4 @@ struct DepthToSpaceParameter { uint8_t data_type_size_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_DEPTH_TO_SPACE_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_DEPTH_TO_SPACE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h new file mode 100644 index 0000000000..8c74dcbf39 --- /dev/null +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/errorcode.h @@ -0,0 +1,47 @@ +/** + * 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_ERRORCODE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ERRORCODE_H_ + +enum ErrorCodeCommonEnum { + NNACL_OK = 0, + NNACL_ERR = 1, + NNACL_NULL_PTR, + NNACL_PARAM_INVALID, + OPLIB_COMMON_END = 9999 +}; + +enum ErrorCodeFp32OpEnum { + NNACL_ERRCODE_OP_FP32_START = 10000, + NNACL_ERRCODE_STRASSEN_RECURSION_MALLOC, + NNACL_ERRCODE_REVERSE_MALLOC, + NNACL_ERRCODE_SQRT_NEGATIVE, + NNACL_ERRCODE_RSQRT_NEGATIVE_OR_ZERO, + NNACL_ERRCODE_LOG_NEGATIVE_OR_ZERO, + NNACL_ERRCODE_DIVISOR_ZERO, + NNACL_ERRCODE_INDEX_OUT_OF_RANGE, + NNACL_ERRCODE_OP_FP32_END = 19999 +}; + +enum ErrorCodeFp16OpEnum { NNACL_ERRCODE_OP_FP16_START = 20000, NNACL_ERRCODE_OP_FP16_END = 29999 }; + +enum ErrorCodeUint8OpEnum { NNACL_ERRCODE_OP_UINT8_START = 30000, NNACL_ERRCODE_OP_UINT8_END = 39999 }; + +enum ErrorCodeInt8OpEnum { NNACL_ERRCODE_OP_INT8_START = 40000, NNACL_ERRCODE_OP_INT8_END = 49999 }; + +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ERRORCODE_H_ + diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/flatten.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/flatten.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.cc index a78c0397d9..2ca6ad285e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/flatten.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/flatten.h" +#include "src/runtime/kernel/arm/nnacl/flatten.h" #include void Flatten(const void *input, void *output, FlattenParameter *flatten_param) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/flatten.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/flatten.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.h index fa8267b559..feb9c0641c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/flatten.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/flatten.h @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FLATTEN_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FLATTEN_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FLATTEN_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FLATTEN_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct FlattenParameter { OpParameter op_parameter_; @@ -23,5 +23,5 @@ struct FlattenParameter { }; void Flatten(const void *input, void *output, FlattenParameter *flatten_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FLATTEN_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FLATTEN_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/common_func.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/common_func.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.h index 30383c90ad..ba0c7a35b8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/common_func.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/common_func.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_COMMON_FUNC_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_COMMON_FUNC_H_ #include #include #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #ifdef __cplusplus extern "C" { @@ -41,4 +41,4 @@ void DeconvDwFp16Center(float16_t *dst, const float16_t *src, const float16_t *w } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.cc index e038ab24ce..254bbaf115 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h" #include -#include "src/runtime/kernel/arm/opclib/fp16/common_func.h" +#include "src/runtime/kernel/arm/nnacl/fp16/common_func.h" /*conv depthwise fp16 begin*/ void DepthwiseBorderPixelFp16(float16_t *dst, const float16_t *src, const float16_t *weight, const float16_t *bias, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h index e686df1f08..dec8c48eeb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_depthwise_fp16.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_CONV_DEPTHWISE_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_CONV_DEPTHWISE_FP16_H_ +#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_ -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" void ConvDwC8Fp16(float16_t *output_data, const float16_t *input_data, const float16_t *weight_data, const float16_t *bias_data, const ConvParameter *conv_param, const SlidingWindowParam *sliding, @@ -28,4 +28,4 @@ void DeconvDwC8Fp16(float16_t *output_data, const float16_t *input_data, const f const float16_t *bias_data, const ConvParameter *conv_param, const SlidingWindowParam *sliding, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_CONV_DEPTHWISE_FP16_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_fp16.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.cc index 6f4291433e..8bd1e2f023 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp16/conv_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" #include -#include "src/runtime/kernel/arm/opclib/fp16/pack_fp16.h" -#include "src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h" extern "C" { #ifdef ENABLE_ARM64 diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_fp16.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_fp16.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h index a5426dd6f9..c28ffbdd30 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/conv_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_CONV_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_CONV_FP16_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_FP16_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_FP16_H_ #include -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #ifndef ENABLE_NEON void IndirectGemmFp16_16x8(float16_t *output, float16_t *input, float16_t *weight, float16_t *bias, size_t step, @@ -34,5 +34,5 @@ void Conv3x3Fp16(float16_t *input_data, float16_t *transed_weight, const float16 float16_t *tile_buffer, float16_t *block_unit_buffer, float16_t *tmp_dst_buffer, float16_t *tmp_out, int task_id, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_CONV_FP16_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_CONV_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/pack_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/pack_fp16.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.cc index 0e14c2cb4d..2d2f7a93cc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/pack_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp16/pack_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" #include #include diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/pack_fp16.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h similarity index 86% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/pack_fp16.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h index 2aa5754811..a4ac6201d1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/pack_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_PACK_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_PACK_FP16_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_PACK_FP16_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_PACK_FP16_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Im2ColPackUnitFp16(float16_t *input_data, ConvParameter *conv_param, float16_t *packed_input, int real_cal_num, int block_index); @@ -54,4 +54,4 @@ void PackNHWCFp32ToNHWC8Fp16(float *src, float16_t *dst, int batch, int plane, i void PackNHWC8Fp16ToNHWCFp32(float16_t *src, float *dst, int batch, int plane, int channel); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_PACK_FP16_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_PACK_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.cc index 78ec163103..e585509825 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h" // for fp16 convolution 3x3 filter/input/output transform F(4,3) void Conv3x3Fp16InputUnit(float16_t *tmp_data, float16_t *trans_input_data, size_t step) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h index 3e94d46e3f..235b9979c0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp16/winograd_transform_fp16.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp16/winograd_transform_fp16.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_WINOGRAD_TRANSFORM_FP16_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_WINOGRAD_TRANSFORM_FP16_H_ +#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_ #include #include -#include "src/runtime/kernel/arm/opclib/fp16/pack_fp16.h" -#include "src/runtime/kernel/arm/opclib/fp16/conv_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/pack_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" // for fp16 convolution 3x3 filter/input/output transform void Conv3x3Fp16InputUnit(float16_t *tmp_data, float16_t *trans_input_data, size_t step); @@ -36,4 +36,4 @@ void Conv3x3Fp16OutputUnit(const float16_t *gemm_out, const float16_t *bias_data void Conv3x3Fp16OutputTransform(const float16_t *gemm_out, float16_t *out_data, const float16_t *bias_data, int start_index, int real_cal_num, int out_w_block, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP16_WINOGRAD_TRANSFORM_FP16_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP16_WINOGRAD_TRANSFORM_FP16_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/activation.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/activation.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h index 5579c15948..419dc20f5b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/activation.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/activation.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ACTIVATION_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ACTIVATION_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_H_ #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" struct ActivationParameter { OpParameter op_parameter_; @@ -31,7 +31,7 @@ inline int Relu(const float *src, int length, float *dst) { for (int i = 0; i < length; ++i) { dst[i] = src[i] > 0 ? src[i] : 0; } - return OPCLIB_OK; + return NNACL_OK; } inline int Relu6(const float *src, int length, float *dst) { @@ -42,28 +42,28 @@ inline int Relu6(const float *src, int length, float *dst) { dst[i] = src[i] > 6.0f ? 6.0f : src[i]; } } - return OPCLIB_OK; + return NNACL_OK; } inline int LRelu(const float *src, int length, float *dst, float alpha) { for (int i = 0; i < length; ++i) { dst[i] = src[i] > (src[i] * alpha) ? src[i] : (src[i] * alpha); } - return OPCLIB_OK; + return NNACL_OK; } inline int Sigmoid(const float *src, int length, float *dst) { for (int i = 0; i < length; ++i) { dst[i] = 1.0f / (1.0f + exp(-src[i])); } - return OPCLIB_OK; + return NNACL_OK; } inline int Tanh(const float *src, int length, float *dst) { for (int i = 0; i < length; ++i) { dst[i] = 1.0f - 2.0f / (exp(2 * src[i]) + 1); } - return OPCLIB_OK; + return NNACL_OK; } inline int HSwish(const float *src, int length, float *dst) { @@ -72,7 +72,7 @@ inline int HSwish(const float *src, int length, float *dst) { float relu6 = MSMIN(MSMAX(in + 3, 0), 6); dst[i] = in * relu6 / 6; } - return OPCLIB_OK; + return NNACL_OK; } -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ACTIVATION_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ACTIVATION_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arg_min_max.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arg_min_max.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.cc index df7446b47d..2b592dc574 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arg_min_max.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/arg_min_max.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h" #include #include diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arg_min_max.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arg_min_max.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h index 78391b8d27..8812459de2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arg_min_max.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arg_min_max.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ARG_MIN_MAX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ARG_MIN_MAX_H_ +#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_ -#include "src/runtime/kernel/arm/opclib/arg_min_max_parameter.h" +#include "src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h" void ArgMax(const float *input, float *output, ArgMinMaxParameter *param, int pre_axis_count, int axis_count, int after_axis_count); @@ -30,4 +30,4 @@ void ArgMaxDim2(const float *input, float *output, const int *in_shape, ArgMinMa void ArgMinDim2(const float *input, float *output, const int *in_shape, ArgMinMaxParameter *param); void ArgMaxDim3(const float *input, float *output, const int *in_shape, ArgMinMaxParameter *param); void ArgMinDim3(const float *input, float *output, const int *in_shape, ArgMinMaxParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ARG_MIN_MAX_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARG_MIN_MAX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.cc index e7dcbb32b9..285f5c8684 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" int ElementMul(float *input0, float *input1, float *output, int element_size) { int block_mod = element_size % C4NUM; @@ -40,7 +40,7 @@ int ElementMul(float *input0, float *input1, float *output, int element_size) { output[index] = input0[index] * input1[index]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastMul(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, @@ -72,14 +72,14 @@ int ElementAdd(float *input0, float *input1, float *output, int element_size) { for (int index = 0; index < block_mod; ++index) { output[index] = input0[index] + input1[index]; } - return OPCLIB_OK; + return NNACL_OK; } int ElementAddInt8(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = input0[i] + input1[i]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastAdd(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, @@ -117,7 +117,7 @@ int ElementSub(float *input0, float *input1, float *output, int element_size) { for (int index = 0; index < block_mod; ++index) { output[index] = input0[index] - input1[index]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastSub(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, @@ -130,11 +130,11 @@ int BroadcastSub(float *input0, float *input1, float *tile_input0, float *tile_i int ElementDiv(float *input0, float *input1, float *output, int element_size) { for (int i = 0; i < element_size; i++) { if (input1[i] == 0) { - return OPCLIB_ERRCODE_DIVISOR_ZERO; + return NNACL_ERRCODE_DIVISOR_ZERO; } output[i] = input0[i] / input1[i]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastDiv(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, @@ -146,11 +146,11 @@ int BroadcastDiv(float *input0, float *input1, float *tile_input0, float *tile_i int ElementFloorMod(float *input0, float *input1, float *output, int element_size) { for (int i = 0; i < element_size; i++) { if (input1[i] == 0) { - return OPCLIB_ERRCODE_DIVISOR_ZERO; + return NNACL_ERRCODE_DIVISOR_ZERO; } output[i] = input0[i] - floorf(input0[i] / input1[i]) * input1[i]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastFloorMod(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -162,11 +162,11 @@ int BroadcastFloorMod(float *input0, float *input1, float *tile_input0, float *t int ElementFloorDiv(float *input0, float *input1, float *output, int element_size) { for (int i = 0; i < element_size; i++) { if (input1[i] == 0) { - return OPCLIB_ERRCODE_DIVISOR_ZERO; + return NNACL_ERRCODE_DIVISOR_ZERO; } output[i] = floorf(input0[i] / input1[i]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastFloorDiv(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -198,7 +198,7 @@ int ElementLogicalAnd(float *input0, float *input1, float *output, int element_s for (int index = 0; index < block_mod; ++index) { output[index] = (float)((bool)(input0[index]) & (bool)(input1[index])); } - return OPCLIB_OK; + return NNACL_OK; } int ElementSquaredDifference(float *input0, float *input1, float *output, int element_size) { @@ -241,7 +241,7 @@ int ElementLogicalOr(float *input0, float *input1, float *output, int element_si for (int index = 0; index < block_mod; ++index) { output[index] = (float)((bool)(input0[index]) | (bool)(input1[index])); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastLogicalOr(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -273,7 +273,7 @@ int ElementMaximum(float *input0, float *input1, float *output, int element_size for (int index = 0; index < block_mod; ++index) { output[index] = input0[index] > input1[index] ? input0[index] : input1[index]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastMaximum(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -305,7 +305,7 @@ int ElementMinimum(float *input0, float *input1, float *output, int element_size for (int index = 0; index < block_mod; ++index) { output[index] = input0[index] > input1[index] ? input1[index] : input0[index]; } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastMinimum(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -340,7 +340,7 @@ int ElementNotEqual(float *input0, float *input1, float *output, int element_siz for (int index = 0; index < block_mod; ++index) { output[index] = (float)(input0[index] != input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastNotEqual(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -375,7 +375,7 @@ int ElementEqual(float *input0, float *input1, float *output, int element_size) for (int index = 0; index < block_mod; ++index) { output[index] = (float)(input0[index] == input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastEqual(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -410,7 +410,7 @@ int ElementLess(float *input0, float *input1, float *output, int element_size) { for (int index = 0; index < block_mod; ++index) { output[index] = (float)(input0[index] < input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastLess(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, @@ -445,7 +445,7 @@ int ElementLessEqual(float *input0, float *input1, float *output, int element_si for (int index = 0; index < block_mod; ++index) { output[index] = (float)(input0[index] <= input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastLessEqual(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -480,7 +480,7 @@ int ElementGreater(float *input0, float *input1, float *output, int element_size for (int index = 0; index < block_mod; ++index) { output[index] = (float)(input0[index] > input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastGreater(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, @@ -515,7 +515,7 @@ int ElementGreaterEqual(float *input0, float *input1, float *output, int element for (int index = 0; index < block_mod; ++index) { output[index] = (float)(input0[index] >= input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int BroadcastGreaterEqual(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h index 6788334803..b3a57f83e9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic.h @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int ElementMul(float *input0, float *input1, float *output, int element_size); int BroadcastMul(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, @@ -94,5 +94,5 @@ int BroadcastGreater(float *input0, float *input1, float *tile_input0, float *ti int ElementGreaterEqual(float *input0, float *input1, float *output, int element_size); int BroadcastGreaterEqual(float *input0, float *input1, float *tile_input0, float *tile_input1, float *output, int element_size, ArithmeticParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.cc similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.cc index 4baec49d02..f13dc824f8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.h" void ElementDivNegSquare(const float *nom, const float *denom, float *output, int element_size) { for (int i = 0; i < element_size; i++) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.h index 5ce96e669b..9994b4d66d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_grad.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ARITHMETIC_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ARITHMETIC_GRAD_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARITHMETIC_GRAD_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARITHMETIC_GRAD_H_ void ElementDivNegSquare(const float *nom, const float *denom, float *output, int element_size); void ElementMulAndDivNegSquare(const float *a, const float *b, const float *denom, float *output, int element_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ARITHMETIC_GRAD_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ARITHMETIC_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_self.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.cc similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_self.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.cc index 86ce36d09b..6bb22ad021 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_self.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.cc @@ -16,14 +16,14 @@ #include #include -#include "src/runtime/kernel/arm/opclib/fp32/arithmetic_self.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h" // abs: int ElementAbs(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = fabsf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // cos: @@ -31,7 +31,7 @@ int ElementCos(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = cosf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // exp: @@ -39,18 +39,18 @@ int ElementExp(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = expf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // log: int ElementLog(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { if (input[i] <= 0) { - return OPCLIB_ERRCODE_LOG_NEGATIVE_OR_ZERO; + return NNACL_ERRCODE_LOG_NEGATIVE_OR_ZERO; } output[i] = logf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // Square @@ -58,29 +58,29 @@ int ElementSquare(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = input[i] * input[i]; } - return OPCLIB_OK; + return NNACL_OK; } // Sqrt int ElementSqrt(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { if (input[i] < 0) { - return OPCLIB_ERRCODE_SQRT_NEGATIVE; + return NNACL_ERRCODE_SQRT_NEGATIVE; } output[i] = sqrtf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // rsqrt int ElementRsqrt(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { if (input[i] <= 0) { - return OPCLIB_ERRCODE_RSQRT_NEGATIVE_OR_ZERO; + return NNACL_ERRCODE_RSQRT_NEGATIVE_OR_ZERO; } output[i] = 1.f / sqrtf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // sin: @@ -88,7 +88,7 @@ int ElementSin(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = sinf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // logical_not: @@ -96,7 +96,7 @@ int ElementLogicalNot(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = (float)(!((bool)(input[i]))); } - return OPCLIB_OK; + return NNACL_OK; } // round: @@ -104,7 +104,7 @@ int ElementRound(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = round(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } // floor: @@ -112,12 +112,12 @@ int ElementFloor(float *input, float *output, int element_size) { for (int i = 0; i < element_size; i++) { output[i] = floorf(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } int ElementCeil(float *input, float *output, int number) { for (int i = 0; i < number; ++i) { output[i] = ceil(input[i]); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_self.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_self.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h index 9e2d65dcdd..62ad6d3cf9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/arithmetic_self.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/arithmetic_self.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_SELF_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_SELF_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int ElementAbs(float *input, float *output, int element_size); @@ -47,5 +47,5 @@ int ElementFloor(float *input, float *output, int element_size); int ElementCeil(float *input, float *output, int number); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ARITHMETIC_SELF_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ARITHMETIC_SELF_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.cc similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.cc index 57430f7c3e..e61d5ea596 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/batchnorm.h" +#include "src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" void BatchNorm(const float *input_ptr, const float *mean_ptr, const float *variance_ptr, int units, int channel, float epsilon, float *output_ptr) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h index ae3feb174c..135f7a73e0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_BATCHNORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_BATCHNORM_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCHNORM_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BATCHNORM_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct BatchNormParameter { OpParameter op_parameter_; @@ -27,4 +27,4 @@ struct BatchNormParameter { void BatchNorm(const float *input_ptr, const float *mean_ptr, const float *variance_ptr, int count, int channel, float epsilon, float *output_ptr); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FUSED_BATCHNORM_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FUSED_BATCHNORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/broadcast_to.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/broadcast_to.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.cc index 747b286f02..b16bb3a9c6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/broadcast_to.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/broadcast_to.h" +#include "src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h" #include -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void PadBroadcastShapeInfo(BroadcastShapeInfo *shape_info) { if (shape_info->input_shape_size_ < DIMENSION_4D) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/broadcast_to.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/broadcast_to.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h index a2ea23bfbb..281cfaaa0d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/broadcast_to.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/broadcast_to.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_BROADCAST_TO_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_BROADCAST_TO_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BROADCAST_TO_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BROADCAST_TO_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define BROADCAST_TO_SHAPE_MAX_SIZE 4 @@ -37,5 +37,5 @@ struct BroadcastShapeInfo { }; int BroadcastTo(const float *input, BroadcastShapeInfo *shape_info, float *output); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_BROADCAST_TO_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_BROADCAST_TO_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/cast.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/cast.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.cc index d379200c8f..4582e31474 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/cast.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/cast.h" +#include "src/runtime/kernel/arm/nnacl/fp32/cast.h" void Uint8ToFloat32(const uint8_t *input, float *output, int number) { for (int i = 0; i < number; ++i) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/cast.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/cast.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.h index 70135ee8fd..616e0b89fa 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/cast.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/cast.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CAST_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CAST_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" // For cast. struct CastParameter { @@ -36,5 +36,5 @@ void Int32ToFloat32(const int32_t *input, float *output, int number); void Float32ToFloat16(const float *input, float16_t *output, int number); void Float16ToFloat32(const float16_t *input, float *output, int number); #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_CAST_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_CAST_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/common_func.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/common_func.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.cc index f100402b0f..f50036bf3c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/common_func.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/common_func.h" +#include "src/runtime/kernel/arm/nnacl/fp32/common_func.h" #ifndef __aarch64__ void MatrixAdd(const float *a_ptr, const float *b_ptr, float *dst, size_t a_stride, size_t b_stride, size_t c_stride, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/common_func.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.h similarity index 90% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/common_func.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.h index 1c1f454caf..3802a82cf2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/common_func.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/common_func.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ #include #include #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #ifdef __cplusplus extern "C" { @@ -64,4 +64,4 @@ void C4Relu6(float *dst, const float *input, size_t oc, size_t plane_size, size_ } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/concat.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/concat.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.cc index c410a96cba..8c50292552 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/concat.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/concat.h" +#include "src/runtime/kernel/arm/nnacl/fp32/concat.h" #include void Concat(void **input, int input_num, int axis, int **inputs_output_shape, size_t shape_size, void *output) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/concat.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/concat.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.h index e8ed2690ee..a692fdc1cb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/concat.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/concat.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONCAT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONCAT_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONCAT_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONCAT_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Concat(void **input, int input_num, int axis, int **inputs_output_shape, size_t shape_size, void *output); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONCAT_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONCAT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.cc index 2f994ebe31..624ffd7565 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/conv.h" +#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" #include -#include "src/runtime/kernel/arm/opclib/winograd_transform.h" +#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" // fp32 conv common void ConvFp32(float *input_data, float *packed_input, float *packed_weight, const float *bias_data, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.h index 3a4a97791e..97a2b08e70 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv.h @@ -14,18 +14,18 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONV_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONV_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/pack.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h" -#include "src/runtime/kernel/arm/opclib/winograd_utils.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h" +#include "src/runtime/kernel/arm/nnacl/winograd_utils.h" using TmpBufferAddress = float *; typedef void (*GEMM_FUNC_FP32)(float *output, const float *input, const float *weight, const float *bias, size_t step, @@ -53,4 +53,4 @@ void UnPackWinogradOutput(const float *src, float *dst, int batch, int height, i void Conv3x3Fp32(float *input_data, float *transed_weight, const float *bias_data, float *output_data, TmpBufferAddress *buffer_list, int task_id, ConvParameter *conv_param, GEMM_FUNC_FP32 gemm_func); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONV_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv_depthwise.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv_depthwise.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.cc index 8e706605ee..638abeb2fb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv_depthwise.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h" -#include "src/runtime/kernel/arm/opclib/fp32/common_func.h" +#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/nnacl/fp32/common_func.h" #ifdef ENABLE_ARM64 #include #endif diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h index bdb8e2f0ac..8ab5332f19 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONV_DEPTHWISE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONV_DEPTHWISE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_DEPTHWISE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_DEPTHWISE_H_ -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" struct SlidingWindowParam { int left_; @@ -45,5 +45,5 @@ void ConvDwC4Fp32(float *output_data, const float *input_data, const float *weig void DeconvDwC4Fp32(float *output_data, const float *input_data, const float *weight_data, const float *bias_data, const ConvParameter *conv_param, const SlidingWindowParam *sliding, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CONV_DEPTHWISE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CONV_DEPTHWISE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/crop.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/crop.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.cc index 340c8eed2c..4336b10af8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/crop.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/crop.h" +#include "src/runtime/kernel/arm/nnacl/fp32/crop.h" #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/crop_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/crop_parameter.h" void Pad4DOffset(CropParameter *crop_param, int64_t *offset) { int axis = crop_param->axis_; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/crop.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/crop.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h index b50779b151..c728f8aee9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/crop.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CROP_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CROP_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/crop_parameter.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CROP_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CROP_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/crop_parameter.h" #define CROP_OFFSET_MAX_SIZE 4 void Crop4D(const float *input, float *output, const int *in_shape, const int *out_shape, CropParameter *crop_param); void Crop4DNoParallel(const float *input, float *output, const int *in_shape, const int *out_shape, CropParameter *crop_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_CROP_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_CROP_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.cc index 1a5bf53efe..16a43f94ec 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/deconv.h" +#include "src/runtime/kernel/arm/nnacl/fp32/deconv.h" void PackDeConvWeightFp32(const float *weight, float *dst, int input_channel, int output_channel, int plane) { /* ichwoc(nhwc) -> oc4 * h * w * incUP4 * 4 */ @@ -79,7 +79,7 @@ int DeConvPostFp32C8x8(const float *src, float *tmp, const float *bias, float *d PostConvFuncFp32C8(tmp, dst, bias, output_channel, output_plane, conv_param->output_channel_, conv_param->is_relu_, conv_param->is_relu6_); - return OPCLIB_OK; + return NNACL_OK; } int DeConvPostFp32C4(const float *src, float *tmp_c4, float *dst, const float *bias, int output_channel, @@ -117,5 +117,5 @@ int DeConvPostFp32C4(const float *src, float *tmp_c4, float *dst, const float *b PostConvFuncFp32C4(tmp_c4, dst, bias, output_channel, output_plane, conv_param->output_channel_, conv_param->is_relu_, conv_param->is_relu6_); - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h index 8c8fe5059f..003fb36c1f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_DECONV_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_DECONV_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_DECONV_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_DECONV_H_ -#include "src/runtime/kernel/arm/opclib/pack.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h" void PackDeConvWeightFp32(const float *weight, float *dst, int input_channel, int output_channel, int plane); @@ -31,4 +31,4 @@ int DeConvPostFp32C4(const float *src, float *tmp_c4, float *dst, const float *b int DeConvPostFp32C8x8(const float *src, float *tmp_out, const float *bias, float *dst, int output_channel, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_DECONV_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_DECONV_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/expandDims.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.cc similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/expandDims.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.cc index a9e7843995..65c2a58e90 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/expandDims.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/expandDims.h" +#include "src/runtime/kernel/arm/nnacl/fp32/expandDims.h" #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int ExpandDims(float *input_ptr, float *output_ptr, size_t data_size) { memcpy(output_ptr, input_ptr, data_size); - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/expandDims.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/expandDims.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.h index 9d440f2542..21b1fc9789 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/expandDims.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/expandDims.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_EXPANDDIMS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_EXPANDDIMS_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_EXPANDDIMS_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_EXPANDDIMS_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ExpandDimsParameter { OpParameter op_parameter_; @@ -26,5 +26,5 @@ struct ExpandDimsParameter { int ExpandDims(float *input_ptr, float *output_ptr, size_t data_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_EXPANDDIMS_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_EXPANDDIMS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/fill.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.cc similarity index 90% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/fill.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.cc index b898dcfe81..38bc4dbb27 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/fill.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/fill.h" +#include "src/runtime/kernel/arm/nnacl/fp32/fill.h" int Fill(float *output, int size, float data) { for (int i = 0; i < size; ++i) { output[i] = data; } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/fill.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/fill.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.h index 2b53be39a5..905afafd3f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/fill.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/fill.h @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FILL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FILL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FILL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FILL_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" #define FILL_DIMS_MAX_SIZE 4 @@ -32,5 +32,5 @@ struct FillParameter { int Fill(float *output, int size, float data); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FILL_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FILL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gather.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gather.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.cc index 520b294bd2..c6bef4c940 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gather.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/gather.h" +#include "src/runtime/kernel/arm/nnacl/fp32/gather.h" #include inline int Stride(int *shape, int rank, int index) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gather.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gather.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.h index 9641407384..95a4046c46 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gather.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gather.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_GATHER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_GATHER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct GatherParameter { OpParameter op_parameter_; @@ -28,5 +28,5 @@ struct GatherParameter { int Gather(float *input, int outer_size, int inner_size, int limit, int *indices, int indices_element_size, float *output); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_GATHER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gatherNd.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.cc similarity index 86% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gatherNd.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.cc index 00e715751c..fd62a5ab46 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gatherNd.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/gatherNd.h" +#include "src/runtime/kernel/arm/nnacl/fp32/gatherNd.h" #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int GatherNd(float *input, float *output, int *in_offset, int area, int count) { int i = 0; for (i = 0; i < count; i++) { (void)memcpy(output + area * i, input + in_offset[i], area * sizeof(float)); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gatherNd.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gatherNd.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.h index 30d92ede39..93c97002a2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gatherNd.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gatherNd.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_GATHERND_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_GATHERND_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHERND_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHERND_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct GatherNdParameter { OpParameter op_parameter_; @@ -26,5 +26,5 @@ struct GatherNdParameter { int GatherNd(float *input, float *output, int *in_offset, int area, int count); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_GATHERND_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_GATHERND_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gemm.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gemm.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gemm.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gemm.cc index a8f3b2afd4..83705a8fbd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gemm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gemm.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/gemm.h" +#include "src/runtime/kernel/arm/nnacl/fp32/gemm.h" static void gemm_nn(int M, int N, int K, float alpha, float *mat_a, int lda, float *mat_B, int ldb, float *mat_c, int ldc) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gemm.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gemm.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gemm.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gemm.h index 8caf05755f..b3e30d09da 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/gemm.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/gemm.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_GEMM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_GEMM_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GEMM_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GEMM_H_ void gemm(int transpose_a, int transpose_b, int M, int N, int K, float alpha, float *mat_a, int lda, float *mat_b, int ldb, float beta, float *mat_c, int ldc); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_GEMM_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_GEMM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/local_response_norm.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/local_response_norm.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.cc index 3beb4c44d7..0120e93645 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/local_response_norm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/local_response_norm.h" +#include "src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h" int LocalResponseNorm(float *input_ptr, int out_size, int channel, float *output_ptr, LocalResponseNormParameter *param) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/local_response_norm.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/local_response_norm.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h index b2631427cf..ad10be79e9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/local_response_norm.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/local_response_norm.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_LOCAL_RESPONSE_NORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_LOCAL_RESPONSE_NORM_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LOCAL_RESPONSE_NORM_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LOCAL_RESPONSE_NORM_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct LocalResponseNormParameter { OpParameter op_parameter_; @@ -30,4 +30,4 @@ struct LocalResponseNormParameter { int LocalResponseNorm(float *input_ptr, int out_size, int channel, float *output_ptr, LocalResponseNormParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_LOCAL_RESPONSE_NORM_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_LOCAL_RESPONSE_NORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/lstm.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/lstm.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.cc index 3504000572..7a3a07ed0d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/lstm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/lstm.h" +#include "src/runtime/kernel/arm/nnacl/fp32/lstm.h" #include -#include "src/runtime/kernel/arm/opclib/fp32/activation.h" -#include "src/runtime/kernel/arm/opclib/fp32/arithmetic.h" +#include "src/runtime/kernel/arm/nnacl/fp32/activation.h" +#include "src/runtime/kernel/arm/nnacl/fp32/arithmetic.h" void InitGate(float *gate_buffer, const float *bias, LstmParameter *lstm_parm) { int gate_offest = 0; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/lstm.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h similarity index 80% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/lstm.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h index 6775ac6314..05fff4f1dc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/lstm.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_LSTM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_LSTM_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_LSTM_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_LSTM_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct LstmParameter { OpParameter op_parameter_; @@ -33,4 +33,4 @@ struct LstmParameter { void Lstm(float *output, const float *input, const float *weight_i, const float *weight_h, const float *bias, float *hidden_state, float *cell_state, float *gate_buffer, LstmParameter *lstm_parm); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_LSTM_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_LSTM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.cc index 5825c346bb..6c841f7f39 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/matmul.h" +#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" void RowMajor2Row8Major(float *src_ptr, float *dst_ptr, int row, int col) { for (int r = 0; r < row; r++) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h index 07ff8fdd9d..e92f6004b7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/matmul.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_MATMUL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_MATMUL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_MATMUL_H_ #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/matmul.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/matmul.h" void MatMul(const float *a, const float *b, float *c, const float *bias, ActType act_type, int depth, int row, int col); void RowMajor2Row8Major(float *src_ptr, float *dst_ptr, int row, int col); @@ -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_OPCLIB_FP32_MATMUL_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/one_hot.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.cc similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/one_hot.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.cc index bef74d51d7..351e154290 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/one_hot.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/one_hot.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/fp32/one_hot.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int OneHot(const int *indices, float *output, const OneHotParameter *one_hot_param, const int tid, const int thread_num) { if (indices == nullptr || one_hot_param == nullptr || output == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int outer_size = one_hot_param->outer_size_; @@ -36,7 +36,7 @@ int OneHot(const int *indices, float *output, const OneHotParameter *one_hot_par *output_ptr = off_value; int index = indices[i * inner_size + j]; if (index >= depth) { - return OPCLIB_ERRCODE_INDEX_OUT_OF_RANGE; + return NNACL_ERRCODE_INDEX_OUT_OF_RANGE; } if (index == k) { *output_ptr = on_value; @@ -45,5 +45,5 @@ int OneHot(const int *indices, float *output, const OneHotParameter *one_hot_par } } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/one_hot.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/one_hot.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.h index 48bc0082d5..9cefa121ec 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/one_hot.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/one_hot.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ONE_HOT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ONE_HOT_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ONE_HOT_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ONE_HOT_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct OneHotParameter { OpParameter op_parameter_; @@ -34,4 +34,4 @@ struct OneHotParameter { int OneHot(const int *indices, float *output, const OneHotParameter *one_hot_param, const int tid, const int thread_num); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_ONE_HOT_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_ONE_HOT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pad.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.cc similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pad.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.cc index c2ce393ddd..1857ed6515 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/pad.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pad.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" void Pad(const float *input_data, float *output_data, const int *input_shape, const int *output_shape, const int *paddings, const int tid, const int thread_num) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.h index fdaba951b5..1b60946e29 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pad.h @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_PAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_PAD_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PAD_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PAD_H_ #ifdef ENABLE_NEON #include #endif #include #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/pad_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/pad_parameter.h" void Pad(const float *input_data, float *output_data, const int *input_shape, const int *output_shape, const int *paddings, const int tid, const int thread_num); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_PAD_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_PAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.cc index cf84fb1314..da45b8b94d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/pooling.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" #include void AvgPooling(const float *input_ptr, float *output_ptr, PoolingParameter *pooling_param, int task_id) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.h index d615d49f36..b460ea490c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_POOLING_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_POOLING_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct PoolingParameter { OpParameter op_parameter_; @@ -53,4 +53,4 @@ void AvgPooling(const float *input_ptr, float *output_ptr, PoolingParameter *poo void MaxPooling(const float *input_ptr, float *output_ptr, PoolingParameter *pooling_param, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_POOLING_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling_grad.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling_grad.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling_grad.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling_grad.cc index 2730cbe95d..7c37fd38bc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling_grad.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include "src/runtime/kernel/arm/opclib/fp32/pooling_grad.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling_grad.h" void AvgPoolingGrad(const float *input_ptr, float *output_ptr, PoolingParameter *pooling_param) { int stride_w = pooling_param->stride_w_; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling_grad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling_grad.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling_grad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling_grad.h index 750530d767..0f6049afd4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/pooling_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/pooling_grad.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_POOLING_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_POOLING_GRAD_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_GRAD_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_GRAD_H_ -#include "src/runtime/kernel/arm/opclib/fp32/pooling.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" void AvgPoolingGrad(const float *input_ptr, float *output_ptr, PoolingParameter *pooling_param); void MaxPoolingGrad(const float *dy, const int *indices_ptr, float *output_ptr, PoolingParameter *pooling_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_POOLING_GRAD_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_POOLING_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/range.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/range.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.cc index 42523ee555..acb6c18cd5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/range.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/range.h" +#include "src/runtime/kernel/arm/nnacl/fp32/range.h" void Range(float *output_ptr, int start, int limit, int delta) { size_t index = 0; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/range.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/range.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.h index 0f48a1e2fc..bdb40c6d25 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/range.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/range.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RANGE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RANGE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANGE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANGE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct RangeParameter { OpParameter op_parameter_; @@ -29,5 +29,5 @@ struct RangeParameter { void Range(float *output_ptr, int start, int limit, int delta); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RANGE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANGE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/rank.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.cc similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/rank.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.cc index ef7f406235..1cf475b625 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/rank.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/rank.h" +#include "src/runtime/kernel/arm/nnacl/fp32/rank.h" void Rank(float* output, int rank) { output[0] = (float)(rank); diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/rank.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/rank.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.h index 6933016063..e8133d0ac7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/rank.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/rank.h @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RANK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RANK_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANK_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANK_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Rank(float* output, int rank); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RANK_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RANK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.cc similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.cc index 00886102be..4fe680b8cd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.cc @@ -15,13 +15,13 @@ */ #include -#include "src/runtime/kernel/arm/opclib/fp32/reduce.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/fp32/reduce.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int ReduceMean(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num) { if (src_data == nullptr || src_shape == nullptr || dst_data == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int i, j, k; for (j = tid; j < outer_size; j += thread_num) { @@ -37,12 +37,12 @@ int ReduceMean(const int outer_size, const int inner_size, const int axis_size, *inner_dst = tmp / (float)axis_size; } } - return OPCLIB_OK; + return NNACL_OK; } int ReduceSum(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num) { if (src_data == nullptr || src_shape == nullptr || dst_data == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int i, j, k; for (j = tid; j < outer_size; j += thread_num) { @@ -58,12 +58,12 @@ int ReduceSum(const int outer_size, const int inner_size, const int axis_size, c *inner_dst = tmp; } } - return OPCLIB_OK; + return NNACL_OK; } int ReduceMax(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num) { if (src_data == nullptr || src_shape == nullptr || dst_data == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int i, j, k; for (j = tid; j < outer_size; j += thread_num) { @@ -79,12 +79,12 @@ int ReduceMax(const int outer_size, const int inner_size, const int axis_size, c *inner_dst = tmp; } } - return OPCLIB_OK; + return NNACL_OK; } int ReduceMin(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num) { if (src_data == nullptr || src_shape == nullptr || dst_data == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int i, j, k; for (j = tid; j < outer_size; j += thread_num) { @@ -100,12 +100,12 @@ int ReduceMin(const int outer_size, const int inner_size, const int axis_size, c *inner_dst = tmp; } } - return OPCLIB_OK; + return NNACL_OK; } int ReduceProd(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num) { if (src_data == nullptr || src_shape == nullptr || dst_data == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int i, j, k; for (j = tid; j < outer_size; j += thread_num) { @@ -121,12 +121,12 @@ int ReduceProd(const int outer_size, const int inner_size, const int axis_size, *inner_dst = tmp; } } - return OPCLIB_OK; + return NNACL_OK; } int ReduceSumSquare(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num) { if (src_data == nullptr || src_shape == nullptr || dst_data == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } int i, j, k; for (j = tid; j < outer_size; j += thread_num) { @@ -142,5 +142,5 @@ int ReduceSumSquare(const int outer_size, const int inner_size, const int axis_s *inner_dst = tmp; } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h index 0172f43e70..9ebdb9638a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_REDUCE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_REDUCE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define REDUCE_MAX_AXES_NUM 8 struct ReduceParameter { @@ -39,4 +39,4 @@ int ReduceProd(const int outer_size, const int inner_size, const int axis_size, const int *src_shape, float *dst_data, const int tid, const int thread_num); int ReduceSumSquare(const int outer_size, const int inner_size, const int axis_size, const float *src_data, const int *src_shape, float *dst_data, const int tid, const int thread_num); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_REDUCE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.cc index 24e7189b3e..40801c3f35 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.cc @@ -15,7 +15,7 @@ */ #include #include -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.h" static inline bool NextIndex(const int num_dims, const int *dims, int *current) { int carry = 1; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.h index 7645817135..334ae736c4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reduce_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce_grad.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_REDUCE_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_REDUCE_GRAD_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_GRAD_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_GRAD_H_ float ReduceMeanAll(const float *src, int size); void ReduceSumByAxes(const float *input, const int *input_dims, float *output, const int *output_dims, int num_dims); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_REDUCE_GRAD_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_REDUCE_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reverse.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.cc similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reverse.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.cc index 5ba3b90d0f..6c1867f954 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reverse.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/reverse.h" +#include "src/runtime/kernel/arm/nnacl/fp32/reverse.h" #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int Reverse(const float *input, float *output, size_t elem_size, int *index) { for (int i = 0; i < elem_size; i++) { output[index[i]] = input[i]; } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reverse.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reverse.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.h index d84bedbcf8..8e76eb4b94 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/reverse.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reverse.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_REVERSE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_REVERSE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define REVERSE_SHAPE_MAX_SIZE 4 // For reverse. @@ -32,5 +32,5 @@ struct ReverseParameter { int Reverse(const float *input, float *output, size_t elem_size, int *index); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_REVERSE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/slice.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/slice.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.cc index 3785029820..02e3b3fcee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/slice.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/slice.h" +#include "src/runtime/kernel/arm/nnacl/fp32/slice.h" #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" void PadSliceParameterTo4D(SliceParameter *param) { int32_t begin[DIMENSION_4D]; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/slice.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/slice.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.h index 9545cfb8ba..07da4625c2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/slice.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/slice.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SLICE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SLICE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SLICE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SLICE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define SLICE_SHAPE_MAX_SIZE 4 struct SliceParameter { @@ -32,5 +32,5 @@ struct SliceParameter { void PadSliceParameterTo4D(SliceParameter *param); void DoSlice(const float *input, float *output, SliceParameter *param); void DoSliceNoParallel(const float *input, float *output, SliceParameter *param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SLICE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SLICE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.cc index 75f0b1b165..2e046f2651 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/softmax.h" +#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h" #include // output = exp(input) / reduce_sum(exp(input), axis) diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.h similarity index 68% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.h index 590b020495..7324b0d4d5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SOFTMAX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SOFTMAX_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/softmax_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h" void Softmax(const float *input_ptr, float *output_ptr, float *sum_data, SoftmaxParameter *parameter); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SOFTMAX_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax_grad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax_grad.h similarity index 74% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax_grad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax_grad.h index 6fb7fc1580..e9b0955d9d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/softmax_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/softmax_grad.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SOFTMAX_GRAD_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SOFTMAX_GRAD_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_GRAD_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_GRAD_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct SoftmaxCrossEntropyParameter { OpParameter op_parameter; @@ -26,4 +26,4 @@ struct SoftmaxCrossEntropyParameter { int n_dim_; int input_shape_[5]; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_SOFTMAX_GRAD_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_SOFTMAX_GRAD_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_batch.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.cc similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_batch.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.cc index 1861ea4430..cbc4e247dd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_batch.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/space_to_batch.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/fp32/concat.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/fp32/concat.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" int EnumElement(int *shape, int n_dims) { int total = 1; @@ -83,7 +83,7 @@ int SpaceToBatchForNHWC(const float *input, float *output, int *in_shape, int sh int perm[6] = {0, 2, 4, 1, 3, 5}; TransposeForNHWC(input, output, in_strides, out_strides, perm, trans_out_shape); - return OPCLIB_OK; + return NNACL_OK; } void DoPadding(const float *input, float *padded_input, SpaceToBatchParameter param, float *tmp_space[]) { @@ -142,7 +142,7 @@ int SpaceToBatch(const float *input, float *output, SpaceToBatchParameter param, int ret; if (param.need_paddings_) { if (tmp_space[0] == nullptr || tmp_space[1] == nullptr || tmp_space[2] == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } padded_input = tmp_space[0]; DoPadding(input, padded_input, param, tmp_space + 1); diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_batch.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_batch.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h index cf04b9f9a4..4d4ab437f7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_batch.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_batch.h @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_FP32_SPACE_TO_BATCH_H_ -#define MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_FP32_SPACE_TO_BATCH_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_FP32_SPACE_TO_BATCH_H_ +#define MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_FP32_SPACE_TO_BATCH_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define SPACE_TO_BATCH_BLOCK_SIZES_SIZE 2 #define SPACE_TO_BATCH_PADDINGS_SIZE 4 @@ -39,4 +39,4 @@ void TransposeForNHWC(const float *in_data, float *out_data, int *strides, int * int *output_shape); void DoPadding(const float *input, float *padded_input, SpaceToBatchParameter param); int EnumElement(int *shape, int n_dims); -#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_FP32_SPACE_TO_BATCH_H_ +#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_FP32_SPACE_TO_BATCH_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_depth.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.cc similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_depth.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.cc index c785e52eb2..dab1dd7b8e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_depth.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.cc @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/space_to_depth.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" int SpaceToDepthForNHWC(const float *input, float *output, int *in_shape, int *out_shape, int shape_size, int block_size, int h_start, int h_end) { if (input == nullptr || output == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } if (shape_size != C4NUM) { - return OPCLIB_PARAM_INVALID; + return NNACL_PARAM_INVALID; } if (h_start < 0 || h_start >= h_end || h_end > out_shape[1]) { - return OPCLIB_PARAM_INVALID; + return NNACL_PARAM_INVALID; } int in_strides[C4NUM]; ComputeStrides(in_shape, in_strides, shape_size); @@ -49,5 +49,5 @@ int SpaceToDepthForNHWC(const float *input, float *output, int *in_shape, int *o } } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_depth.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_depth.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h index 319c7d24e5..5bfdacac89 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/space_to_depth.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/space_to_depth.h @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_FP32_SPACE_TO_DEPTH_H_ -#define MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_FP32_SPACE_TO_DEPTH_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_FP32_SPACE_TO_DEPTH_H_ +#define MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_FP32_SPACE_TO_DEPTH_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct SpaceToDepthParameter { OpParameter op_parameter_; @@ -24,4 +24,4 @@ struct SpaceToDepthParameter { int SpaceToDepthForNHWC(const float *input, float *output, int *in_shape, int *out_shape, int shape_size, int block_size, int h_start, int h_end); -#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_FP32_SPACE_TO_DEPTH_H_ +#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_FP32_SPACE_TO_DEPTH_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/stack.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.cc similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/stack.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.cc index 10c0e6a6b9..1496ec7d47 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/stack.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/stack.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/fp32/stack.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" void DoStack(const float * const *inputs, size_t input_num, int *in_shape, size_t shape_size, int axis, float *output) { size_t one_input_size = 1; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/stack.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/stack.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.h index 18bd46a8d8..cf08d4901b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/stack.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/stack.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_STACK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_STACK_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STACK_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STACK_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct StackParameter { OpParameter op_parameter_; @@ -24,5 +24,5 @@ struct StackParameter { }; void DoStack(const float * const *inputs, size_t input_num, int *in_shape, size_t shape_size, int axis, float *output); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_STACK_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STACK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.cc index f1c31ba85d..1baa31f8e7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h" +#include "src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h" bool CheckRecursion(int row, int col, int deep, int max_recursion, int cur_recursion) { if (cur_recursion >= max_recursion) { @@ -93,13 +93,13 @@ int RecursionMatmul(const float *a_ptr, const float *b_ptr, float *c_ptr, Strass float *x_ptr = (float *)(malloc(row2 * MSMAX(deep2, col2) * FP32_STRASSEN_UINT * sizeof(float))); if (x_ptr == nullptr) { free(rec_matmul); - return OPCLIB_ERRCODE_STRASSEN_RECURSION_MALLOC; + return NNACL_ERRCODE_STRASSEN_RECURSION_MALLOC; } float *y_ptr = (float *)(malloc(col2 * deep2 * FP32_STRASSEN_WEIGHT_UINT * sizeof(float))); if (y_ptr == nullptr) { free(x_ptr); free(rec_matmul); - return OPCLIB_ERRCODE_STRASSEN_RECURSION_MALLOC; + return NNACL_ERRCODE_STRASSEN_RECURSION_MALLOC; } size_t x_stride = row2 * FP32_STRASSEN_UINT; size_t y_stride = deep2 * FP32_STRASSEN_WEIGHT_UINT; @@ -187,7 +187,7 @@ int RecursionMatmul(const float *a_ptr, const float *b_ptr, float *c_ptr, Strass free(x_ptr); free(y_ptr); free(rec_matmul); - return OPCLIB_OK; + return NNACL_OK; } int CommonMatMul(const float *a_ptr, const float *b_ptr, float *c_ptr, StrassenMatMulParameter *matmul_param, @@ -195,7 +195,7 @@ int CommonMatMul(const float *a_ptr, const float *b_ptr, float *c_ptr, StrassenM MatrixPack(a_ptr, tmp_a_ptr, matmul_param->row_, matmul_param->deep_, matmul_param->a_stride_); GemmMatMul(tmp_a_ptr, b_ptr, c_ptr, matmul_param->row_, matmul_param->col_, matmul_param->deep_, matmul_param->b_stride_, matmul_param->c_stride_); - return OPCLIB_OK; + return NNACL_OK; } int StrassenMatmul(const float *a_ptr, const float *b_ptr, float *c_ptr, StrassenMatMulParameter *matmul_param, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h similarity index 71% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h index 8e8cd60608..06afd71669 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/strassen_matmul.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_STRASSEN_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_STRASSEN_MATMUL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STRASSEN_MATMUL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STRASSEN_MATMUL_H_ #include -#include "src/runtime/kernel/arm/opclib/pack.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/strassen_matmul.h" -#include "src/runtime/kernel/arm/opclib/fp32/common_func.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/strassen_matmul.h" +#include "src/runtime/kernel/arm/nnacl/fp32/common_func.h" #define FP32_STRASSEN_UINT C4NUM #define FP32_STRASSEN_WEIGHT_UINT (C4NUM * C4NUM) @@ -36,5 +36,5 @@ int CommonMatMul(const float *a_ptr, const float *b_ptr, float *c_ptr, StrassenM int StrassenMatmul(const float *a_ptr, const float *b_ptr, float *c_ptr, StrassenMatMulParameter *matmul_param, int max_recursion, int cur_recursion, float *tmp_a_ptr); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_STRASSEN_MATMUL_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_STRASSEN_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.cc index 72e77f4fad..be0c8b3f13 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/topk.h" +#include "src/runtime/kernel/arm/nnacl/fp32/topk.h" int DescendCmp(const void *a, const void *b) { return ((const TopkNode *)b)->element - ((const TopkNode *)a)->element; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h index 7d3ca97dda..a49e5f8ef4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TOPK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TOPK_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TOPK_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TOPK_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct TopkNode { float element; @@ -35,5 +35,5 @@ struct TopkParameter { void Topk(float *input_data, float *output_data, int32_t *output_index, TopkParameter *parameter); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TOPK_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TOPK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/unsqueeze.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.cc similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/unsqueeze.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.cc index f90ab24ed7..4d7d1600cf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/unsqueeze.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fp32/unsqueeze.h" +#include "src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h" #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int Unsqueeze(float *input_ptr, float *output_ptr, size_t data_size) { memcpy(output_ptr, input_ptr, data_size); - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/unsqueeze.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fp32/unsqueeze.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h index 1efadcd914..59c01944f3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fp32/unsqueeze.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/unsqueeze.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNSQUEEZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNSQUEEZE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSQUEEZE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSQUEEZE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define UNSQUEEZE_DIMS_MAX_SIZE 4 @@ -29,6 +29,6 @@ struct UnsqueezeParameter { int Unsqueeze(float *input_ptr, float *output_ptr, size_t data_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNSQUEEZE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSQUEEZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.cc index 2034cc138f..9c8aa0fa8c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/fused_batchnorm.h" +#include "src/runtime/kernel/arm/nnacl/fused_batchnorm.h" void FusedBatchNorm(const float *input_ptr, const float *scale_ptr, const float *offest_ptr, const float *mean_ptr, const float *variance_ptr, int *input_shapes, float epsilon, float *output_ptr) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.h index f81780106e..8aac705e46 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FUSED_BATCHNORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FUSED_BATCHNORM_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FUSED_BATCHNORM_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FUSED_BATCHNORM_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct FusedBatchNormParameter { OpParameter op_parameter_; @@ -29,5 +29,5 @@ void FusedBatchNorm(const float *input_ptr, const float *scale_ptr, const float const float *variance_ptr, int *input_shapes, float epsilon, float *output_ptr); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FUSED_BATCHNORM_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FUSED_BATCHNORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.cc index 9ce4d793b9..31ac63ec5b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h" #include void CalcParameter(const int *shape, int dims_number, int axis, int *pre_axis_count, int *axis_count, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h index d3528a47e3..ec4f259715 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arg_min_max_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arg_min_max_int8.h @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARG_MIN_MAX_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARG_MIN_MAX_INT8_H_ +#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_ -#include "src/runtime/kernel/arm/opclib/arg_min_max_parameter.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/arg_min_max_parameter.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" void ArgMinMaxQuant(const int8_t *input, int8_t *output, const int *in_shape, ArgMinMaxParameter *param, QuantArg *in_quant, QuantArg *out_quant); @@ -29,4 +29,4 @@ void ArgMinMaxDim2(const int8_t *input, int8_t *output, const int *in_shape, Arg QuantArg *in_quant, QuantArg *out_quant); void ArgMinMaxDim3(const int8_t *input, int8_t *output, const int *in_shape, ArgMinMaxParameter *param, QuantArg *in_quant, QuantArg *out_quant); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARG_MIN_MAX_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARG_MIN_MAX_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.cc similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.cc index 5ec1dba10e..d949d64179 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.cc @@ -14,50 +14,50 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/arithmetic_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h" #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int ElementNotEqual(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int index = 0; index < element_size; ++index) { output[index] = (int8_t)(input0[index] != input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int ElementEqual(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int index = 0; index < element_size; ++index) { output[index] = (int8_t)(input0[index] == input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int ElementLess(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int index = 0; index < element_size; ++index) { output[index] = (int8_t)(input0[index] < input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int ElementLessEqual(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int index = 0; index < element_size; ++index) { output[index] = (int8_t)(input0[index] <= input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int ElementGreater(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int index = 0; index < element_size; ++index) { output[index] = (int8_t)(input0[index] > input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } int ElementGreaterEqual(int8_t *input0, int8_t *input1, int8_t *output, int element_size) { for (int index = 0; index < element_size; ++index) { output[index] = (int8_t)(input0[index] >= input1[index]); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h index fdb72b133d..9229657f51 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_int8.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARITHMETIC_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARITHMETIC_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" int ElementNotEqual(int8_t *input0, int8_t *input1, int8_t *output, int element_size); @@ -29,4 +29,4 @@ int ElementLessEqual(int8_t *input0, int8_t *input1, int8_t *output, int element int ElementGreater(int8_t *input0, int8_t *input1, int8_t *output, int element_size); int ElementGreaterEqual(int8_t *input0, int8_t *input1, int8_t *output, int element_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARITHMETIC_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.cc index d18da08e38..b6b98d109e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.cc @@ -15,12 +15,12 @@ */ #include -#include "src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h" #ifdef ENABLE_NEON #include -#include "src/runtime/kernel/arm/opclib/add_int8.h" +#include "src/runtime/kernel/arm/nnacl/add_int8.h" #endif -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" int ElementFloor(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { float in_scale = para.in_args_.scale_; @@ -38,7 +38,7 @@ int ElementFloor(int8_t *input, int8_t *output, int element_size, ArithSelfQuant output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementRound(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -57,7 +57,7 @@ int ElementRound(int8_t *input, int8_t *output, int element_size, ArithSelfQuant output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementCeil(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -76,7 +76,7 @@ int ElementCeil(int8_t *input, int8_t *output, int element_size, ArithSelfQuantA output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementAbs(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -95,7 +95,7 @@ int ElementAbs(int8_t *input, int8_t *output, int element_size, ArithSelfQuantAr output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementSin(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -114,7 +114,7 @@ int ElementSin(int8_t *input, int8_t *output, int element_size, ArithSelfQuantAr output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementCos(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -133,7 +133,7 @@ int ElementCos(int8_t *input, int8_t *output, int element_size, ArithSelfQuantAr output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementLog(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -152,7 +152,7 @@ int ElementLog(int8_t *input, int8_t *output, int element_size, ArithSelfQuantAr output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementSqrt(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -164,7 +164,7 @@ int ElementSqrt(int8_t *input, int8_t *output, int element_size, ArithSelfQuantA for (int i = 0; i < element_size; i++) { float input_f32 = input[i] * in_scale + bias; if (input_f32 < 0) { - return OPCLIB_ERRCODE_SQRT_NEGATIVE; + return NNACL_ERRCODE_SQRT_NEGATIVE; } int32_t output_tmp = round(sqrtf(input_f32) / out_scale) + out_zp; if (output_tmp > para.output_activation_max_) { @@ -175,7 +175,7 @@ int ElementSqrt(int8_t *input, int8_t *output, int element_size, ArithSelfQuantA output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementRsqrt(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -187,7 +187,7 @@ int ElementRsqrt(int8_t *input, int8_t *output, int element_size, ArithSelfQuant for (int i = 0; i < element_size; i++) { float input_f32 = input[i] * in_scale + bias; if (input_f32 <= 0) { - return OPCLIB_ERRCODE_RSQRT_NEGATIVE_OR_ZERO; + return NNACL_ERRCODE_RSQRT_NEGATIVE_OR_ZERO; } int32_t output_tmp = round(1.f / (sqrtf(input_f32) * out_scale)) + out_zp; if (output_tmp > para.output_activation_max_) { @@ -198,7 +198,7 @@ int ElementRsqrt(int8_t *input, int8_t *output, int element_size, ArithSelfQuant output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } #ifdef ENABLE_NEON @@ -256,7 +256,7 @@ int ElementSquare(int8_t *input, int8_t *output, int element_size, ArithSelfQuan output[index] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } int ElementLogicalNot(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para) { @@ -275,5 +275,5 @@ int ElementLogicalNot(int8_t *input, int8_t *output, int element_size, ArithSelf output[i] = static_cast(output_tmp); } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h similarity index 82% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h index a9880f82e0..78c9a42f25 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/arithmetic_self_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/arithmetic_self_int8.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARITHMETIC_SELF_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARITHMETIC_SELF_INT8_H_ +#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_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int ElementRound(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para); @@ -45,4 +45,4 @@ int ElementSquare(int8_t *input, int8_t *output, int element_size, ArithSelfQuan int ElementLogicalNot(int8_t *input, int8_t *output, int element_size, ArithSelfQuantArg para); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_ARITHMETIC_SELF_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_ARITHMETIC_SELF_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.cc index 3279ad82a3..a10a0f151b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.h" -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" void BatchToSpaceNoCropForNHWC(const int8_t *input, int8_t *output, const int *in_shape, int out_n, const int *block, QuantArg *in_quant_arg, QuantArg *out_quant_arg) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h index efbac8adb8..7846e9a1e6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/batch_to_space_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/batch_to_space_int8.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_BATCH_TO_SPACE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_BATCH_TO_SPACE_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#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_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" void BatchToSpaceNoCropForNHWC(const int8_t *input, int8_t *output, const int *in_shape, int out_n, const int *block, QuantArg *in_quant_arg, QuantArg *out_quant_arg); void BatchToSpaceForNHWC(const int8_t *input, int8_t *output, const int *in_shape, int out_n, const int *block, const int *crops, QuantArg *in_quant_arg, QuantArg *out_quant_arg); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_BATCH_TO_SPACE_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_BATCH_TO_SPACE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/common_func.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.h similarity index 88% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/common_func.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.h index 0f361bebaf..3439fbe1db 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/common_func.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/common_func.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_COMMON_FUNC_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_COMMON_FUNC_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_COMMON_FUNC_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_COMMON_FUNC_H_ #include #include #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #ifdef __cplusplus extern "C" { @@ -58,5 +58,5 @@ void ConvDwInt8Center(int8_t *dst, const int16_t *src, const int16_t *weight, co } #endif -#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_FP32_COMMON_FUNC_H_ */ +#endif /* MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_FP32_COMMON_FUNC_H_ */ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/concat_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/concat_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.cc index 07627229af..804c80bf93 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/concat_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/concat_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/concat_int8.h" #include void Concat(int8_t **inputs, int8_t *output_ptr, ConcatQuantArg *quant_concat_parm, int axis) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/concat_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.h similarity index 72% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/concat_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.h index 32e66c807e..6b7edb43d5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/concat_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/concat_int8.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONCAT_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONCAT_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONCAT_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONCAT_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Concat(int8_t **inputs, int8_t *output_ptr, ConcatQuantArg *quant_concat_parm, int axis); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONCAT_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONCAT_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.cc index 2af0b5acf7..784b754cd8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h" #include -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" -#include "src/runtime/kernel/arm/opclib/int8/common_func.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/int8/common_func.h" /*conv depthwise int8 begin*/ void DepthwiseBorderPixelInt8(int8_t *dst, const int16_t *src, const int16_t *weight, const int32_t *bias, int height, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h index e88c6b8529..555c3693ab 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_depthwise_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_depthwise_int8.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONV_DEPTHWISE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONV_DEPTHWISE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_DEPTHWISE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_DEPTHWISE_H_ -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/fp32/conv_depthwise.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/fp32/conv_depthwise.h" void ConvDwInt8(int8_t *output_data, const int16_t *input_data, const int16_t *weight_data, const int32_t *bias_data, const ConvParameter *conv_param, const SlidingWindowParam *sliding, int task_id); @@ -27,4 +27,4 @@ void DeconvDwInt8(int8_t *output_data, int32_t *output_buffer, const int16_t *in const int32_t *bias_data, const ConvParameter *conv_param, const SlidingWindowParam *sliding, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONV_DEPTHWISE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_DEPTHWISE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.cc index 1d32f88797..fa02fd99f1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/conv_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/conv_int8.h" #include -#include "src/runtime/kernel/arm/opclib/winograd_transform.h" -#include "src/runtime/kernel/arm/opclib/int8/common_func.h" +#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" +#include "src/runtime/kernel/arm/nnacl/int8/common_func.h" void IndirectGemmInt8(int8_t *dst, int32_t *tmp_dst, const int8_t *src, const int8_t *weight, const int32_t *bias, int ic4, size_t kernel_plane, size_t output_channel, const int32_t *input_sum, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.h index bbf8424f1d..96f08c0c6b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/conv_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/conv_int8.h @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONV_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONV_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_INT8_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/pack.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/winograd_utils.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/winograd_utils.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" typedef void (*GEMM_FUNC)(int8_t *dst, const int8_t *src, const int8_t *weight, const int32_t *bias, size_t ksize, size_t ic4, size_t output_channel, size_t offset, const int32_t *input_sum, size_t act_min, @@ -53,5 +53,5 @@ void Conv3x3Int8(int16_t *input_data, int16_t *transed_weight, const int32_t *bi int16_t *tile_buffer, int16_t *block_unit_buffer, int32_t *tmp_dst_buffer, int8_t *tmp_out, int task_id, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CONV_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CONV_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/crop_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/crop_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.cc index 2b46b46416..e7708fcc2a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/crop_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/crop_parameter.h" -#include "src/runtime/kernel/arm/opclib/int8/crop_int8.h" +#include "src/runtime/kernel/arm/nnacl/crop_parameter.h" +#include "src/runtime/kernel/arm/nnacl/int8/crop_int8.h" #include void Crop(const int8_t *input, int8_t *output, int task_id, CropParameter *para) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/crop_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/crop_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.h index f8f6955573..d574b0813b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/crop_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/crop_int8.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CROP_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CROP_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/crop_parameter.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CROP_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CROP_INT8_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/crop_parameter.h" void Crop(const int8_t *input, int8_t *output, int task_id, CropParameter *para); void Crop1D(const int8_t *input, int8_t *output, int task_id, CropParameter *para); @@ -25,4 +25,4 @@ void Crop2D(const int8_t *input, int8_t *output, int task_id, CropParameter *par void Crop3D(const int8_t *input, int8_t *output, int task_id, CropParameter *para); void Crop4D(const int8_t *input, int8_t *output, int task_id, CropParameter *para); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_CROP_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_CROP_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.cc index 548eb6e0e5..32586063a3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/deconv.h" +#include "src/runtime/kernel/arm/nnacl/int8/deconv.h" int DeConvInt8(const int8_t *input, const int8_t *weight, int32_t *output, size_t row8, size_t col8, size_t deep, ConvParameter *conv_param) { MatMulInt8(input, weight, output, row8, col8, deep, conv_param->conv_quant_arg_.quant_args_[0][0].zp_, conv_param->conv_quant_arg_.quant_args_[1][0].zp_); - return OPCLIB_OK; + return NNACL_OK; } int DeConvPostInt8(const int32_t *src, const int32_t *bias, int32_t *tmp, int8_t *out, int output_channel, @@ -66,5 +66,5 @@ int DeConvPostInt8(const int32_t *src, const int32_t *bias, int32_t *tmp, int8_t conv_param->conv_quant_arg_.quant_multiplier_[0], conv_param->conv_quant_arg_.left_shift_[0], conv_param->conv_quant_arg_.right_shift_[0], conv_param->conv_quant_arg_.quant_args_[2][0].zp_, conv_param->conv_quant_arg_.out_act_min_[0], conv_param->conv_quant_arg_.out_act_max_[0]); - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h similarity index 64% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h index ccda22571e..145a0c1ff6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/deconv.h @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_DECONV_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_DECONV_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DECONV_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DECONV_H_ #include -#include "src/runtime/kernel/arm/opclib/pack.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" -#include "src/runtime/kernel/arm/opclib/int8/matmul.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" +#include "src/runtime/kernel/arm/nnacl/int8/matmul.h" int DeConvInt8(const int8_t *input, const int8_t *weight, int32_t *output, size_t row8, size_t col8, size_t deep, ConvParameter *conv_param); @@ -30,5 +30,5 @@ int DeConvInt8(const int8_t *input, const int8_t *weight, int32_t *output, size_ int DeConvPostInt8(const int32_t *src, const int32_t *bias, int32_t *tmp, int8_t *out, int output_channel, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_DECONV_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DECONV_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.cc index 7d9dc74e5d..4ee38a88c4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h" #include void DepthToSpaceForNHWC(const int8_t *input, int8_t *output, int *in_shape, DepthToSpaceParameter *param, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h similarity index 67% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h index 9b60653eb7..b2abb1f068 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/depth_to_space_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/depth_to_space_int8.h @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_DEPTH_TO_SPACE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_DEPTH_TO_SPACE_INT8_H_ +#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_ -#include "src/runtime/kernel/arm/opclib/depth_to_space_parameter.h" -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/depth_to_space_parameter.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" void DepthToSpaceForNHWC(const int8_t *input, int8_t *output, int *in_shape, DepthToSpaceParameter *param, QuantArg *in_quant_arg, QuantArg *out_quant_arg); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_DEPTH_TO_SPACE_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_DEPTH_TO_SPACE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/hswish_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/hswish_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.cc index 7f8182b268..3e048590c8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/hswish_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/hswish_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/hswish_int8.h" int16_t SaturatingLeftShift(int16_t value, int shift_num) { int32_t result = (int32_t)value * (1 << shift_num); @@ -49,5 +49,5 @@ int HSwishInt8(const int8_t *src, int length, int8_t *dst, HswishQuantArg *arg) output = MSMAX(output, -128); dst[i] = (int8_t)output; } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/hswish_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.h similarity index 71% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/hswish_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.h index b0fbde8104..2d32aee083 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/hswish_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/hswish_int8.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_HSWISH_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_HSWISH_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_HSWISH_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_HSWISH_INT8_H_ #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" struct HswishQuantArg { double input_scale; @@ -34,4 +34,4 @@ struct HswishQuantArg { int HSwishInt8(const int8_t *src, int length, int8_t *dst, HswishQuantArg *arg); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_HSWISH_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_HSWISH_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/matmul.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul.cc similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/matmul.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul.cc index 67dfb40f4b..972dfd46c5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/matmul.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/matmul.h" +#include "src/runtime/kernel/arm/nnacl/int8/matmul.h" #include -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" void RowMajor2Row8MajorInt8(int8_t *src_ptr, int8_t *dst_ptr, int row, int col) { for (int r = 0; r < row; r++) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/matmul.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/matmul.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul.h index d51b783932..7e2cc43ca9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/matmul.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/matmul.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_MATMUL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MATMUL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MATMUL_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/matmul.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/matmul.h" void MatMulInt8(const int8_t *a, const int8_t *b, int32_t *c, const int row8, const int col8, const int deep, const int32_t a_zp, const int32_t b_zp); void RowMajor2Row8MajorInt8(int8_t *src_ptr, int8_t *dst_ptr, int row, int col); void RowMajor2Col8MajorInt8(int8_t *src_ptr, int8_t *dst_ptr, int row, int col); -#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_INT8_MATMUL_H_ +#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_INT8_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/mul_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/mul_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.cc index 8b493f51e9..087e6b0f9d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/mul_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/mul_int8.h" -#include "src/runtime/kernel/arm/opclib/mul_parameter.h" +#include "src/runtime/kernel/arm/nnacl/int8/mul_int8.h" +#include "src/runtime/kernel/arm/nnacl/mul_parameter.h" #ifdef ENABLE_NEON #include -#include "src/runtime/kernel/arm/opclib/add_int8.h" +#include "src/runtime/kernel/arm/nnacl/add_int8.h" #endif -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" #ifdef ENABLE_NEON diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/mul_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.h similarity index 69% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/mul_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.h index 9e6a4aa4b8..000fa37b8e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/mul_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/mul_int8.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_MUL_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_MUL_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MUL_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MUL_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/mul_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/mul_parameter.h" void Mul(int8_t *input0_data, int8_t *input1_data, int8_t *output_data, int64_t real_dst_count, MulQuantArg para); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_MUL_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_MUL_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pad.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.cc similarity index 91% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/pad.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.cc index bf4d0e3f33..55c6d93404 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/pad.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" +#include "src/runtime/kernel/arm/nnacl/int8/pad.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" void PadConstant4D(const int8_t *in_data, int8_t *out_data, const int32_t *in_dims, const int32_t *out_dims, const int32_t *paddings) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pad.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.h similarity index 71% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/pad.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.h index ad7cc84d85..336af7f852 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pad.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pad.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_PAD_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_PAD_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_PAD_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_PAD_INT8_H_ #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/pad_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/pad_parameter.h" void PadConstant4D(const int8_t *in_data, int8_t *out_data, const int32_t *in_dims, const int32_t *out_dims, const int32_t *paddings); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_PAD_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_PAD_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pooling_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/pooling_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.cc index 0a0859c420..854e7e7fc3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pooling_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/pooling_int8.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" +#include "src/runtime/kernel/arm/nnacl/int8/pooling_int8.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" void AvgPoolingInt8(const int8_t *input_ptr, int8_t *output_ptr, PoolingParameter *pooling_param, int task_id) { int stride_w = pooling_param->stride_w_; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pooling_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/pooling_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.h index 9636159e7f..007b60f32d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/pooling_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/pooling_int8.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_POOLING_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_POOLING_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POOLING_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POOLING_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/fp32/pooling.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" void AvgPoolingInt8(const int8_t *input_ptr, int8_t *output_ptr, PoolingParameter *pooling_param, int task_id); @@ -31,4 +31,4 @@ void MaxPoolingInt8(const int8_t *input_ptr, int8_t *output_ptr, PoolingParamete void MaxPoolingOptInt8(const int8_t *input_ptr, int8_t *output_ptr, PoolingParameter *pooling_param, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_POOLING_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_POOLING_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.cc similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.cc index 91aefc4ee6..de24938986 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.cc @@ -14,27 +14,27 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int DequantizeInt8(int8_t *quant_values, float *real_values, float scale, int32_t zp, int size) { if (quant_values == nullptr || real_values == nullptr) { - return OPCLIB_PARAM_INVALID; + return NNACL_PARAM_INVALID; } for (int i = 0; i < size; ++i) { real_values[i] = (quant_values[i] + zp) * scale; } - return OPCLIB_OK; + return NNACL_OK; } int QuantizeToInt8(float *real_values, int8_t *quant_values, float scale, int32_t zp, int size) { if (quant_values == nullptr || real_values == nullptr) { - return OPCLIB_PARAM_INVALID; + return NNACL_PARAM_INVALID; } for (int i = 0; i < size; ++i) { quant_values[i] = (int8_t)round(real_values[i] / scale + zp); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h index 97f4ae67a1..d11ae2c5f6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/quant_dtype_cast.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/quant_dtype_cast.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_QUANTDTYPECAST_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_QUANTDTYPECAST_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_QUANTDTYPECAST_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_QUANTDTYPECAST_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct QuantDTypeCastParameter { OpParameter op_parameter_; @@ -28,4 +28,4 @@ struct QuantDTypeCastParameter { int DequantizeInt8(int8_t *quant_values, float *real_values, float scale, int32_t zp, int size); int QuantizeToInt8(float *real_values, int8_t *quant_values, float scale, int32_t zp, int size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_QUANTDTYPECAST_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_QUANTDTYPECAST_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/relu_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relu_int8.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/relu_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relu_int8.h index 223d009838..88d5adcb13 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/relu_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/relu_int8.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_RELU_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_RELU_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RELU_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RELU_INT8_H_ #include -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" struct ReluQuantArg { QuantArg input_arg; @@ -43,4 +43,4 @@ inline void ReluInt8(const int8_t *src, int length, int8_t *dst, ReluQuantArg *a } } -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_RELU_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RELU_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/reshape_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/reshape_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.cc index aabed8b3af..3993e3d3d2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/reshape_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/reshape_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/reshape_int8.h" #include void Reshape(int8_t *input_ptr, int8_t *output_ptr, size_t data_size, int input_num, QuantArg in_quant_arg, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/reshape_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/reshape_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.h index 8ba2e83537..129178086a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/reshape_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/reshape_int8.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_RESHAHPE_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_RESHAHPE_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESHAHPE_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESHAHPE_INT8_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Reshape(int8_t *input_ptr, int8_t *output_ptr, size_t data_size, int input_num, QuantArg in_quant_arg, QuantArg out_quant_arg); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_RESHAHPE_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_RESHAHPE_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/softmax_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/softmax_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.cc index 0b94d1c1b0..0428717522 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/softmax_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/softmax_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/softmax_int8.h" #include int Softmax(const int8_t *input_ptr, int8_t *output_ptr, int count, float *exp_data, float *sum_data, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/softmax_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.h similarity index 69% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/softmax_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.h index cf5e03564d..546f9e940a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/softmax_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/softmax_int8.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_SOFTMAX_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_SOFTMAX_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SOFTMAX_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SOFTMAX_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/softmax_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/softmax_parameter.h" int Softmax(const int8_t *input_ptr, int8_t *output_ptr, int count, float *exp_data, float *sum_data, SoftmaxQuantArg quant_param, SoftmaxParameter *parameter); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_SOFTMAX_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SOFTMAX_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/split_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.cc similarity index 92% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/split_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.cc index 5ba3db9a5f..b4d6602124 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/split_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/split_int8.h" -#include "src/runtime/kernel/arm/opclib/split_parameter.h" +#include "src/runtime/kernel/arm/nnacl/int8/split_int8.h" +#include "src/runtime/kernel/arm/nnacl/split_parameter.h" #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int DoSplit(int8_t *in_data, int8_t **out_data, const int *input_shape, int offset, int num_unit, SplitParameter *param) { if (in_data == nullptr || out_data == nullptr) { - return OPCLIB_ERR; + return NNACL_ERR; } int num_split = param->num_split_; int *split_sizes = param->split_sizes_; @@ -69,5 +69,5 @@ int DoSplit(int8_t *in_data, int8_t **out_data, const int *input_shape, int offs src += copy_size; } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/split_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.h similarity index 69% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/split_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.h index 4357137c3b..2c269af394 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/split_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/split_int8.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_SPLIT_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_SPLIT_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/split_parameter.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SPLIT_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SPLIT_INT8_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/split_parameter.h" int DoSplit(int8_t *in_data, int8_t **out_data, const int *input_shape, int offset, int num_unit, SplitParameter *split_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_SPLIT_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_SPLIT_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/topk_int8.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/topk_int8.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.cc index 8394d2bf98..3cb482177f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/topk_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/int8/topk_int8.h" +#include "src/runtime/kernel/arm/nnacl/int8/topk_int8.h" int DescendCmpInt8(const void *a, const void *b) { return ((const TopkNodeInt8 *)b)->element - ((const TopkNodeInt8 *)a)->element; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/topk_int8.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.h similarity index 70% rename from mindspore/lite/src/runtime/kernel/arm/opclib/int8/topk_int8.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.h index 3a33697461..5b7bbc554f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/int8/topk_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/int8/topk_int8.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_TOPK_INT8_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_TOPK_INT8_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_TOPK_INT8_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_TOPK_INT8_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/fp32/topk.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/fp32/topk.h" struct TopkNodeInt8 { int8_t element; @@ -27,4 +27,4 @@ struct TopkNodeInt8 { void TopkInt8(int8_t *input_data, int8_t *output_data, int32_t *output_index, TopkParameter *parameter); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_INT8_TOPK_INT8_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_INT8_TOPK_INT8_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/matmul.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/matmul.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/matmul.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/matmul.h index 2851bd55ae..058f0371ab 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/matmul.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/matmul.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MATMUL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATMUL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATMUL_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" enum ActType { ActType_No, ActType_Relu, ActType_Relu6 }; @@ -35,4 +35,4 @@ struct MatMulParameter { ActType act_type_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MATMUL_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/matrix_table.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.h similarity index 98% rename from mindspore/lite/src/runtime/kernel/arm/opclib/matrix_table.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.h index 3b9316d620..3a21e6c68c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/matrix_table.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/matrix_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MATRIX_TABLE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MATRIX_TABLE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATRIX_TABLE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATRIX_TABLE_H_ inline void MatrixG4x2(float *matrix_data) { matrix_data[0] = 1.0f; @@ -508,5 +508,5 @@ inline void MatrixGT7x8(float *matrix_data) { matrix_data[55] = 1.0f; } -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MATRIX_TABLE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MATRIX_TABLE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/mul_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/mul_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h index e35a5ba4cd..8b70bd09ee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/mul_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/mul_parameter.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MUL_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MUL_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MUL_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MUL_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct MulParameter { OpParameter op_parameter_; @@ -25,4 +25,4 @@ struct MulParameter { MulQuantArg mul_quant_arg_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_MUL_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_MUL_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/opclib_utils.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/opclib_utils.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.cc index c43f23e6cb..1607d5793d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/opclib_utils.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/opclib_utils.h" +#include "src/runtime/kernel/arm/nnacl/nnacl_utils.h" #ifdef __ANDROID__ #include #endif diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/opclib_utils.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/opclib_utils.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.h index 4f8035a107..a8d39d669f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/opclib_utils.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/nnacl_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OPCLIB_UTILS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OPCLIB_UTILS_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_NNACL_UTILS_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_NNACL_UTILS_H_ #include @@ -23,5 +23,5 @@ uint32_t getHwCap(int hwcap_type); #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OPCLIB_UTILS_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_NNACL_UTILS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/op_base.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/op_base.h similarity index 84% rename from mindspore/lite/src/runtime/kernel/arm/opclib/op_base.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/op_base.h index 8cf6cd7986..dcf1e956e7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/op_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/op_base.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OP_BASE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OP_BASE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OP_BASE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OP_BASE_H_ #include -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" #define C4NUM 4 #define C8NUM 8 @@ -59,4 +59,4 @@ struct OpParameter { int thread_num_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OP_BASE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OP_BASE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/opt_op_handler.c b/mindspore/lite/src/runtime/kernel/arm/nnacl/opt_op_handler.c similarity index 100% rename from mindspore/lite/src/runtime/kernel/arm/opclib/opt_op_handler.c rename to mindspore/lite/src/runtime/kernel/arm/nnacl/opt_op_handler.c diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/optimized_kernel.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/optimized_kernel.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/opclib/optimized_kernel.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/optimized_kernel.h index 150369b110..d5bf245376 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/optimized_kernel.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/optimized_kernel.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OPTIMIZED_KERNEL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OPTIMIZED_KERNEL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OPTIMIZED_KERNEL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OPTIMIZED_KERNEL_H_ #include #ifdef __ANDROID__ #include -#include "src/runtime/kernel/arm/opclib/opclib_utils.h" +#include "src/runtime/kernel/arm/nnacl/nnacl_utils.h" #endif #define OPTIMIZE_SHARED_LIBRARY_PATH "liboptimize.so" @@ -73,4 +73,4 @@ class OptimizeModule { void *optimized_op_handler_ = nullptr; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_OPTIMIZED_KERNEL_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_OPTIMIZED_KERNEL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/pack.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/pack.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/pack.cc index aa654c29ad..64dcbaaa4c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/pack.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/pack.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" #include #include diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/pack.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/pack.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h index 0489519ca2..02ed4c6fba 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/pack.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PACK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PACK_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_H_ #ifdef ENABLE_NEON #include #endif -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Im2ColPackUnitFp32(const float *input_data, ConvParameter *conv_param, float *packed_input, int real_cal_num, int block_index); @@ -93,4 +93,4 @@ void PackDepthwiseInt8Input(const int8_t *src, int16_t *dst, const ConvParameter void PackDepthwiseInt8Weight(const int8_t *src, int16_t *dst, const ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PACK_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/pack_ext.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack_ext.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/pack_ext.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/pack_ext.cc index bb6cd1ce6b..58a52963dd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/pack_ext.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack_ext.cc @@ -15,7 +15,7 @@ */ #include -#include "src/runtime/kernel/arm/opclib/pack_ext.h" +#include "src/runtime/kernel/arm/nnacl/pack_ext.h" static int is_a_ge_zero_and_a_lt_b(int a, int b) { return (unsigned)(a) < (unsigned)(b); } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/pack_ext.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack_ext.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/pack_ext.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/pack_ext.h index 3f51aae13d..d943467f16 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/pack_ext.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/pack_ext.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PACK_EXT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PACK_EXT_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_EXT_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_EXT_H_ -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" void im2col_hwc(const float *in_data, float *data_col, ConvParameter *conv_param); void im2row_hwc(const float *in_data, float *data_row, ConvParameter *conv_param); void col2im_hwc(const float *data_col, float *data_im, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PACK_EXT_H +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PACK_EXT_H diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/pad_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/pad_parameter.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/pad_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/pad_parameter.h index 384d22c63e..230ca70aaf 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/pad_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/pad_parameter.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PAD_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PAD_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PAD_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PAD_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define MAX_PAD_SIZE 8 #define DEFAULT_PAD_NDIMS 4 @@ -29,4 +29,4 @@ struct PadParameter { float constant_value_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PAD_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PAD_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/power.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/power.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/power.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/power.cc index aab26d0d79..b1165f12c1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/power.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/power.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/power.h" +#include "src/runtime/kernel/arm/nnacl/power.h" bool CheckInteger(float f) { return floorf(f) == f; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/power.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/power.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/power.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/power.h index af02dfdc41..61800b47dd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/power.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/power.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_POWER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_POWER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_H_ #include -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct PowerParameter { OpParameter op_parameter_; @@ -28,4 +28,4 @@ struct PowerParameter { void Power(const float *input, const float *exponent, float *output, int len, float scale, float shift, bool broadcast); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_POWER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_POWER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/prelu.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/prelu.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/prelu.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/prelu.cc index 3dff4230f0..6b454e94f9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/prelu.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/prelu.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/prelu.h" +#include "src/runtime/kernel/arm/nnacl/prelu.h" void PRelu(float *input, float *output, PReluParameter *prelu_param_, int task_id) { for (int i = task_id; i < prelu_param_->input_num_; i += prelu_param_->op_parameter_.thread_num_) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/prelu.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/prelu.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/prelu.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/prelu.h index d392ca1d5f..208274ee6b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/prelu.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/prelu.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PRELU_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PRELU_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct PReluParameter { OpParameter op_parameter_; @@ -27,5 +27,5 @@ struct PReluParameter { void PRelu(float *input, float *output, PReluParameter *prelu_param_, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PRELU_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRELU_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/prior_box.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.cc similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/opclib/prior_box.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.cc index 233393af54..e149ed90ca 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/prior_box.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.cc @@ -15,8 +15,8 @@ */ #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" -#include "src/runtime/kernel/arm/opclib/prior_box.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/prior_box.h" int PriorBox(const float *input_data, float *output_data, const size_t size, const int tid, const int thread_num) { size_t unit_size = size / thread_num; @@ -26,5 +26,5 @@ int PriorBox(const float *input_data, float *output_data, const size_t size, con } else { (void)memcpy(output_data + tid * unit_size, input_data + tid * unit_size, unit_size * sizeof(float)); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/prior_box.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/opclib/prior_box.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.h index ce7fae2b4f..fd0ea64e28 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/prior_box.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/prior_box.h @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PRIOR_BOX_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PRIOR_BOX_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRIOR_BOX_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRIOR_BOX_H_ #ifdef ENABLE_NEON #include #endif #include -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #define PRIOR_BOX_MAX_NUM 8 #define PRIOR_BOX_VAR_NUM 4 struct PriorBoxParameter { @@ -42,4 +42,4 @@ struct PriorBoxParameter { }; int PriorBox(const float *input_data, float *output_data, const size_t size, const int tid, const int thread_num); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_PRIOR_BOX_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_PRIOR_BOX_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/fixed_point.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.h similarity index 91% rename from mindspore/lite/src/runtime/kernel/arm/opclib/quantization/fixed_point.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.h index ca4b2d9068..5dfc38012f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/fixed_point.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/fixed_point.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_QUANTIZATION_FIXED_POINT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_QUANTIZATION_FIXED_POINT_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_FIXED_POINT_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_FIXED_POINT_H_ #include #include "include/infer_log.h" @@ -74,4 +74,4 @@ inline int32x4_t RoundingDivideByPOTInt32x4(int32x4_t x, int exponent) { inline int32x4_t SaturatingRoundingDoublingHighMulInt32x4(int32x4_t a, int32x4_t b) { return vqrdmulhq_s32(a, b); } #endif -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_QUANTIZATION_FIXED_POINT_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_FIXED_POINT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.cc index 5add73fa8d..aee93ed738 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/quantization/quantize.h" +#include "src/runtime/kernel/arm/nnacl/quantization/quantize.h" const uint64_t dSignMask = 1ull << 63; const uint64_t dExponentMask = 0x7ffull << 52; diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h index c4fe6984b1..421d582c5e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/quantization/quantize.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_QUANTIZATION_QUANTIZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_QUANTIZATION_QUANTIZE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_QUANTIZE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_QUANTIZE_H_ #include #include #include #include #include -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct QuantArg { double scale_; @@ -171,4 +171,4 @@ inline void Dequantize(int8_t *input_data, int length, float scale, int zero_poi } } -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_QUANTIZATION_QUANTIZE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_QUANTIZATION_QUANTIZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/reshape.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/reshape.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.cc index f0eb2a90b9..5505c8b0f9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/reshape.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/reshape.h" +#include "src/runtime/kernel/arm/nnacl/reshape.h" #include void Reshape(void *input_ptr, void *output_ptr, size_t data_size) { memcpy(output_ptr, input_ptr, data_size); } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/reshape.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/reshape.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.h index 48d04fbbf5..a992a46ba0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/reshape.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESHAHPE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESHAHPE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_H_ +#include "src/runtime/kernel/arm/nnacl/op_base.h" void Reshape(void *input_ptr, void *output_ptr, size_t data_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESHAHPE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/reshape_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h similarity index 71% rename from mindspore/lite/src/runtime/kernel/arm/opclib/reshape_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h index 5bb484daad..0243a60f86 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/reshape_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/reshape_parameter.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESHAHPE_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESHAHPE_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ReshapeParameter { OpParameter op_parameter_; int thread_count_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESHAHPE_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESHAHPE_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/resize.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/resize.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/resize.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/resize.cc index c8a0fbf1d6..48567ce01b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/resize.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/resize.cc @@ -14,13 +14,13 @@ * limitations under the License. */ #include -#include "src/runtime/kernel/arm/opclib/resize.h" -#include "src/runtime/kernel/arm/opclib/common_func.h" +#include "src/runtime/kernel/arm/nnacl/resize.h" +#include "src/runtime/kernel/arm/nnacl/common_func.h" int ResizeBilinear(const float *input_data, float *output_data, const int *input_shape, const int *output_shape, bool align_corners, int tid, int thread_num) { if (input_data == nullptr || output_data == nullptr || input_shape == nullptr || output_shape == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } // nhwc (memory layout is nc4hw4) int n = input_shape[0]; @@ -105,7 +105,7 @@ int ResizeBilinear(const float *input_data, float *output_data, const int *input } } } - return OPCLIB_OK; + return NNACL_OK; } int ResizeNearestNeighbor(const float *input_data, float *output_data, const int *input_shape, const int *output_shape, @@ -130,6 +130,6 @@ int ResizeNearestNeighbor(const float *input_data, float *output_data, const int } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/resize.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/resize.h similarity index 81% rename from mindspore/lite/src/runtime/kernel/arm/opclib/resize.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/resize.h index 7a7033d12a..e7fd4a6876 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/resize.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/resize.h @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESIZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESIZE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESIZE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESIZE_H_ #ifdef ENABLE_NEON #include #endif #include -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" #include "schema/ops_generated.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" using mindspore::schema::ResizeMethod; @@ -41,5 +41,5 @@ int ResizeBilinear(const float *input_data, float *output_data, const int *input int ResizeNearestNeighbor(const float *input_data, float *output_data, const int *input_shape, const int *output_shape, int tid, int thread_num); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_RESIZE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_RESIZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/reverse_sequence.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/reverse_sequence.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.cc index 051a17a88a..7308716fbb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/reverse_sequence.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/reverse_sequence.h" +#include "src/runtime/kernel/arm/nnacl/reverse_sequence.h" #include -#include "src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "src/runtime/kernel/arm/nnacl/arithmetic_common.h" void ReverseSequence(float *input0, int *input1, float *output, ReverseSequenceParameter *para) { (void)memcpy(output, input0, para->total_data_size_); diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/reverse_sequence.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/reverse_sequence.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.h index 4307a09a3c..582bcd35eb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/reverse_sequence.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/reverse_sequence.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_REVERSE_SEQUENCE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_REVERSE_SEQUENCE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_SEQUENCE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_SEQUENCE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ReverseSequenceParameter { OpParameter op_parameter_; @@ -38,5 +38,5 @@ struct ReverseSequenceParameter { void ReverseSequence(float *input0, int *input1, float *output, ReverseSequenceParameter *para); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_REVERSE_SEQUENCE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_REVERSE_SEQUENCE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/scale.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/scale.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/scale.cc index bedc15212b..37405b67c1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/scale.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/scale.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/scale.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int DoScale(float *in_data, float *out_data, float *scale, float *offset, int task_id, ScaleParameter *scale_param) { if (in_data == nullptr || out_data == nullptr || scale == nullptr || offset == nullptr || scale_param == nullptr) { - return OPCLIB_ERR; + return NNACL_ERR; } if (scale_param->has_offset_) { @@ -45,5 +45,5 @@ int DoScale(float *in_data, float *out_data, float *scale, float *offset, int ta } } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/scale.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.h similarity index 79% rename from mindspore/lite/src/runtime/kernel/arm/opclib/scale.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/scale.h index 01189ab0e3..aaa77b7dda 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/scale.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/scale.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SCALE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SCALE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCALE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCALE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ScaleParameter { OpParameter op_parameter_; @@ -30,4 +30,5 @@ struct ScaleParameter { }; int DoScale(float *in_data, float *out_data, float *scale, float *offset, int task_id, ScaleParameter *scale_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SCALE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCALE_H_ + diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/scatter_nd.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.cc similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/opclib/scatter_nd.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.cc index 26a205338a..0194e928af 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/scatter_nd.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/scatter_nd.h" +#include "src/runtime/kernel/arm/nnacl/scatter_nd.h" #include #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int DoScatterND(float *output_ptr, float *update, int *output_unit_offsets, int unit_size, int num_units) { if (output_ptr == nullptr || update == nullptr || output_unit_offsets == nullptr || unit_size <= 0 || num_units < 0) { - return OPCLIB_ERR; + return NNACL_ERR; } for (int i = 0; i < num_units; i++) { (void)memcpy(output_ptr + output_unit_offsets[i], update + unit_size * i, unit_size * sizeof(float)); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/scatter_nd.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/scatter_nd.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.h index c3f8a4d6ab..adbe179bed 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/scatter_nd.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/scatter_nd.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SCATTER_ND_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SCATTER_ND_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCATTER_ND_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCATTER_ND_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ScatterNDParameter { OpParameter op_parameter_; }; int DoScatterND(float *output_ptr, float *update, int *output_unit_offsets, int unit_size, int num_units); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SCATTER_ND_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SCATTER_ND_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/shape.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/shape.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/shape.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/shape.h index ad63aa7617..bfcbc4f8dc 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/shape.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/shape.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_KERNEL_CPU_ARM_OPCLIB_SHAPE_H_ -#define MINDSPORE_CCSRC_KERNEL_CPU_ARM_OPCLIB_SHAPE_H_ +#ifndef MINDSPORE_CCSRC_KERNEL_CPU_ARM_NNACL_SHAPE_H_ +#define MINDSPORE_CCSRC_KERNEL_CPU_ARM_NNACL_SHAPE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct ShapeParameter { OpParameter op_parameter_; }; -#endif // MINDSPORE_CCSRC_KERNEL_CPU_ARM_OPCLIB_SHAPE_H_ +#endif // MINDSPORE_CCSRC_KERNEL_CPU_ARM_NNACL_SHAPE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/softmax_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h similarity index 73% rename from mindspore/lite/src/runtime/kernel/arm/opclib/softmax_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h index 23c3424f94..b0fc83ce3e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/softmax_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/softmax_parameter.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SOFTMAX_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SOFTMAX_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SOFTMAX_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SOFTMAX_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct SoftmaxParameter { OpParameter op_parameter_; @@ -27,4 +27,4 @@ struct SoftmaxParameter { int input_shape_[4]; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SOFTMAX_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SOFTMAX_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/sparse_to_dense.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/sparse_to_dense.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.cc index 372c38e4bc..17b80564b3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/sparse_to_dense.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/sparse_to_dense.h" +#include "src/runtime/kernel/arm/nnacl/sparse_to_dense.h" void SparseToDense(int *input, int *output_shape_, float *snum, float *dnum, int sp_num, float *output, SparseToDenseParameter *s2d_param_, int task_id) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/sparse_to_dense.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/sparse_to_dense.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.h index b04e0efa6d..3f048dd817 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/sparse_to_dense.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/sparse_to_dense.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPARSETODENSE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPARSETODENSE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPARSETODENSE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPARSETODENSE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct SparseToDenseParameter { OpParameter op_parameter_; @@ -27,5 +27,5 @@ struct SparseToDenseParameter { void SparseToDense(int *input, int *output_shape_, float *snum, float *dnum, int sp_num, float *output, SparseToDenseParameter *s2d_param_, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPARSETODENCE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPARSETODENCE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/split.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/split.cc similarity index 89% rename from mindspore/lite/src/runtime/kernel/arm/opclib/split.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/split.cc index de74f6f621..712abebe19 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/split.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/split.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/split.h" -#include "src/runtime/kernel/arm/opclib/split_parameter.h" +#include "src/runtime/kernel/arm/nnacl/split.h" +#include "src/runtime/kernel/arm/nnacl/split_parameter.h" #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" int DoSplit(float *in_data, float **out_data, const int *input_shape, int offset, int num_unit, SplitParameter *split_param) { if (in_data == nullptr || out_data == nullptr) { - return OPCLIB_ERR; + return NNACL_ERR; } int num_split = split_param->num_split_; int *split_sizes = split_param->split_sizes_; @@ -55,6 +55,6 @@ int DoSplit(float *in_data, float **out_data, const int *input_shape, int offset src += split_size * in_stride; } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/split.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/split.h similarity index 71% rename from mindspore/lite/src/runtime/kernel/arm/opclib/split.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/split.h index 464442c25a..ff861ff4ca 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/split.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/split.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPLIT_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPLIT_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" -#include "src/runtime/kernel/arm/opclib/split_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" +#include "src/runtime/kernel/arm/nnacl/split_parameter.h" int DoSplit(float *in_data, float **out_data, const int *input_shape, int offset, int num_unit, SplitParameter *split_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPLIT_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/split_parameter.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/split_parameter.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h index ac22028916..30456df654 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/split_parameter.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/split_parameter.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPLIT_PARAMETER_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPLIT_PARAMETER_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_PARAMETER_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_PARAMETER_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct SplitParameter { OpParameter op_parameter_; @@ -30,4 +30,4 @@ struct SplitParameter { int split_count_; }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SPLIT_PARAMETER_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SPLIT_PARAMETER_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/squeeze.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.cc similarity index 94% rename from mindspore/lite/src/runtime/kernel/arm/opclib/squeeze.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.cc index 68307088a7..43e7ffad7c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/squeeze.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/squeeze.h" +#include "src/runtime/kernel/arm/nnacl/squeeze.h" #include int DoSqueeze(float *in_data, float *out_data, size_t data_size) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/squeeze.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.h similarity index 75% rename from mindspore/lite/src/runtime/kernel/arm/opclib/squeeze.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.h index 4c7fdddb1d..5da0637e8a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/squeeze.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/squeeze.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SQUEEZE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SQUEEZE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SQUEEZE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SQUEEZE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct SqueezeParameter { OpParameter op_parameter_; @@ -26,5 +26,5 @@ struct SqueezeParameter { int DoSqueeze(float *input_ptr, float *output_ptr, size_t data_size); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_SQUEEZE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_SQUEEZE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/strassen_matmul.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/strassen_matmul.h similarity index 77% rename from mindspore/lite/src/runtime/kernel/arm/opclib/strassen_matmul.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/strassen_matmul.h index 91414c0e42..c385d3b45f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/strassen_matmul.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/strassen_matmul.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_STRASSEN_MATMUL_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_STRASSEN_MATMUL_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_STRASSEN_MATMUL_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_STRASSEN_MATMUL_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" /* hw*inc4 X inc4*oc4 */ struct StrassenMatMulParameter { @@ -30,5 +30,5 @@ struct StrassenMatMulParameter { int c_stride_{}; /* h * w * 4 */ }; -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_STRASSEN_MATMUL_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_STRASSEN_MATMUL_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/strided_slice.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/strided_slice.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.cc index aa5975b028..0c14eb2f71 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/strided_slice.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/strided_slice.h" -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/strided_slice.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" void PadStridedSliceParameterTo4D(StridedSliceParameter *param) { int32_t begins[DIMENSION_4D]; @@ -47,10 +47,10 @@ void PadStridedSliceParameterTo4D(StridedSliceParameter *param) { int DoStridedSlice(const void *in_data, void *out_data, StridedSliceParameter *param) { if (in_data == nullptr || out_data == nullptr || param == nullptr) { - return OPCLIB_NULL_PTR; + return NNACL_NULL_PTR; } if (param->num_axes_ > DIMENSION_4D) { - return OPCLIB_PARAM_INVALID; + return NNACL_PARAM_INVALID; } int *begins = param->begins_; @@ -82,5 +82,5 @@ int DoStridedSlice(const void *in_data, void *out_data, StridedSliceParameter *p } } } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/strided_slice.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/strided_slice.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.h index 966311b0a1..0e9bcac593 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/strided_slice.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/strided_slice.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_STRIDED_SLICE_H_ -#define MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_STRIDED_SLICE_H_ +#ifndef MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_STRIDED_SLICE_H_ +#define MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_STRIDED_SLICE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct StridedSliceParameter { OpParameter op_parameter_; @@ -30,4 +30,4 @@ struct StridedSliceParameter { }; int DoStridedSlice(const void *inputs, void *output, StridedSliceParameter *param); -#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_OPCLIB_STRIDED_SLICE_H_ +#endif // MINDSPORE_LITE_SRC_BACKEND_ARM_NNACL_STRIDED_SLICE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/tile.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/tile.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/arm/opclib/tile.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/tile.cc index e8129a7714..747a4a51f7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/tile.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/tile.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/tile.h" +#include "src/runtime/kernel/arm/nnacl/tile.h" #include void CopyData(float *input_data, float *output_data, size_t size, size_t multiple) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/tile.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/tile.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/tile.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/tile.h index 5fd736642c..da6d09602e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/tile.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/tile.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TILE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TILE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TILE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TILE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct TileParameter { OpParameter op_parameter_; @@ -31,5 +31,5 @@ struct TileParameter { void Tile(float *input_data, float *output_data, TileParameter *parameter); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TILE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TILE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/transpose.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/transpose.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.cc index b9984aee06..0e1b75db9a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/transpose.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/transpose.h" +#include "src/runtime/kernel/arm/nnacl/transpose.h" #include -#include "src/runtime/kernel/arm/opclib/errorcode.h" +#include "src/runtime/kernel/arm/nnacl/errorcode.h" void TransposeDim2(float *in_data, float *out_data, int *strides, int *out_strides, int *perm, int *output_shape) { const int stride0 = strides[perm[0]]; @@ -88,7 +88,7 @@ void TransposeDim4(float *in_data, float *out_data, int *strides, int *out_strid int DoTranspose(float *in_data, float *out_data, int *input_shape, int *output_shape, TransposeParameter *transpose_param) { if (in_data == nullptr || out_data == nullptr) { - return OPCLIB_ERR; + return NNACL_ERR; } int *perm = transpose_param->perm_; int *strides = transpose_param->strides_; @@ -97,7 +97,7 @@ int DoTranspose(float *in_data, float *out_data, int *input_shape, int *output_s int num_axes = transpose_param->num_axes_; if (num_axes < 2 || num_axes > 4) { - return OPCLIB_ERR; + return NNACL_ERR; } // check if transpose is needed @@ -111,7 +111,7 @@ int DoTranspose(float *in_data, float *out_data, int *input_shape, int *output_s if (!needTranspose) { (void)memcpy(out_data, in_data, data_size); - return OPCLIB_OK; + return NNACL_OK; } if (num_axes == 2) { TransposeDim2(in_data, out_data, strides, out_strides, perm, output_shape); @@ -120,6 +120,6 @@ int DoTranspose(float *in_data, float *out_data, int *input_shape, int *output_s } else if (num_axes == 4) { TransposeDim4(in_data, out_data, strides, out_strides, perm, output_shape); } - return OPCLIB_OK; + return NNACL_OK; } diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/transpose.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h similarity index 83% rename from mindspore/lite/src/runtime/kernel/arm/opclib/transpose.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h index 202ed4f457..80e19b8ae8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/transpose.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/transpose.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TRANSPOSE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TRANSPOSE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TRANSPOSE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TRANSPOSE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct TransposeParameter { OpParameter op_parameter_; @@ -35,5 +35,5 @@ void TransposeDim2(float *in_data, float *out_data, int *strides, int *out_strid void TransposeDim3(float *in_data, float *out_data, int *strides, int *out_strides, int *perm, int *output_shape); void TransposeDim4(float *in_data, float *out_data, int *strides, int *out_strides, int *perm, int *output_shape); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_TRANSPOSE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_TRANSPOSE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/unique.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/unique.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/unique.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/unique.cc index 1917a050e9..9db29931ae 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/unique.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/unique.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/unique.h" +#include "src/runtime/kernel/arm/nnacl/unique.h" int Find(float *array, int len, float target) { for (int i = 0; i < len; ++i) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/unique.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/unique.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/unique.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/unique.h index 65fe60d229..dce4b59319 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/unique.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/unique.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNIQUE_H -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNIQUE_H +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNIQUE_H +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNIQUE_H -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct UniqueParameter { OpParameter op_parameter_; @@ -25,5 +25,5 @@ struct UniqueParameter { void Unique(float *input, int input_len, float *output0, int *output0_len, int *output1); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNIQUE_H +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNIQUE_H diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/unstack.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/unstack.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.cc index 98fdd22f93..5a7fd07b91 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/unstack.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/unstack.h" +#include "src/runtime/kernel/arm/nnacl/unstack.h" #include void Unistack(float *input, float **output, UnstackParameter *para) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/unstack.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h similarity index 76% rename from mindspore/lite/src/runtime/kernel/arm/opclib/unstack.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h index e4fb357783..ee57a810af 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/unstack.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/unstack.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNSTACK_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNSTACK_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSTACK_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSTACK_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct UnstackParameter { OpParameter op_parameter_; @@ -30,5 +30,5 @@ struct UnstackParameter { void Unistack(float *input, float **output, UnstackParameter *para); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_UNSTACK_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_UNSTACK_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/where.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/where.cc similarity index 95% rename from mindspore/lite/src/runtime/kernel/arm/opclib/where.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/where.cc index bd7f302dce..40a4802ab6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/where.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/where.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/where.h" +#include "src/runtime/kernel/arm/nnacl/where.h" void Where(bool *input, float *input1, float *input2, float *output, WhereParameter *where_param_, int task_id) { for (int i = task_id; i < where_param_->number_; i += where_param_->op_parameter_.thread_num_) { diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/where.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/where.h similarity index 78% rename from mindspore/lite/src/runtime/kernel/arm/opclib/where.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/where.h index f0dda220a4..73145fd9ec 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/where.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/where.h @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WHERE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WHERE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WHERE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WHERE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" struct WhereParameter { OpParameter op_parameter_; @@ -29,5 +29,5 @@ struct WhereParameter { void Where(bool *input, float *input1, float *input2, float *output, WhereParameter *where_param_, int task_id); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WHERE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WHERE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_transform.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/winograd_transform.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.cc index 697e2f04f7..23b40f6639 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_transform.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/winograd_transform.h" +#include "src/runtime/kernel/arm/nnacl/winograd_transform.h" // fp32 conv winograd void WinogradInputTransform(const float *input_data, float *trans_input, float *tmp_data, int cal_num, diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_transform.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.h similarity index 87% rename from mindspore/lite/src/runtime/kernel/arm/opclib/winograd_transform.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.h index d251f4859c..e31e2e1930 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_transform.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_transform.h @@ -14,17 +14,17 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WINOGRAD_TRANSFORM_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WINOGRAD_TRANSFORM_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_TRANSFORM_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_TRANSFORM_H_ #ifdef ENABLE_ARM #include #endif #include -#include "src/runtime/kernel/arm/opclib/pack.h" -#include "src/runtime/kernel/arm/opclib/fp32/conv.h" -#include "src/runtime/kernel/arm/opclib/winograd_utils.h" -#include "src/runtime/kernel/arm/opclib/quantization/fixed_point.h" +#include "src/runtime/kernel/arm/nnacl/pack.h" +#include "src/runtime/kernel/arm/nnacl/fp32/conv.h" +#include "src/runtime/kernel/arm/nnacl/winograd_utils.h" +#include "src/runtime/kernel/arm/nnacl/quantization/fixed_point.h" #define OUPUT_UNIT 2 @@ -67,4 +67,4 @@ void Conv3x3Uint8OutputUnit(const int32_t *gemm_out, const int32_t *bias_data, i void Conv3x3Uint8OutputTransform(const int32_t *gemm_out, int8_t *out_data, const int32_t *bias_data, int start_index, int real_cal_num, int out_w_block, ConvParameter *conv_param); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WINOGRAD_TRANSFORM_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_TRANSFORM_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_utils.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/arm/opclib/winograd_utils.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.cc index 44707c1f66..0c26437018 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_utils.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/winograd_utils.h" +#include "src/runtime/kernel/arm/nnacl/winograd_utils.h" #include #define MIN_UNIT 2 diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_utils.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.h similarity index 85% rename from mindspore/lite/src/runtime/kernel/arm/opclib/winograd_utils.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.h index 55425a4a3e..d7a7b7a69c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/winograd_utils.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/winograd_utils.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WINOGRAD_UTILS_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WINOGRAD_UTILS_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_UTILS_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_UTILS_H_ #ifdef ENABLE_ARM #include #endif -#include "src/runtime/kernel/arm/opclib/matrix_table.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/matrix_table.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" using InputTransformUnitFunc = void (*)(const float *src_data, float *dst_data, int src_step, int dst_step); using OutputTransformUnitFunc = void (*)(const float *src_data, float *dst_data, const float *bias_data, int src_step, @@ -54,5 +54,5 @@ InputTransformUnitFunc GetInputTransFunc(int input_unit); OutputTransformUnitFunc GetOutputTransFunc(int input_unit, int output_unit); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_WINOGRAD_UTILS_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_WINOGRAD_UTILS_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/zeroslike.cc b/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.cc similarity index 93% rename from mindspore/lite/src/runtime/kernel/arm/opclib/zeroslike.cc rename to mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.cc index 9d206e2cc5..697d77e6ee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/zeroslike.cc +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/runtime/kernel/arm/opclib/zeroslike.h" +#include "src/runtime/kernel/arm/nnacl/zeroslike.h" #include #include diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/zeroslike.h b/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.h similarity index 72% rename from mindspore/lite/src/runtime/kernel/arm/opclib/zeroslike.h rename to mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.h index b2e2fa35a4..8948ad39fa 100644 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/zeroslike.h +++ b/mindspore/lite/src/runtime/kernel/arm/nnacl/zeroslike.h @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ZEROSLIKE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ZEROSLIKE_H_ +#ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ZEROSLIKE_H_ +#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ZEROSLIKE_H_ -#include "src/runtime/kernel/arm/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" void ApproximateZerosLike(float *input, float *output, int number); -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ZEROSLIKE_H_ +#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_NNACL_ZEROSLIKE_H_ diff --git a/mindspore/lite/src/runtime/kernel/arm/opclib/errorcode.h b/mindspore/lite/src/runtime/kernel/arm/opclib/errorcode.h deleted file mode 100644 index 3d6eeb80b2..0000000000 --- a/mindspore/lite/src/runtime/kernel/arm/opclib/errorcode.h +++ /dev/null @@ -1,47 +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_OPCLIB_ERRORCODE_H_ -#define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ERRORCODE_H_ - -enum ErrorCodeCommonEnum { - OPCLIB_OK = 0, - OPCLIB_ERR = 1, - OPCLIB_NULL_PTR, - OPCLIB_PARAM_INVALID, - OPLIB_COMMON_END = 9999 -}; - -enum ErrorCodeFp32OpEnum { - OPCLIB_ERRCODE_OP_FP32_START = 10000, - OPCLIB_ERRCODE_STRASSEN_RECURSION_MALLOC, - OPCLIB_ERRCODE_REVERSE_MALLOC, - OPCLIB_ERRCODE_SQRT_NEGATIVE, - OPCLIB_ERRCODE_RSQRT_NEGATIVE_OR_ZERO, - OPCLIB_ERRCODE_LOG_NEGATIVE_OR_ZERO, - OPCLIB_ERRCODE_DIVISOR_ZERO, - OPCLIB_ERRCODE_INDEX_OUT_OF_RANGE, - OPCLIB_ERRCODE_OP_FP32_END = 19999 -}; - -enum ErrorCodeFp16OpEnum { OPCLIB_ERRCODE_OP_FP16_START = 20000, OPCLIB_ERRCODE_OP_FP16_END = 29999 }; - -enum ErrorCodeUint8OpEnum { OPCLIB_ERRCODE_OP_UINT8_START = 30000, OPCLIB_ERRCODE_OP_UINT8_END = 39999 }; - -enum ErrorCodeInt8OpEnum { OPCLIB_ERRCODE_OP_INT8_START = 40000, OPCLIB_ERRCODE_OP_INT8_END = 49999 }; - -#endif // MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_OPCLIB_ERRORCODE_H_ - 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 c95ae57e5c..b3299d2a53 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h @@ -19,8 +19,8 @@ #include -#include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/lite_kernel.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #include "src/runtime/opencl/opencl_runtime.h" #ifdef ENABLE_FP16 diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h index 0baefd3aac..f757b1968a 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/convolution.h @@ -22,7 +22,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/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/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 7761addbbe..fa969c31f5 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc @@ -21,8 +21,8 @@ #include "src/kernel_registry.h" #include "src/runtime/opencl/opencl_runtime.h" #include "src/runtime/kernel/arm/fp32/convolution_depthwise.h" -#include "src/runtime/kernel/arm/opclib/pack.h" #include "include/errorcode.h" +#include "src/runtime/kernel/arm/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 f4d0a1b8a2..90055dd1c3 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,8 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" + #include "src/runtime/opencl/opencl_runtime.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc index 0b7088f274..199d833c44 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/opclib/fp32/matmul.h" +#include "src/runtime/kernel/arm/nnacl/fp32/matmul.h" #include "src/runtime/kernel/opencl/kernel/matmul.h" #ifndef PROGRAM_WITH_IL #include "src/runtime/kernel/opencl/cl/fp16/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 fe2ef2b47c..beb874cc67 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.h @@ -19,8 +19,9 @@ #include + #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "src/runtime/kernel/arm/nnacl/conv_parameter.h" #include "src/runtime/opencl/opencl_runtime.h" #ifdef ENABLE_FP16 diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h index 53eec7e06f..d81ce4c569 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/opclib/fp32/pooling.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling.h" #include "src/runtime/opencl/opencl_runtime.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 93fdf3e818..e4e3ce70ac 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/opclib/fp32/softmax.h" +#include "src/runtime/kernel/arm/nnacl/fp32/softmax.h" #include "src/runtime/opencl/opencl_runtime.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/opencl/utils.h b/mindspore/lite/src/runtime/kernel/opencl/utils.h index d646f4b5be..83536823ee 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/opclib/op_base.h" +#include "src/runtime/kernel/arm/nnacl/op_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/opencl/opencl_executor.cc b/mindspore/lite/src/runtime/opencl/opencl_executor.cc index e57d1c3073..be273ea523 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/opclib/pack.h" +#include "src/runtime/kernel/arm/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 c9ff6db684..d28bb2be6d 100644 --- a/mindspore/lite/test/CMakeLists.txt +++ b/mindspore/lite/test/CMakeLists.txt @@ -78,15 +78,15 @@ 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/opclib/*.cc - ${LITE_DIR}/src/runtime/kernel/arm/opclib/fp32/*.cc - ${LITE_DIR}/src/runtime/kernel/arm/opclib/int8/*.cc - ${LITE_DIR}/src/runtime/kernel/arm/opclib/quantization/*.cc + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/*.cc + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/fp32/*.cc + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/int8/*.cc + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/quantization/*.cc ) if (PLATFORM_ARM64) # assembly - file(GLOB TEST_ASSEMBLY_SRC ${LITE_DIR}/src/runtime/kernel/arm/opclib/assembly/arm64/*.s - ${LITE_DIR}/src/runtime/kernel/arm/opclib/assembly/arm64/*.S) + 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) set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C) set(KERNEL_OP_SRC @@ -97,8 +97,8 @@ endif() if (PLATFORM_ARM32) # assembly file(GLOB TEST_ASSEMBLY_SRC - ${LITE_DIR}/src/runtime/kernel/arm/opclib/assembly/arm32/*.S - ${LITE_DIR}/src/runtime/kernel/arm/opclib/assembly/arm32/*.s) + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.S + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/assembly/arm32/*.s) set_property(SOURCE ${TEST_ASSEMBLY_SRC} PROPERTY LANGUAGE C) set(KERNEL_OP_SRC ${KERNEL_OP_SRC} @@ -108,7 +108,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/opclib/fp16/*.cc + ${LITE_DIR}/src/runtime/kernel/arm/nnacl/fp16/*.cc ) set(KERNEL_OP_SRC ${KERNEL_OP_SRC} @@ -208,19 +208,19 @@ if(BUILD_CONVERTER) ${LITE_DIR}/tools/converter/converter.cc ${LITE_DIR}/tools/converter/parser/onnx/onnx.pb.cc ${LITE_DIR}/test/st/converter_test.cc - ${LITE_DIR}/test/ut/src/gllo/fusion/conv_activation_fusion_test.cc - ${LITE_DIR}/test/ut/src/gllo/fusion/conv_biasadd_fusion_test.cc - ${LITE_DIR}/test/ut/src/gllo/fusion/conv_bn_fusion_test.cc - ${LITE_DIR}/test/ut/src/gllo/fusion/conv_scale_fusion_test.cc - ${LITE_DIR}/src/gllo/common/node_pass.cc - ${LITE_DIR}/src/gllo/common/optimizer.cc - ${LITE_DIR}/src/gllo/common/pass_manager.cc - ${LITE_DIR}/src/gllo/common/gllo_utils.cc - ${LITE_DIR}/src/gllo/fusion/conv_biasadd_fusion.cc - ${LITE_DIR}/src/gllo/fusion/conv_activation_fusion.cc - ${LITE_DIR}/src/gllo/fusion/conv_transform_fusion.cc - ${LITE_DIR}/src/gllo/fusion/conv_scale_fusion.cc - ${LITE_DIR}/src/gllo/fusion/conv_bn_fusion.cc + ${LITE_DIR}/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc + ${LITE_DIR}/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc + ${LITE_DIR}/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc + ${LITE_DIR}/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc + ${LITE_DIR}/tools/optimizer/common/node_pass.cc + ${LITE_DIR}/tools/optimizer/common/optimizer.cc + ${LITE_DIR}/tools/optimizer/common/pass_manager.cc + ${LITE_DIR}/tools/optimizer/common/gllo_utils.cc + ${LITE_DIR}/tools/optimizer/fusion/conv_biasadd_fusion.cc + ${LITE_DIR}/tools/optimizer/fusion/conv_activation_fusion.cc + ${LITE_DIR}/tools/optimizer/fusion/conv_transform_fusion.cc + ${LITE_DIR}/tools/optimizer/fusion/conv_scale_fusion.cc + ${LITE_DIR}/tools/optimizer/fusion/conv_bn_fusion.cc ) endif() ### train 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 c184f7cd02..c3283f335f 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/opclib/pack.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/pack.h" namespace mindspore { class TestPack : public mindspore::Common { 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 305183b0d5..16ea9e1f75 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/opclib/strided_slice.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 655e4e4dd9..552240f730 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/opclib/fp16/conv_fp16.h" +#include "src/runtime/kernel/arm/nnacl/fp16/conv_fp16.h" namespace mindspore { class TestConvolutionFp16 : public mindspore::Common { 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 2d84a0276e..0fdfe5f29e 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/opclib/fp32/activation.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 4eea25e0b0..4a56abd804 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/opclib/fp32/arg_min_max.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/arg_min_max.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.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" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_grad_fp32_tests.cc index 48d5c93e56..fe4a3b7cf2 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/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/opclib/fp32/reduce.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/reduce.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_grad.h" #include "mindspore/lite/src/kernel_registry.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 44cc3deab0..e5b75c5ed4 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/opclib/batch_to_space.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/batch_to_space.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 8f48b472fe..8e8c191866 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,8 +16,8 @@ #include #include "mindspore/core/utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/batchnorm.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fused_batchnorm.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/batchnorm.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fused_batchnorm.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/common/file_utils.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 9cf96fb538..da3c661697 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/opclib/matmul.h" -#include "src/runtime/kernel/arm/opclib/strassen_matmul.h" +#include "src/runtime/kernel/arm/nnacl/matmul.h" +#include "src/runtime/kernel/arm/nnacl/strassen_matmul.h" namespace mindspore { using mindspore::lite::tensor::Tensor; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_grad_fp32_tests.cc index ef501fa655..7847e013a3 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_grad_fp32_tests.cc @@ -23,7 +23,7 @@ #include "src/common/file_utils_ext.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_filter.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/convolution_grad_input.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/conv_parameter.h" +#include "mindspore/lite/src/runtime/kernel/arm/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/crop_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc index efd68219d1..89704cfa9f 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/opclib/fp32/crop.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/crop.h" namespace mindspore { class CropTestFp32 : public mindspore::Common { 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 29e7797b44..727f86f3b9 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 @@ -20,7 +20,7 @@ #include "src/common/file_utils.h" #include "mindspore/lite/src/ops/ops.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/deconv.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/deconv.h" namespace mindspore { class TestDeConvolutionFp32 : public mindspore::Common { 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 f14949ed8b..2c22d10249 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/opclib/depth_to_space.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_common.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/depth_to_space.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/arithmetic_common.h" namespace mindspore { 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 98b7113749..9a226fef65 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/opclib/fp32/matmul.h" +#include "src/runtime/kernel/arm/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 5af2f639ff..f591548c00 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/opclib/fp32/lstm.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/lstm.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/ops/ops.h" 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 8fa265f730..8ce0da32d0 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/opclib/fp32/matmul.h" +#include "mindspore/lite/src/runtime/kernel/arm/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/pooling_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/pooling_grad_fp32_tests.cc index 0dace8d7cd..fb9e262e28 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/pooling_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/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/pooling_grad.h" -#include "src/runtime/kernel/arm/opclib/fp32/pooling_grad.h" +#include "src/runtime/kernel/arm/nnacl/fp32/pooling_grad.h" namespace mindspore { class TestPoolingGradFp32 : public mindspore::Common { 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 3088ca9a6e..c6b1e5c7e3 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/opclib/fp32/space_to_batch.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 c00a0a3e34..a758336be2 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/opclib/fp32/space_to_depth.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 d1ec28148d..442f490c0a 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/opclib/pack.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/strassen_matmul.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/conv_parameter.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" namespace mindspore { class TestStrassenFp32 : public mindspore::Common { 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 aaeda8026d..b45037d36c 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/opclib/fp32/topk.h" +#include "mindspore/lite/src/runtime/kernel/arm/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/arithmetic_self_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc index c64560513f..3ab4e5f26b 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 @@ -17,7 +17,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/arithmetic_self_parameter.h" +#include "mindspore/lite/src/runtime/kernel/arm/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/crop_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc index fc151b74bb..d94ae6eefe 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 @@ -17,7 +17,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/crop_parameter.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 162808ced6..632abad686 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 @@ -19,9 +19,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/opclib/pack.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/matmul.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/int8/deconv.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/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 b650ade823..d5ca51733f 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 @@ -16,8 +16,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/opclib/common_func.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/quantization/quantize.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/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 ec84f500d7..ef2f1b0e77 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 @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/activation.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/activation.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 8922272ed1..36d7ecd23e 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 @@ -16,8 +16,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/opclib/quantization/quantize.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/common_func.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/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.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 51745ac8af..4230ec4ae4 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 @@ -19,7 +19,7 @@ #include "src/ir/tensor.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "src/runtime/kernel/arm/opclib/pad_parameter.h" +#include "src/runtime/kernel/arm/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/quant_dtype_cast_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc index 84a6e7a5bf..89b2385b3f 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 @@ -18,7 +18,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/opclib/int8/quant_dtype_cast.h" +#include "mindspore/lite/src/runtime/kernel/arm/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/softmax_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc index 3cab67205a..1c22a52dee 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 @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/softmax_int8.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/softmax_parameter.h" +#include "mindspore/lite/src/runtime/kernel/arm/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 493d5f709b..8437edaa76 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 @@ -17,7 +17,7 @@ #include #include "utils/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/split_parameter.h" +#include "mindspore/lite/src/runtime/kernel/arm/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/topk_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc index 54ec2f738c..1334f72b35 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 @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/src/runtime/kernel/arm/opclib/fp32/topk.h" +#include "mindspore/lite/src/runtime/kernel/arm/nnacl/fp32/topk.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { 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 54f8f65292..59e4d93288 100755 --- 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/opclib/pack.h" +#include "src/runtime/kernel/arm/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/gllo/fusion/conv_activation_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc similarity index 100% rename from mindspore/lite/test/ut/src/gllo/fusion/conv_activation_fusion_test.cc rename to mindspore/lite/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc diff --git a/mindspore/lite/test/ut/src/gllo/fusion/conv_biasadd_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc similarity index 100% rename from mindspore/lite/test/ut/src/gllo/fusion/conv_biasadd_fusion_test.cc rename to mindspore/lite/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc diff --git a/mindspore/lite/test/ut/src/gllo/fusion/conv_bn_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc similarity index 100% rename from mindspore/lite/test/ut/src/gllo/fusion/conv_bn_fusion_test.cc rename to mindspore/lite/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc diff --git a/mindspore/lite/test/ut/src/gllo/fusion/conv_scale_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc similarity index 100% rename from mindspore/lite/test/ut/src/gllo/fusion/conv_scale_fusion_test.cc rename to mindspore/lite/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc diff --git a/mindspore/lite/tools/converter/CMakeLists.txt b/mindspore/lite/tools/converter/CMakeLists.txt index a40fcb1a18..0be9c88b95 100644 --- a/mindspore/lite/tools/converter/CMakeLists.txt +++ b/mindspore/lite/tools/converter/CMakeLists.txt @@ -74,20 +74,20 @@ file(GLOB_RECURSE CONVERTER_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/anf_importer/import_from_protobuf.cc ${CMAKE_CURRENT_SOURCE_DIR}/parser/onnx/onnx.pb.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/common/node_pass.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/common/optimizer.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/common/pass_manager.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/common/gllo_utils.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/fusion/conv_biasadd_fusion.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/fusion/conv_activation_fusion.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/fusion/conv_transform_fusion.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/fusion/conv_scale_fusion.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/gllo/fusion/conv_bn_fusion.cc + ../optimizer/common/node_pass.cc + ../optimizer/common/optimizer.cc + ../optimizer/common/pass_manager.cc + ../optimizer/common/gllo_utils.cc + ../optimizer/fusion/conv_biasadd_fusion.cc + ../optimizer/fusion/conv_activation_fusion.cc + ../optimizer/fusion/conv_transform_fusion.cc + ../optimizer/fusion/conv_scale_fusion.cc + ../optimizer/fusion/conv_bn_fusion.cc ) add_subdirectory(parser/caffe) add_subdirectory(parser/tflite) -add_subdirectory(optimizer) +add_subdirectory(legacy_optimizer) add_subdirectory(quantizer) add_executable(converter_lite diff --git a/mindspore/lite/tools/converter/anf_transform.cc b/mindspore/lite/tools/converter/anf_transform.cc index 7afab29e18..5c8fcf2c7f 100644 --- a/mindspore/lite/tools/converter/anf_transform.cc +++ b/mindspore/lite/tools/converter/anf_transform.cc @@ -18,10 +18,10 @@ #include #include #include "utils/log_adapter.h" -#include "mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.h" -#include "mindspore/lite/src/gllo/fusion/conv_activation_fusion.h" -#include "mindspore/lite/src/gllo/fusion/conv_scale_fusion.h" -#include "mindspore/lite/src/gllo/fusion/conv_bn_fusion.h" +#include "mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h" +#include "mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h" +#include "mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.h" +#include "mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.h" using std::string; namespace mindspore { diff --git a/mindspore/lite/tools/converter/graphdef_transform.cc b/mindspore/lite/tools/converter/graphdef_transform.cc index 0ff3814ed3..d0240ed9f3 100644 --- a/mindspore/lite/tools/converter/graphdef_transform.cc +++ b/mindspore/lite/tools/converter/graphdef_transform.cc @@ -21,37 +21,37 @@ #include "utils/log_adapter.h" #include "src/common/op_utils.h" #include "tools/converter/converter_flags.h" -#include "tools/converter/optimizer/fusion/conv_bn_fusion_pass.h" -#include "tools/converter/optimizer/fusion/conv_scale_fusion_pass.h" -#include "tools/converter/optimizer/fusion/conv_relu_fusion_pass.h" -#include "tools/converter/optimizer/fusion/conv_relu6_fusion_pass.h" -#include "tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.h" -// #include "tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.h" -#include "tools/converter/optimizer/fusion/format_trans_fusion_pass.h" -// #include "tools/converter/optimizer/fusion/quant_cast_fusion_pass.h" -// #include "tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.h" +// #include "tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.h" +// #include "tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.h" +// #include "tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.h" // -// #include "tools/converter/optimizer/const_fold/add_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/cast_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/mul_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/range_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/reshape_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/shape_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/slice_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/stack_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/sub_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/tile_const_fold_pass.h" -// #include "tools/converter/optimizer/const_fold/transpose_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.h" +// #include "tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.h" // -#include "tools/converter/optimizer/node/weight_format_pass.h" -#include "tools/converter/optimizer/graph/format_trans_pass.h" -#include "tools/converter/optimizer/graph/isolated_node_remove_pass.h" -#include "tools/converter/optimizer/graph/unused_node_remove_pass.h" -#include "tools/converter/optimizer/graph/topological_sort_pass.h" +#include "tools/converter/legacy_optimizer/node/weight_format_pass.h" +#include "tools/converter/legacy_optimizer/graph/format_trans_pass.h" +#include "tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.h" +#include "tools/converter/legacy_optimizer/graph/unused_node_remove_pass.h" +#include "tools/converter/legacy_optimizer/graph/topological_sort_pass.h" #include "tools/converter/converter.h" diff --git a/mindspore/lite/tools/converter/graphdef_transform.h b/mindspore/lite/tools/converter/graphdef_transform.h index aed9feba5a..b50579ac99 100644 --- a/mindspore/lite/tools/converter/graphdef_transform.h +++ b/mindspore/lite/tools/converter/graphdef_transform.h @@ -26,7 +26,7 @@ namespace mindspore { namespace lite { /* - * transform GraphDef by fusion optimizer and quantizer + * transform GraphDef by fusion legacy_optimizer and quantizer * */ class GraphDefTransform { diff --git a/mindspore/lite/tools/converter/optimizer/CMakeLists.txt b/mindspore/lite/tools/converter/legacy_optimizer/CMakeLists.txt similarity index 100% rename from mindspore/lite/tools/converter/optimizer/CMakeLists.txt rename to mindspore/lite/tools/converter/legacy_optimizer/CMakeLists.txt diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/CMakeLists.txt b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/CMakeLists.txt similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/CMakeLists.txt rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/CMakeLists.txt diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/add_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.cc similarity index 97% rename from mindspore/lite/tools/converter/optimizer/const_fold/add_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.cc index f74ba7e268..b4df8f946f 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/add_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/add_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/add.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/add_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/add_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/add_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/cast_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/cast_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.cc index 821018b7d3..1d3da9fda8 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/cast_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/cast_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/cast.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/cast_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/cast_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/cast_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.cc index 360181fb8a..17cc102a50 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.h" #include "src/operator/cpu/creator/concat.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/concat_v2_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/concat_v2_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/const_fold_pass.cc similarity index 98% rename from mindspore/lite/tools/converter/optimizer/const_fold/const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/const_fold_pass.cc index 30905c33da..8d12c1d4c9 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/const_fold_pass.h" #include #include "utils/log_adapter.h" #include "converter/common/graph_util.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.cc index 9bf262d0f1..4e7e80cacb 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/expand_dim.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/expand_dims_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/expand_dims_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/mul_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.cc similarity index 97% rename from mindspore/lite/tools/converter/optimizer/const_fold/mul_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.cc index e75308ec6d..0c5be36892 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/mul_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/mul_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.h" #include "utils/log_adapter.h" #include "converter/common/tensor_util.h" #include "converter/common/converter_op_utils.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/mul_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/mul_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/mul_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/range_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/range_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.cc index 6552a7af48..d79b60007c 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/range_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/range_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/range.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/range_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/range_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/range_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/reshape_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/reshape_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.cc index 2a42fd0633..e40c09adea 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/reshape_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/reshape_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/reshape.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/reshape_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/reshape_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/reshape_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.cc index 1f912eccd2..849eca570e 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/fp32/rsqrt_fp32.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/rsqrt_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/rsqrt_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/shape_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/shape_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.cc index d3d18b8715..7b69eb0af6 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/shape_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/shape_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.h" #include "src/operator/cpu/creator/shape.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/shape_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/shape_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/shape_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/slice_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/slice_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.cc index 88aa527635..8c3c4ba345 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/slice_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/slice_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.h" #include "src/operator/cpu/creator/slice.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/slice_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/slice_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/slice_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/stack_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/stack_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.cc index b562e2506d..6cf4d9d060 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/stack_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/stack_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.h" #include "src/operator/cpu/creator/stack.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/stack_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/stack_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/stack_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.cc index abc84ffcaf..2a42b1e5b0 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.h" #include "src/operator/cpu/creator/strided_slice.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/strided_slice_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/strided_slice_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/sub_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.cc similarity index 97% rename from mindspore/lite/tools/converter/optimizer/const_fold/sub_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.cc index fd4c8e4305..8575c8d4ff 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/sub_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/sub_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.h" #include "utils/log_adapter.h" #include "converter/common/tensor_util.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/sub_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/sub_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/sub_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/tile_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/tile_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.cc index 0f122fa08c..efa50c7b14 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/tile_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/tile_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/tile.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/tile_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/tile_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/tile_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/transpose_const_fold_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.cc similarity index 96% rename from mindspore/lite/tools/converter/optimizer/const_fold/transpose_const_fold_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.cc index 5a171efa2b..d76a2ca581 100644 --- a/mindspore/lite/tools/converter/optimizer/const_fold/transpose_const_fold_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/const_fold/transpose_const_fold_pass.h" +#include "tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.h" #include "utils/log_adapter.h" #include "src/operator/cpu/creator/transpose.h" diff --git a/mindspore/lite/tools/converter/optimizer/const_fold/transpose_const_fold_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/const_fold/transpose_const_fold_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/const_fold/transpose_const_fold_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/fusion/CMakeLists.txt b/mindspore/lite/tools/converter/legacy_optimizer/fusion/CMakeLists.txt similarity index 100% rename from mindspore/lite/tools/converter/optimizer/fusion/CMakeLists.txt rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/CMakeLists.txt diff --git a/mindspore/lite/tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.cc index a932834c1b..ec1caa520f 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.h" #include #include #include diff --git a/mindspore/lite/tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.h similarity index 97% rename from mindspore/lite/tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.h index fea9f8a258..3fb2ab8ce0 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/batchnorm_fold_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/batchnorm_fold_fusion_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_activation_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.cc similarity index 97% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_activation_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.cc index 085d831d71..d132aa8981 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_activation_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/fusion/conv_activation_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.h" #include #include #include diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_activation_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.h similarity index 95% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_activation_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.h index 748fd42c3b..b760b503d5 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_activation_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.cc index f51789f4e3..093af0ed54 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.h" #include #include #include diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.h similarity index 96% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.h index 41426bfcc9..1f104af2c3 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_biasadd_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_biasadd_fusion_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_bn_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_bn_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.cc index 3ab24737b4..ae63da7a79 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_bn_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.cc @@ -18,7 +18,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/conv_bn_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.h" #include "securec/include/securec.h" #include "include/errorcode.h" #include "schema/inner/model_generated.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_bn_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.h similarity index 91% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_bn_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.h index 9e541ff82b..b7eb7c1d26 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_bn_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.h @@ -20,8 +20,8 @@ #ifndef MINDSPORE_CONV_BN_FUSION_PASS_H #define MINDSPORE_CONV_BN_FUSION_PASS_H -#include "tools/converter/optimizer/fusion/conv_bn_fusion_pass.h" -#include "tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_bn_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu6_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.cc similarity index 94% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_relu6_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.cc index 6b53bdc7a2..8c22b52772 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu6_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.cc @@ -17,7 +17,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/conv_relu6_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.h" #include "include/errorcode.h" #include "schema/inner/model_generated.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu6_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.h similarity index 94% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_relu6_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.h index ada49e8b8d..a500633351 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu6_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu6_fusion_pass.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_PREDICT_CONV_RELU6_FUSION_PASS_H #define MINDSPORE_PREDICT_CONV_RELU6_FUSION_PASS_H -#include "tools/converter/optimizer/fusion/conv_activation_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.h" #include #include #include diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.cc similarity index 95% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_relu_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.cc index 2e0c45a1ed..05a7880bd4 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.cc @@ -17,7 +17,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/conv_relu_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.h" #include "include/errorcode.h" #include "schema/inner/model_generated.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.h similarity index 94% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_relu_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.h index 3af3394089..e7c87cd197 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_relu_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_relu_fusion_pass.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_PREDICT_CONV_RELU_FUSION_PASS_H #define MINDSPORE_PREDICT_CONV_RELU_FUSION_PASS_H -#include "tools/converter/optimizer/fusion/conv_activation_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_activation_fusion_pass.h" #include #include #include diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.cc index 5ed5e55576..618fd9c5ac 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.cc @@ -11,7 +11,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.h" #include "securec/include/securec.h" #include "utils/log_adapter.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.h similarity index 97% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.h index 325fad6a0b..1a9ce07b06 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.h @@ -11,7 +11,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.cc similarity index 98% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_scale_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.cc index fb02626861..56d5b3d262 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.cc @@ -17,7 +17,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/conv_scale_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.h" #include "securec/include/securec.h" #include "utils/log_adapter.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.h similarity index 94% rename from mindspore/lite/tools/converter/optimizer/fusion/conv_scale_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.h index 8c73f01fe2..8c2ed2808c 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/conv_scale_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/conv_scale_fusion_pass.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_PREDICT_CONV_SCALE_FUSION_PASS_H #define MINDSPORE_PREDICT_CONV_SCALE_FUSION_PASS_H -#include "tools/converter/optimizer/fusion/conv_scale_bias_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/conv_scale_bias_fusion_pass.h" #include #include #include diff --git a/mindspore/lite/tools/converter/optimizer/fusion/format_trans_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.cc similarity index 98% rename from mindspore/lite/tools/converter/optimizer/fusion/format_trans_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.cc index 9fb0b75aa4..156c79103a 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/format_trans_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.cc @@ -17,7 +17,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/format_trans_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.h" #include "utils/log_adapter.h" #include "securec/include/securec.h" // #include "utils/log_adapter.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/format_trans_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.h similarity index 96% rename from mindspore/lite/tools/converter/optimizer/fusion/format_trans_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.h index eaab52a4fd..1b77c74d6b 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/format_trans_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/format_trans_fusion_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/fusion/fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pass.cc index e7f498577e..5f081137ff 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pass.cc @@ -23,7 +23,7 @@ #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" #include "utils/log_adapter.h" #include "tools/common/converter_op_utils.h" #include "src/common/utils.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pass.h similarity index 97% rename from mindspore/lite/tools/converter/optimizer/fusion/fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pass.h index b7de4cc830..058b933a65 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pass.h @@ -24,7 +24,7 @@ #include #include "tools/common/converter_op_utils.h" #include "tools/converter/optimizer.h" -#include "tools/converter/optimizer/fusion/fusion_pattern.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pattern.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pattern.cc similarity index 98% rename from mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pattern.cc index 9190c5627f..6779d84ed2 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pattern.cc @@ -16,7 +16,7 @@ #include #include -#include "tools/converter/optimizer/fusion/fusion_pattern.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pattern.h" #include "utils/log_adapter.h" #include "src/common/utils.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pattern.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/fusion/fusion_pattern.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/fusion_pattern.h diff --git a/mindspore/lite/tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.cc index ff461a2a63..aebd15db8d 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.cc @@ -19,7 +19,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.h" #include "utils/log_adapter.h" #include "securec/include/securec.h" // #include "utils/log_adapter.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.h similarity index 97% rename from mindspore/lite/tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.h index 4edc1eca8d..cc8ad536d0 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/matmul_biasadd_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/matmul_biasadd_fusion_pass.h @@ -22,7 +22,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" #include "tools/common/graph_util.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/optimizer/fusion/quant_cast_fusion_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.cc similarity index 98% rename from mindspore/lite/tools/converter/optimizer/fusion/quant_cast_fusion_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.cc index 8b760af808..3bd0712259 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/quant_cast_fusion_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.cc @@ -17,7 +17,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/quant_cast_fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.h" #include "utils/log_adapter.h" #include "securec/include/securec.h" #include "tools/common/graph_util.h" diff --git a/mindspore/lite/tools/converter/optimizer/fusion/quant_cast_fusion_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.h similarity index 96% rename from mindspore/lite/tools/converter/optimizer/fusion/quant_cast_fusion_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.h index 1600fbc702..dad09cfd02 100644 --- a/mindspore/lite/tools/converter/optimizer/fusion/quant_cast_fusion_pass.h +++ b/mindspore/lite/tools/converter/legacy_optimizer/fusion/quant_cast_fusion_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "tools/converter/optimizer/fusion/fusion_pass.h" +#include "tools/converter/legacy_optimizer/fusion/fusion_pass.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/optimizer/graph/CMakeLists.txt b/mindspore/lite/tools/converter/legacy_optimizer/graph/CMakeLists.txt similarity index 100% rename from mindspore/lite/tools/converter/optimizer/graph/CMakeLists.txt rename to mindspore/lite/tools/converter/legacy_optimizer/graph/CMakeLists.txt diff --git a/mindspore/lite/tools/converter/optimizer/graph/format_trans_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/graph/format_trans_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc index c317d308be..5caaf046b4 100644 --- a/mindspore/lite/tools/converter/optimizer/graph/format_trans_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.cc @@ -17,7 +17,7 @@ #include #include #include -#include "tools/converter/optimizer/graph/format_trans_pass.h" +#include "tools/converter/legacy_optimizer/graph/format_trans_pass.h" #include "tools/common/converter_op_utils.h" #include "tools/common/node_util.h" #include "utils/log_adapter.h" diff --git a/mindspore/lite/tools/converter/optimizer/graph/format_trans_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/graph/format_trans_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/graph/format_trans_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/graph/isolated_node_remove_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.cc similarity index 94% rename from mindspore/lite/tools/converter/optimizer/graph/isolated_node_remove_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.cc index 0c2d2c0d3f..b6f0113bfe 100644 --- a/mindspore/lite/tools/converter/optimizer/graph/isolated_node_remove_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.cc @@ -18,7 +18,7 @@ #include #include -#include "tools/converter/optimizer/graph/isolated_node_remove_pass.h" +#include "tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.h" #include "utils/log_adapter.h" #include "tools/common/converter_op_utils.h" #include "src/common/utils.h" diff --git a/mindspore/lite/tools/converter/optimizer/graph/isolated_node_remove_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/graph/isolated_node_remove_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/graph/isolated_node_remove_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/graph/model_input_format_preprocess_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/model_input_format_preprocess_pass.cc similarity index 94% rename from mindspore/lite/tools/converter/optimizer/graph/model_input_format_preprocess_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/graph/model_input_format_preprocess_pass.cc index caac57c18a..b6979b7dbc 100644 --- a/mindspore/lite/tools/converter/optimizer/graph/model_input_format_preprocess_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/model_input_format_preprocess_pass.cc @@ -15,7 +15,7 @@ */ #include -#include "tools/converter/optimizer/graph/model_input_format_preprocess_pass.h" +#include "tools/converter/legacy_optimizer/graph/model_input_format_preprocess_pass.h" #include "utils/log_adapter.h" #include "tools/common/converter_op_utils.h" #include "tools/common/node_util.h" diff --git a/mindspore/lite/tools/converter/optimizer/graph/model_input_format_preprocess_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/graph/model_input_format_preprocess_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/graph/model_input_format_preprocess_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/graph/model_input_format_preprocess_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/graph/topological_sort_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/topological_sort_pass.cc similarity index 97% rename from mindspore/lite/tools/converter/optimizer/graph/topological_sort_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/graph/topological_sort_pass.cc index c9cdfdaa64..0478584f22 100644 --- a/mindspore/lite/tools/converter/optimizer/graph/topological_sort_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/topological_sort_pass.cc @@ -18,7 +18,7 @@ #include #include #include -#include "tools/converter/optimizer/graph/topological_sort_pass.h" +#include "tools/converter/legacy_optimizer/graph/topological_sort_pass.h" #include "tools/common/converter_op_utils.h" #include "utils/log_adapter.h" #include "src/common/utils.h" diff --git a/mindspore/lite/tools/converter/optimizer/graph/topological_sort_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/graph/topological_sort_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/graph/topological_sort_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/graph/topological_sort_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/graph/unused_node_remove_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/unused_node_remove_pass.cc similarity index 94% rename from mindspore/lite/tools/converter/optimizer/graph/unused_node_remove_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/graph/unused_node_remove_pass.cc index c1159c23b5..01968311a6 100644 --- a/mindspore/lite/tools/converter/optimizer/graph/unused_node_remove_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/unused_node_remove_pass.cc @@ -18,7 +18,7 @@ #include #include -#include "mindspore/lite/tools/converter/optimizer/graph/unused_node_remove_pass.h" +#include "mindspore/lite/tools/converter/legacy_optimizer/graph/unused_node_remove_pass.h" #include "utils/log_adapter.h" #include "tools/common/converter_op_utils.h" #include "src/common/utils.h" diff --git a/mindspore/lite/tools/converter/optimizer/graph/unused_node_remove_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/graph/unused_node_remove_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/graph/unused_node_remove_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/graph/unused_node_remove_pass.h diff --git a/mindspore/lite/tools/converter/optimizer/node/CMakeLists.txt b/mindspore/lite/tools/converter/legacy_optimizer/node/CMakeLists.txt similarity index 100% rename from mindspore/lite/tools/converter/optimizer/node/CMakeLists.txt rename to mindspore/lite/tools/converter/legacy_optimizer/node/CMakeLists.txt diff --git a/mindspore/lite/tools/converter/optimizer/node/weight_format_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/node/weight_format_pass.cc similarity index 99% rename from mindspore/lite/tools/converter/optimizer/node/weight_format_pass.cc rename to mindspore/lite/tools/converter/legacy_optimizer/node/weight_format_pass.cc index 359341aa13..5432f58ae3 100644 --- a/mindspore/lite/tools/converter/optimizer/node/weight_format_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/node/weight_format_pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/converter/optimizer/node/weight_format_pass.h" +#include "tools/converter/legacy_optimizer/node/weight_format_pass.h" #include "tools/common/node_util.h" #include "tools/common/tensor_util.h" diff --git a/mindspore/lite/tools/converter/optimizer/node/weight_format_pass.h b/mindspore/lite/tools/converter/legacy_optimizer/node/weight_format_pass.h similarity index 100% rename from mindspore/lite/tools/converter/optimizer/node/weight_format_pass.h rename to mindspore/lite/tools/converter/legacy_optimizer/node/weight_format_pass.h diff --git a/mindspore/lite/src/gllo/common/gllo_utils.cc b/mindspore/lite/tools/optimizer/common/gllo_utils.cc similarity index 99% rename from mindspore/lite/src/gllo/common/gllo_utils.cc rename to mindspore/lite/tools/optimizer/common/gllo_utils.cc index e1d8beee5a..fe091a4463 100644 --- a/mindspore/lite/src/gllo/common/gllo_utils.cc +++ b/mindspore/lite/tools/optimizer/common/gllo_utils.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" #include #include "src/ir/primitive_t_value.h" #include "frontend/operator/ops.h" diff --git a/mindspore/lite/src/gllo/common/gllo_utils.h b/mindspore/lite/tools/optimizer/common/gllo_utils.h similarity index 100% rename from mindspore/lite/src/gllo/common/gllo_utils.h rename to mindspore/lite/tools/optimizer/common/gllo_utils.h diff --git a/mindspore/lite/src/gllo/common/node_pass.cc b/mindspore/lite/tools/optimizer/common/node_pass.cc similarity index 98% rename from mindspore/lite/src/gllo/common/node_pass.cc rename to mindspore/lite/tools/optimizer/common/node_pass.cc index 6bc848cc23..e5ee11d62f 100644 --- a/mindspore/lite/src/gllo/common/node_pass.cc +++ b/mindspore/lite/tools/optimizer/common/node_pass.cc @@ -22,7 +22,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/manager.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/src/gllo/common/optimizer.cc b/mindspore/lite/tools/optimizer/common/optimizer.cc similarity index 98% rename from mindspore/lite/src/gllo/common/optimizer.cc rename to mindspore/lite/tools/optimizer/common/optimizer.cc index 0a8cddfe89..17d176f191 100644 --- a/mindspore/lite/src/gllo/common/optimizer.cc +++ b/mindspore/lite/tools/optimizer/common/optimizer.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/gllo/common/optimizer.h" +#include "tools/optimizer/common/optimizer.h" #include #include diff --git a/mindspore/lite/src/gllo/common/optimizer.h b/mindspore/lite/tools/optimizer/common/optimizer.h similarity index 98% rename from mindspore/lite/src/gllo/common/optimizer.h rename to mindspore/lite/tools/optimizer/common/optimizer.h index fa6fac6938..62191a2053 100644 --- a/mindspore/lite/src/gllo/common/optimizer.h +++ b/mindspore/lite/tools/optimizer/common/optimizer.h @@ -28,7 +28,7 @@ #include "backend/optimizer/common/pass_manager.h" #include "backend/optimizer/common/pattern_engine.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/src/gllo/common/pass.h b/mindspore/lite/tools/optimizer/common/pass.h similarity index 100% rename from mindspore/lite/src/gllo/common/pass.h rename to mindspore/lite/tools/optimizer/common/pass.h diff --git a/mindspore/lite/src/gllo/common/pass_manager.cc b/mindspore/lite/tools/optimizer/common/pass_manager.cc similarity index 100% rename from mindspore/lite/src/gllo/common/pass_manager.cc rename to mindspore/lite/tools/optimizer/common/pass_manager.cc diff --git a/mindspore/lite/src/gllo/fusion/conv_activation_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc similarity index 96% rename from mindspore/lite/src/gllo/fusion/conv_activation_fusion.cc rename to mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc index 2acf051b9e..dcd2fc90d6 100644 --- a/mindspore/lite/src/gllo/fusion/conv_activation_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/gllo/fusion/conv_activation_fusion.h" +#include "tools/optimizer/fusion/conv_activation_fusion.h" #include #include "schema/inner/model_generated.h" #include "src/ir/primitive_t_value.h" #include "utils/utils.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" namespace mindspore::opt { namespace { diff --git a/mindspore/lite/src/gllo/fusion/conv_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h similarity index 97% rename from mindspore/lite/src/gllo/fusion/conv_activation_fusion.h rename to mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h index 760419fbe1..27150fcdda 100644 --- a/mindspore/lite/src/gllo/fusion/conv_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_ACTIVATION_FUSION_H_ #include -#include "src/gllo/common/optimizer.h" +#include "tools/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc similarity index 98% rename from mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.cc rename to mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc index 16cb3b8b36..2d8d6a8678 100644 --- a/mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/gllo/fusion/conv_biasadd_fusion.h" +#include "tools/optimizer/fusion/conv_biasadd_fusion.h" #include #include "src/param_value_lite.h" #include "schema/inner/model_generated.h" #include "src/ir/primitive_t_value.h" #include "utils/utils.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" #include "securec/include/securec.h" namespace mindspore::opt { diff --git a/mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h similarity index 96% rename from mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.h rename to mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h index df0f393ad5..b630c492dc 100644 --- a/mindspore/lite/src/gllo/fusion/conv_biasadd_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_CONV_BIASADD_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_BIASADD_FUSION_H_ -#include "src/gllo/common/optimizer.h" +#include "tools/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/src/gllo/fusion/conv_bn_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.cc similarity index 98% rename from mindspore/lite/src/gllo/fusion/conv_bn_fusion.cc rename to mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.cc index d53f4ad266..5a39798d58 100644 --- a/mindspore/lite/src/gllo/fusion/conv_bn_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/gllo/fusion/conv_bn_fusion.h" +#include "tools/optimizer/fusion/conv_bn_fusion.h" #include #include "src/param_value_lite.h" #include "schema/inner/model_generated.h" #include "src/ir/primitive_t_value.h" #include "utils/utils.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" #include "securec/include/securec.h" namespace mindspore::opt { diff --git a/mindspore/lite/src/gllo/fusion/conv_bn_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.h similarity index 95% rename from mindspore/lite/src/gllo/fusion/conv_bn_fusion.h rename to mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.h index 56dc12a2f9..201e582fcd 100644 --- a/mindspore/lite/src/gllo/fusion/conv_bn_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_bn_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_CONV_BN_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_BN_FUSION_H_ -#include "src/gllo/fusion/conv_transform_fusion.h" +#include "tools/optimizer/fusion/conv_transform_fusion.h" namespace mindspore::opt { class ConvBatchNormFusion : public ConvTransformFusion { diff --git a/mindspore/lite/src/gllo/fusion/conv_scale_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.cc similarity index 97% rename from mindspore/lite/src/gllo/fusion/conv_scale_fusion.cc rename to mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.cc index d4d535c2ce..10aadeda4c 100644 --- a/mindspore/lite/src/gllo/fusion/conv_scale_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/gllo/fusion/conv_scale_fusion.h" +#include "tools/optimizer/fusion/conv_scale_fusion.h" #include #include "src/param_value_lite.h" #include "schema/inner/model_generated.h" #include "src/ir/primitive_t_value.h" #include "utils/utils.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" #include "include/errorcode.h" #include "securec/include/securec.h" diff --git a/mindspore/lite/src/gllo/fusion/conv_scale_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.h similarity index 95% rename from mindspore/lite/src/gllo/fusion/conv_scale_fusion.h rename to mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.h index 5472ebad46..969490dd59 100644 --- a/mindspore/lite/src/gllo/fusion/conv_scale_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_scale_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_CONV_SCALE_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_SCALE_FUSION_H_ -#include "src/gllo/fusion/conv_transform_fusion.h" +#include "tools/optimizer/fusion/conv_transform_fusion.h" namespace mindspore::opt { class ConvScaleFusion : public ConvTransformFusion { diff --git a/mindspore/lite/src/gllo/fusion/conv_transform_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.cc similarity index 98% rename from mindspore/lite/src/gllo/fusion/conv_transform_fusion.cc rename to mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.cc index 515d54ec64..ee7e56de6c 100644 --- a/mindspore/lite/src/gllo/fusion/conv_transform_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/gllo/fusion/conv_transform_fusion.h" +#include "tools/optimizer/fusion/conv_transform_fusion.h" #include #include "src/param_value_lite.h" #include "schema/inner/model_generated.h" #include "src/ir/primitive_t_value.h" #include "utils/utils.h" -#include "src/gllo/common/gllo_utils.h" +#include "tools/optimizer/common/gllo_utils.h" #include "include/errorcode.h" #include "securec/include/securec.h" diff --git a/mindspore/lite/src/gllo/fusion/conv_transform_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h similarity index 97% rename from mindspore/lite/src/gllo/fusion/conv_transform_fusion.h rename to mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h index 83f66dc7a1..38ff34a554 100644 --- a/mindspore/lite/src/gllo/fusion/conv_transform_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_TRANSFORM_FUSION_H_ #include -#include "src/gllo/common/optimizer.h" +#include "tools/optimizer/common/optimizer.h" namespace mindspore::opt { class ConvTransformFusion : public PatternProcessPass {