From 2c70ac8671b63825ffaac927155bb2e89d499b65 Mon Sep 17 00:00:00 2001 From: yeyunpeng Date: Tue, 17 Nov 2020 10:13:31 +0800 Subject: [PATCH] rename nnacl fp32 --- mindspore/lite/internal/CMakeLists.txt | 12 ++++++------ .../lite/internal/src/kernel/fp32/activation.cc | 2 +- .../lite/internal/src/kernel/fp32/arithmetic.cc | 2 +- .../lite/internal/src/kernel/fp32/arithmetic_self.cc | 2 +- mindspore/lite/internal/src/kernel/fp32/bias_add.cc | 2 +- mindspore/lite/internal/src/kernel/fp32/matmul.cc | 2 +- mindspore/lite/internal/src/kernel/fp32/reduce.cc | 2 +- .../src/kernel/fp32_grad/arithmetic_self_grad.cc | 4 ++-- mindspore/lite/nnacl/arg_min_max.c | 2 +- mindspore/lite/nnacl/fp16/cast_fp16.h | 2 +- mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h | 2 +- mindspore/lite/nnacl/fp16/pad_fp16.h | 2 +- .../nnacl/fp32/{activation.c => activation_fp32.c} | 2 +- .../nnacl/fp32/{activation.h => activation_fp32.h} | 0 .../nnacl/fp32/{arg_min_max.c => arg_min_max_fp32.c} | 2 +- .../nnacl/fp32/{arg_min_max.h => arg_min_max_fp32.h} | 0 ...rithmetic_compare.c => arithmetic_compare_fp32.c} | 2 +- ...rithmetic_compare.h => arithmetic_compare_fp32.h} | 0 .../nnacl/fp32/{arithmetic.c => arithmetic_fp32.c} | 2 +- .../nnacl/fp32/{arithmetic.h => arithmetic_fp32.h} | 0 .../{arithmetic_self.c => arithmetic_self_fp32.c} | 2 +- .../{arithmetic_self.h => arithmetic_self_fp32.h} | 0 .../nnacl/fp32/{batchnorm.c => batchnorm_fp32.c} | 2 +- .../nnacl/fp32/{batchnorm.h => batchnorm_fp32.h} | 0 .../fp32/{broadcast_to.c => broadcast_to_fp32.c} | 2 +- .../fp32/{broadcast_to.h => broadcast_to_fp32.h} | 0 mindspore/lite/nnacl/fp32/{cast.c => cast_fp32.c} | 4 ++-- mindspore/lite/nnacl/fp32/{cast.h => cast_fp32.h} | 0 .../nnacl/fp32/{common_func.c => common_func_fp32.c} | 2 +- .../nnacl/fp32/{common_func.h => common_func_fp32.h} | 0 .../lite/nnacl/fp32/{concat.c => concat_fp32.c} | 2 +- .../lite/nnacl/fp32/{concat.h => concat_fp32.h} | 0 ...{constant_of_shape.c => constant_of_shape_fp32.c} | 2 +- ...{constant_of_shape.h => constant_of_shape_fp32.h} | 0 .../fp32/{conv_depthwise.c => conv_depthwise_fp32.c} | 4 ++-- .../fp32/{conv_depthwise.h => conv_depthwise_fp32.h} | 0 mindspore/lite/nnacl/fp32/{conv.c => conv_fp32.c} | 6 +++--- mindspore/lite/nnacl/fp32/{conv.h => conv_fp32.h} | 2 +- mindspore/lite/nnacl/fp32/{crop.c => crop_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{crop.h => crop_fp32.h} | 0 .../lite/nnacl/fp32/{deconv.c => deconv_fp32.c} | 2 +- .../lite/nnacl/fp32/{deconv.h => deconv_fp32.h} | 4 ++-- .../{deconv_winograd.c => deconv_winograd_fp32.c} | 2 +- .../{deconv_winograd.h => deconv_winograd_fp32.h} | 2 +- ..._post_process.c => detection_post_process_fp32.c} | 2 +- ..._post_process.h => detection_post_process_fp32.h} | 0 mindspore/lite/nnacl/fp32/{elu.c => elu_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{elu.h => elu_fp32.h} | 0 .../{embedding_lookup.c => embedding_lookup_fp32.c} | 2 +- .../{embedding_lookup.h => embedding_lookup_fp32.h} | 0 mindspore/lite/nnacl/fp32/{exp.c => exp_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{exp.h => exp_fp32.h} | 0 .../nnacl/fp32/{expandDims.c => expandDims_fp32.c} | 2 +- .../nnacl/fp32/{expandDims.h => expandDims_fp32.h} | 0 mindspore/lite/nnacl/fp32/{fill.c => fill_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{fill.h => fill_fp32.h} | 0 .../lite/nnacl/fp32/{gatherNd.c => gatherNd_fp32.c} | 2 +- .../lite/nnacl/fp32/{gatherNd.h => gatherNd_fp32.h} | 0 .../lite/nnacl/fp32/{gather.c => gather_fp32.c} | 2 +- .../lite/nnacl/fp32/{gather.h => gather_fp32.h} | 0 .../fp32/{instance_norm.c => instance_norm_fp32.c} | 2 +- .../fp32/{instance_norm.h => instance_norm_fp32.h} | 0 .../nnacl/fp32/{layer_norm.c => layer_norm_fp32.c} | 2 +- .../nnacl/fp32/{layer_norm.h => layer_norm_fp32.h} | 0 ...al_response_norm.c => local_response_norm_fp32.c} | 2 +- ...al_response_norm.h => local_response_norm_fp32.h} | 0 mindspore/lite/nnacl/fp32/{lstm.c => lstm_fp32.c} | 6 +++--- mindspore/lite/nnacl/fp32/{lstm.h => lstm_fp32.h} | 0 .../lite/nnacl/fp32/{matmul.c => matmul_fp32.c} | 2 +- .../lite/nnacl/fp32/{matmul.h => matmul_fp32.h} | 0 .../lite/nnacl/fp32/{one_hot.c => one_hot_fp32.c} | 2 +- .../lite/nnacl/fp32/{one_hot.h => one_hot_fp32.h} | 0 mindspore/lite/nnacl/fp32/{pad.c => pad_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{pad.h => pad_fp32.h} | 0 .../lite/nnacl/fp32/{pooling.c => pooling_fp32.c} | 2 +- .../lite/nnacl/fp32/{pooling.h => pooling_fp32.h} | 0 mindspore/lite/nnacl/fp32/{prelu.c => prelu_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{prelu.h => prelu_fp32.h} | 0 mindspore/lite/nnacl/fp32/{range.c => range_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{range.h => range_fp32.h} | 0 mindspore/lite/nnacl/fp32/{rank.c => rank_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{rank.h => rank_fp32.h} | 0 .../lite/nnacl/fp32/{reduce.c => reduce_fp32.c} | 2 +- .../lite/nnacl/fp32/{reduce.h => reduce_fp32.h} | 0 .../lite/nnacl/fp32/{resize.c => resize_fp32.c} | 2 +- .../lite/nnacl/fp32/{resize.h => resize_fp32.h} | 0 .../lite/nnacl/fp32/{reverse.c => reverse_fp32.c} | 2 +- .../lite/nnacl/fp32/{reverse.h => reverse_fp32.h} | 0 .../nnacl/fp32/{roi_pooling.c => roi_pooling_fp32.c} | 2 +- .../nnacl/fp32/{roi_pooling.h => roi_pooling_fp32.h} | 0 mindspore/lite/nnacl/fp32/{scale.c => scale_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{scale.h => scale_fp32.h} | 0 .../nnacl/fp32/{skip_gram.h => skip_gram_fp32.h} | 0 mindspore/lite/nnacl/fp32/{slice.c => slice_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{slice.h => slice_fp32.h} | 0 .../lite/nnacl/fp32/{softmax.c => softmax_fp32.c} | 2 +- .../lite/nnacl/fp32/{softmax.h => softmax_fp32.h} | 0 .../fp32/{space_to_batch.c => space_to_batch_fp32.c} | 2 +- .../fp32/{space_to_batch.h => space_to_batch_fp32.h} | 0 .../fp32/{space_to_depth.c => space_to_depth_fp32.c} | 2 +- .../fp32/{space_to_depth.h => space_to_depth_fp32.h} | 0 .../{sparse_to_dense.c => sparse_to_dense_fp32.c} | 2 +- .../{sparse_to_dense.h => sparse_to_dense_fp32.h} | 0 mindspore/lite/nnacl/fp32/{stack.c => stack_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{stack.h => stack_fp32.h} | 0 mindspore/lite/nnacl/fp32/{tile.c => tile_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{tile.h => tile_fp32.h} | 0 mindspore/lite/nnacl/fp32/{topk.c => topk_fp32.c} | 2 +- mindspore/lite/nnacl/fp32/{topk.h => topk_fp32.h} | 0 .../nnacl/fp32/{transpose.c => transpose_fp32.c} | 2 +- .../nnacl/fp32/{transpose.h => transpose_fp32.h} | 0 .../lite/nnacl/fp32/{unique.c => unique_fp32.c} | 2 +- .../lite/nnacl/fp32/{unique.h => unique_fp32.h} | 0 .../nnacl/fp32/{unsqueeze.c => unsqueeze_fp32.c} | 2 +- .../nnacl/fp32/{unsqueeze.h => unsqueeze_fp32.h} | 0 mindspore/lite/nnacl/fp32_grad/activation_grad.c | 2 +- mindspore/lite/nnacl/fp32_grad/activation_grad.h | 2 +- mindspore/lite/nnacl/fp32_grad/gemm.c | 2 +- mindspore/lite/nnacl/fp32_grad/pooling_grad.h | 2 +- mindspore/lite/nnacl/fp32_grad/softmax_grad.h | 6 +++--- mindspore/lite/nnacl/int8/conv_depthwise_int8.h | 2 +- mindspore/lite/nnacl/int8/pooling_int8.h | 2 +- mindspore/lite/nnacl/int8/space_to_batch_int8.h | 2 +- mindspore/lite/nnacl/int8/tanh_int8.h | 2 +- mindspore/lite/nnacl/int8/topk_int8.h | 2 +- mindspore/lite/nnacl/winograd_transform.h | 2 +- mindspore/lite/nnacl/x86_64_sse/DepthwiseFp32_Sse.c | 2 +- mindspore/lite/nnacl/x86_64_sse/PosFuncBiasRelu.c | 2 +- mindspore/lite/nnacl/x86_64_sse/WinogradTrans.c | 2 +- .../lite/src/ops/populate/activation_populate.cc | 2 +- .../lite/src/ops/populate/broadcast_to_populate.cc | 2 +- mindspore/lite/src/ops/populate/cast_populate.cc | 2 +- .../src/ops/populate/constant_of_shape_populate.cc | 2 +- mindspore/lite/src/ops/populate/elu_populate.cc | 2 +- .../src/ops/populate/embedding_lookup_populate.cc | 2 +- mindspore/lite/src/ops/populate/exp_populate.cc | 2 +- .../lite/src/ops/populate/expand_dims_populate.cc | 2 +- mindspore/lite/src/ops/populate/fill_populate.cc | 2 +- .../lite/src/ops/populate/gather_nd_populate.cc | 2 +- .../local_response_normalization_populate.cc | 2 +- mindspore/lite/src/ops/populate/lstm_populate.cc | 2 +- mindspore/lite/src/ops/populate/one_hot_populate.cc | 2 +- mindspore/lite/src/ops/populate/range_populate.cc | 2 +- mindspore/lite/src/ops/populate/reverse_populate.cc | 2 +- .../lite/src/ops/populate/roi_pooling_populate.cc | 2 +- .../lite/src/ops/populate/skip_gram_populate.cc | 2 +- .../src/ops/populate/space_to_batch_nd_populate.cc | 2 +- .../lite/src/ops/populate/space_to_batch_populate.cc | 2 +- .../lite/src/ops/populate/space_to_depth_populate.cc | 2 +- mindspore/lite/src/ops/populate/tile_populate.cc | 2 +- mindspore/lite/src/ops/populate/topk_populate.cc | 2 +- mindspore/lite/src/ops/populate/unique_populate.cc | 2 +- .../lite/src/ops/populate/unsqueeze_populate.cc | 2 +- .../lite/src/runtime/kernel/arm/base/concat_base.cc | 2 +- .../kernel/arm/base/detection_post_process_base.h | 2 +- .../lite/src/runtime/kernel/arm/base/pooling_base.h | 2 +- .../lite/src/runtime/kernel/arm/base/softmax_base.cc | 2 +- .../src/runtime/kernel/arm/fp32/activation_fp32.h | 2 +- .../kernel/arm/fp32/arithmetic_compare_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/arithmetic_fp32.h | 2 +- .../runtime/kernel/arm/fp32/arithmetic_self_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/batchnorm_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/bias_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/broadcast_to_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/cast_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/concat_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/constant_of_shape_fp32.h | 2 +- .../runtime/kernel/arm/fp32/convolution_1x1_fp32.h | 6 +++--- .../kernel/arm/fp32/convolution_depthwise_3x3_fp32.h | 2 +- .../kernel/arm/fp32/convolution_depthwise_fp32.h | 2 +- .../fp32/convolution_depthwise_slidewindow_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/convolution_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/convolution_fp32.h | 2 +- .../kernel/arm/fp32/convolution_winograd_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/crop_fp32.cc | 2 +- .../kernel/arm/fp32/deconvolution_depthwise_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/deconvolution_fp32.h | 4 ++-- .../kernel/arm/fp32/deconvolution_winograd_fp32.h | 4 ++-- .../kernel/arm/fp32/detection_post_process_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/elu_fp32.h | 2 +- .../runtime/kernel/arm/fp32/embedding_lookup_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/exp_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/expandDims_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/fill_fp32.h | 2 +- .../runtime/kernel/arm/fp32/fullconnection_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/gatherNd_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/gather_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/group_convolution_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/instance_norm_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/layer_norm_fp32.h | 2 +- .../kernel/arm/fp32/local_response_norm_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/lstm_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/matmul_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/one_hot_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/pad_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/pooling_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/prelu_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/range_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/rank_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/reduce_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/reduce_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/resize_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/reverse_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/roi_pooling_fp32.cc | 2 +- .../src/runtime/kernel/arm/fp32/roi_pooling_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/scale_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/skip_gram_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/slice_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/softmax_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/space_to_batch_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/space_to_depth_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/sparse_to_dense_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/sparse_to_dense_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/stack_fp32.cc | 2 +- .../lite/src/runtime/kernel/arm/fp32/tile_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/topk_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/transpose_fp32.h | 2 +- .../lite/src/runtime/kernel/arm/fp32/unique_fp32.h | 2 +- .../src/runtime/kernel/arm/fp32/unsqueeze_fp32.h | 2 +- .../runtime/kernel/arm/fp32_grad/activation_grad.h | 2 +- .../runtime/kernel/arm/fp32_grad/arithmetic_grad.h | 2 +- .../kernel/arm/fp32_grad/arithmetic_self_grad.cc | 2 +- .../src/runtime/kernel/arm/fp32_grad/bias_grad.h | 2 +- .../src/runtime/kernel/arm/fp32_grad/neg_grad.cc | 2 +- .../src/runtime/kernel/arm/fp32_grad/pooling_grad.cc | 2 +- .../src/runtime/kernel/arm/fp32_grad/power_grad.cc | 2 +- .../fp32_grad/softmax_cross_entropy_with_logits.cc | 2 +- .../fp32_grad/softmax_cross_entropy_with_logits.h | 2 +- .../sparse_softmax_cross_entropy_with_logits.cc | 2 +- .../sparse_softmax_cross_entropy_with_logits.h | 2 +- .../src/runtime/kernel/arm/fp32_grad/tuple_getitem.h | 2 +- .../src/runtime/kernel/arm/int8/bias_add_int8.cc | 2 +- .../lite/src/runtime/kernel/arm/int8/bias_add_int8.h | 2 +- .../kernel/arm/int8/convolution_depthwise_3x3_int8.h | 2 +- .../kernel/arm/int8/convolution_depthwise_int8.h | 2 +- .../int8/convolution_depthwise_slidewindow_int8.h | 2 +- .../kernel/arm/int8/deconvolution_depthwise_int8.h | 2 +- .../kernel/arm/int8/detection_post_process_int8.h | 2 +- .../src/runtime/kernel/arm/int8/leaky_relu_int8.cc | 2 +- .../lite/src/runtime/kernel/arm/int8/pooling_int8.cc | 2 +- .../lite/src/runtime/kernel/arm/int8/relux_int8.h | 2 +- .../runtime/kernel/arm/int8/space_to_batch_int8.cc | 2 +- .../src/runtime/kernel/opencl/kernel/activation.cc | 2 +- .../src/runtime/kernel/opencl/kernel/activation.h | 2 +- .../src/runtime/kernel/opencl/kernel/arithmetic.cc | 2 +- .../src/runtime/kernel/opencl/kernel/batchnorm.h | 2 +- .../lite/src/runtime/kernel/opencl/kernel/cast.h | 2 +- .../runtime/kernel/opencl/kernel/conv2d_transpose.cc | 2 +- .../runtime/kernel/opencl/kernel/depthwise_conv2d.cc | 2 +- .../lite/src/runtime/kernel/opencl/kernel/fill.h | 2 +- .../runtime/kernel/opencl/kernel/fullconnection.cc | 2 +- .../lite/src/runtime/kernel/opencl/kernel/hswish.h | 2 +- .../lite/src/runtime/kernel/opencl/kernel/matmul.cc | 2 +- .../lite/src/runtime/kernel/opencl/kernel/one_hot.h | 2 +- .../src/runtime/kernel/opencl/kernel/pooling2d.h | 2 +- .../lite/src/runtime/kernel/opencl/kernel/prelu.cc | 2 +- .../lite/src/runtime/kernel/opencl/kernel/scale.cc | 2 +- .../lite/src/runtime/kernel/opencl/kernel/softmax.h | 2 +- .../runtime/kernel/opencl/kernel/space_to_batch_nd.h | 2 +- .../runtime/kernel/opencl/kernel/space_to_depth.h | 2 +- .../runtime/kernel/opencl/kernel/sparse_to_dense.h | 2 +- .../src/runtime/kernel/opencl/kernel/strided_slice.h | 2 +- mindspore/lite/src/train/train_populate_parameter.cc | 2 +- .../internal/src/kernel/fp32/arithmetic_fp32_test.cc | 2 +- .../internal/src/kernel/fp32/bias_add_fp32_test.cc | 2 +- .../runtime/kernel/arm/fp32/activation_fp32_test.cc | 2 +- .../runtime/kernel/arm/fp32/argminmax_fp32_test.cc | 2 +- .../runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc | 2 +- .../runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc | 2 +- .../ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc | 2 +- .../kernel/arm/fp32/deconvolution_fp32_tests.cc | 2 +- .../ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc | 2 +- .../kernel/arm/fp32/embedding_lookup_fp32_test.cc | 2 +- .../kernel/arm/fp32/fullconnection_fp32_tests.cc | 2 +- .../kernel/arm/fp32/instance_norm_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/lstm_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/scale_fp32_tests.cc | 2 +- .../ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc | 2 +- .../kernel/arm/fp32/space_to_batch_fp32_tests.cc | 2 +- .../kernel/arm/fp32/space_to_depth_fp32_tests.cc | 2 +- .../kernel/arm/fp32/sparse_to_dense_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/stack_fp32_test.cc | 2 +- .../src/runtime/kernel/arm/fp32/tile_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/topk_fp32_tests.cc | 2 +- .../src/runtime/kernel/arm/fp32/unique_fp32_tests.cc | 2 +- .../arm/fp32_grad/arithmetic_grad_fp32_tests.cc | 2 +- .../kernel/arm/fp32_grad/bn_grad_fp32_test.cc | 2 +- .../src/runtime/kernel/arm/int8/deconv_int8_tests.cc | 2 +- .../runtime/kernel/arm/int8/gatherNd_int8_test.cc | 2 +- .../src/runtime/kernel/arm/int8/hswish_int8_tests.cc | 2 +- .../src/runtime/kernel/arm/int8/reduce_int8_tests.cc | 2 +- .../runtime/kernel/arm/int8/sigmoid_int8_tests.cc | 2 +- .../kernel/arm/int8/space_to_batch_int8_tests.cc | 2 +- .../src/runtime/kernel/arm/int8/topk_int8_tests.cc | 2 +- .../ut/src/runtime/kernel/arm/string/normalize.cc | 2 +- 297 files changed, 267 insertions(+), 267 deletions(-) rename mindspore/lite/nnacl/fp32/{activation.c => activation_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{activation.h => activation_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{arg_min_max.c => arg_min_max_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{arg_min_max.h => arg_min_max_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{arithmetic_compare.c => arithmetic_compare_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{arithmetic_compare.h => arithmetic_compare_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{arithmetic.c => arithmetic_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{arithmetic.h => arithmetic_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{arithmetic_self.c => arithmetic_self_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{arithmetic_self.h => arithmetic_self_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{batchnorm.c => batchnorm_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{batchnorm.h => batchnorm_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{broadcast_to.c => broadcast_to_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{broadcast_to.h => broadcast_to_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{cast.c => cast_fp32.c} (96%) rename mindspore/lite/nnacl/fp32/{cast.h => cast_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{common_func.c => common_func_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{common_func.h => common_func_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{concat.c => concat_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{concat.h => concat_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{constant_of_shape.c => constant_of_shape_fp32.c} (96%) rename mindspore/lite/nnacl/fp32/{constant_of_shape.h => constant_of_shape_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{conv_depthwise.c => conv_depthwise_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{conv_depthwise.h => conv_depthwise_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{conv.c => conv_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{conv.h => conv_fp32.h} (97%) rename mindspore/lite/nnacl/fp32/{crop.c => crop_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{crop.h => crop_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{deconv.c => deconv_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{deconv.h => deconv_fp32.h} (94%) rename mindspore/lite/nnacl/fp32/{deconv_winograd.c => deconv_winograd_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{deconv_winograd.h => deconv_winograd_fp32.h} (97%) rename mindspore/lite/nnacl/fp32/{detection_post_process.c => detection_post_process_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{detection_post_process.h => detection_post_process_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{elu.c => elu_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{elu.h => elu_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{embedding_lookup.c => embedding_lookup_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{embedding_lookup.h => embedding_lookup_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{exp.c => exp_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{exp.h => exp_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{expandDims.c => expandDims_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{expandDims.h => expandDims_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{fill.c => fill_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{fill.h => fill_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{gatherNd.c => gatherNd_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{gatherNd.h => gatherNd_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{gather.c => gather_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{gather.h => gather_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{instance_norm.c => instance_norm_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{instance_norm.h => instance_norm_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{layer_norm.c => layer_norm_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{layer_norm.h => layer_norm_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{local_response_norm.c => local_response_norm_fp32.c} (96%) rename mindspore/lite/nnacl/fp32/{local_response_norm.h => local_response_norm_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{lstm.c => lstm_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{lstm.h => lstm_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{matmul.c => matmul_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{matmul.h => matmul_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{one_hot.c => one_hot_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{one_hot.h => one_hot_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{pad.c => pad_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{pad.h => pad_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{pooling.c => pooling_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{pooling.h => pooling_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{prelu.c => prelu_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{prelu.h => prelu_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{range.c => range_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{range.h => range_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{rank.c => rank_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{rank.h => rank_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{reduce.c => reduce_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{reduce.h => reduce_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{resize.c => resize_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{resize.h => resize_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{reverse.c => reverse_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{reverse.h => reverse_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{roi_pooling.c => roi_pooling_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{roi_pooling.h => roi_pooling_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{scale.c => scale_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{scale.h => scale_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{skip_gram.h => skip_gram_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{slice.c => slice_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{slice.h => slice_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{softmax.c => softmax_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{softmax.h => softmax_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{space_to_batch.c => space_to_batch_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{space_to_batch.h => space_to_batch_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{space_to_depth.c => space_to_depth_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{space_to_depth.h => space_to_depth_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{sparse_to_dense.c => sparse_to_dense_fp32.c} (97%) rename mindspore/lite/nnacl/fp32/{sparse_to_dense.h => sparse_to_dense_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{stack.c => stack_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{stack.h => stack_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{tile.c => tile_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{tile.h => tile_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{topk.c => topk_fp32.c} (98%) rename mindspore/lite/nnacl/fp32/{topk.h => topk_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{transpose.c => transpose_fp32.c} (99%) rename mindspore/lite/nnacl/fp32/{transpose.h => transpose_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{unique.c => unique_fp32.c} (96%) rename mindspore/lite/nnacl/fp32/{unique.h => unique_fp32.h} (100%) rename mindspore/lite/nnacl/fp32/{unsqueeze.c => unsqueeze_fp32.c} (95%) rename mindspore/lite/nnacl/fp32/{unsqueeze.h => unsqueeze_fp32.h} (100%) diff --git a/mindspore/lite/internal/CMakeLists.txt b/mindspore/lite/internal/CMakeLists.txt index c799c6816c..e968ccd3fb 100644 --- a/mindspore/lite/internal/CMakeLists.txt +++ b/mindspore/lite/internal/CMakeLists.txt @@ -8,12 +8,12 @@ add_compile_definitions(ENABLE_NNACL_INFER_SHAPE) file(GLOB KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/arithmetic_common.c - ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/activation.c - ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/arithmetic_self.c - ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/arithmetic.c - ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/matmul.c - ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/reduce.c - ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/arithmetic.c + ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/activation_fp32.c + ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/arithmetic_self_fp32.c + ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/arithmetic_fp32.c + ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/matmul_fp32.c + ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/reduce_fp32.c + ${CMAKE_CURRENT_SOURCE_DIR}/../nnacl/fp32/arithmetic_fp32.c ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/fp32/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/common/*.cc ) diff --git a/mindspore/lite/internal/src/kernel/fp32/activation.cc b/mindspore/lite/internal/src/kernel/fp32/activation.cc index 7ac74aac77..bee265d48f 100644 --- a/mindspore/lite/internal/src/kernel/fp32/activation.cc +++ b/mindspore/lite/internal/src/kernel/fp32/activation.cc @@ -18,7 +18,7 @@ #include "internal/src/kernel/common/common_infershape.h" #include "internal/include/errorcode.h" #include "internal/include/ms_tensor.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" #include "internal/src/lite_log.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/internal/src/kernel/fp32/arithmetic.cc b/mindspore/lite/internal/src/kernel/fp32/arithmetic.cc index 91a07900a2..b983a2859f 100644 --- a/mindspore/lite/internal/src/kernel/fp32/arithmetic.cc +++ b/mindspore/lite/internal/src/kernel/fp32/arithmetic.cc @@ -20,7 +20,7 @@ #include "internal/include/ms_tensor.h" #include "internal/include/lite_utils.h" #include "nnacl/arithmetic_common.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" typedef int (*ArithmeticRun)(const float *input0, const float *input1, float *output, const int element_size); typedef int (*ArithmeticOptRun)(const float *input0, const float *input1, float *output, const int element_size, diff --git a/mindspore/lite/internal/src/kernel/fp32/arithmetic_self.cc b/mindspore/lite/internal/src/kernel/fp32/arithmetic_self.cc index 8f01195ac0..b2c3fbd4c7 100644 --- a/mindspore/lite/internal/src/kernel/fp32/arithmetic_self.cc +++ b/mindspore/lite/internal/src/kernel/fp32/arithmetic_self.cc @@ -19,7 +19,7 @@ #include "internal/include/errorcode.h" #include "internal/include/ms_tensor.h" #include "internal/src/lite_log.h" -#include "nnacl/fp32/arithmetic_self.h" +#include "nnacl/fp32/arithmetic_self_fp32.h" int DoArithmeticSelfInferShape(const TensorPtrVector &in_tensors, const TensorPtrVector &out_tensors, OpParameter *param) { diff --git a/mindspore/lite/internal/src/kernel/fp32/bias_add.cc b/mindspore/lite/internal/src/kernel/fp32/bias_add.cc index 9c2372eab2..d0c313b755 100644 --- a/mindspore/lite/internal/src/kernel/fp32/bias_add.cc +++ b/mindspore/lite/internal/src/kernel/fp32/bias_add.cc @@ -21,7 +21,7 @@ #include "internal/src/lite_log.h" #include "internal/include/errorcode.h" #include "nnacl/arithmetic_common.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" int DoBiasAddInferShape(const TensorPtrVector &in_tensors, const TensorPtrVector &out_tensors, OpParameter *param) { return DoCommonInferShape(in_tensors, out_tensors); diff --git a/mindspore/lite/internal/src/kernel/fp32/matmul.cc b/mindspore/lite/internal/src/kernel/fp32/matmul.cc index 69530417bf..4bc8f4ed2a 100644 --- a/mindspore/lite/internal/src/kernel/fp32/matmul.cc +++ b/mindspore/lite/internal/src/kernel/fp32/matmul.cc @@ -15,7 +15,7 @@ */ #include "internal/src/kernel/fp32/matmul.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" #include "internal/include/errorcode.h" #include "internal/include/ms_tensor.h" #include "internal/src/lite_log.h" diff --git a/mindspore/lite/internal/src/kernel/fp32/reduce.cc b/mindspore/lite/internal/src/kernel/fp32/reduce.cc index f7ac3f73c8..f32b64112d 100644 --- a/mindspore/lite/internal/src/kernel/fp32/reduce.cc +++ b/mindspore/lite/internal/src/kernel/fp32/reduce.cc @@ -20,7 +20,7 @@ #include "internal/src/lite_log.h" #include "internal/include/errorcode.h" #include "nnacl/reduce_parameter.h" -#include "nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce_fp32.h" #include "nnacl/errorcode.h" typedef int (*Reducer)(const int outer_size, const int inner_size, const int axis_size, const float *src_data, diff --git a/mindspore/lite/internal/src/kernel/fp32_grad/arithmetic_self_grad.cc b/mindspore/lite/internal/src/kernel/fp32_grad/arithmetic_self_grad.cc index 07da37ab54..40d1d9b27f 100644 --- a/mindspore/lite/internal/src/kernel/fp32_grad/arithmetic_self_grad.cc +++ b/mindspore/lite/internal/src/kernel/fp32_grad/arithmetic_self_grad.cc @@ -19,8 +19,8 @@ #include "internal/include/errorcode.h" #include "internal/include/ms_tensor.h" #include "internal/src/lite_log.h" -#include "nnacl/fp32/arithmetic_self.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_self_fp32.h" +#include "nnacl/fp32/arithmetic_fp32.h" int DoArithmeticSelfGradInferShape(const TensorPtrVector &in_tensors, const TensorPtrVector &out_tensors, OpParameter *param) { diff --git a/mindspore/lite/nnacl/arg_min_max.c b/mindspore/lite/nnacl/arg_min_max.c index cae540610c..40b4cebdf1 100644 --- a/mindspore/lite/nnacl/arg_min_max.c +++ b/mindspore/lite/nnacl/arg_min_max.c @@ -14,7 +14,7 @@ * limitations under the License. */ #include "nnacl/arg_min_max.h" -#include "nnacl/fp32/arg_min_max.h" +#include "nnacl/fp32/arg_min_max_fp32.h" #define FLOAT_DATA_TYPE 43 diff --git a/mindspore/lite/nnacl/fp16/cast_fp16.h b/mindspore/lite/nnacl/fp16/cast_fp16.h index c64c30f683..301985482c 100644 --- a/mindspore/lite/nnacl/fp16/cast_fp16.h +++ b/mindspore/lite/nnacl/fp16/cast_fp16.h @@ -18,7 +18,7 @@ #include #include "nnacl/op_base.h" -#include "nnacl/fp32/cast.h" +#include "nnacl/fp32/cast_fp32.h" #ifdef __cplusplus extern "C" { #endif diff --git a/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h b/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h index b1ae0a12d9..75291d79fd 100644 --- a/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h +++ b/mindspore/lite/nnacl/fp16/conv_depthwise_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_NNACL_FP16_CONV_DEPTHWISE_FP16_H_ #include "nnacl/conv_parameter.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/nnacl/fp16/pad_fp16.h b/mindspore/lite/nnacl/fp16/pad_fp16.h index 8954783c46..058f26c2f9 100644 --- a/mindspore/lite/nnacl/fp16/pad_fp16.h +++ b/mindspore/lite/nnacl/fp16/pad_fp16.h @@ -19,7 +19,7 @@ #ifdef ENABLE_NEON #include #endif -#include "nnacl/fp32/pad.h" +#include "nnacl/fp32/pad_fp32.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/nnacl/fp32/activation.c b/mindspore/lite/nnacl/fp32/activation_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/activation.c rename to mindspore/lite/nnacl/fp32/activation_fp32.c index 08839f439c..56214f82ff 100644 --- a/mindspore/lite/nnacl/fp32/activation.c +++ b/mindspore/lite/nnacl/fp32/activation_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" #include "nnacl/errorcode.h" int Fp32Relu(const float *src, int length, float *dst) { diff --git a/mindspore/lite/nnacl/fp32/activation.h b/mindspore/lite/nnacl/fp32/activation_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/activation.h rename to mindspore/lite/nnacl/fp32/activation_fp32.h diff --git a/mindspore/lite/nnacl/fp32/arg_min_max.c b/mindspore/lite/nnacl/fp32/arg_min_max_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/arg_min_max.c rename to mindspore/lite/nnacl/fp32/arg_min_max_fp32.c index 83b256055e..2d316ac3bf 100644 --- a/mindspore/lite/nnacl/fp32/arg_min_max.c +++ b/mindspore/lite/nnacl/fp32/arg_min_max_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/arg_min_max.h" +#include "nnacl/fp32/arg_min_max_fp32.h" #include #include diff --git a/mindspore/lite/nnacl/fp32/arg_min_max.h b/mindspore/lite/nnacl/fp32/arg_min_max_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/arg_min_max.h rename to mindspore/lite/nnacl/fp32/arg_min_max_fp32.h diff --git a/mindspore/lite/nnacl/fp32/arithmetic_compare.c b/mindspore/lite/nnacl/fp32/arithmetic_compare_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/arithmetic_compare.c rename to mindspore/lite/nnacl/fp32/arithmetic_compare_fp32.c index f8ed586986..87878997ab 100644 --- a/mindspore/lite/nnacl/fp32/arithmetic_compare.c +++ b/mindspore/lite/nnacl/fp32/arithmetic_compare_fp32.c @@ -16,7 +16,7 @@ #include #include -#include "nnacl/fp32/arithmetic_compare.h" +#include "nnacl/fp32/arithmetic_compare_fp32.h" // equal: int ElementEqualFp32(const float *input0, const float *input1, uint8_t *output, int element_size) { diff --git a/mindspore/lite/nnacl/fp32/arithmetic_compare.h b/mindspore/lite/nnacl/fp32/arithmetic_compare_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/arithmetic_compare.h rename to mindspore/lite/nnacl/fp32/arithmetic_compare_fp32.h diff --git a/mindspore/lite/nnacl/fp32/arithmetic.c b/mindspore/lite/nnacl/fp32/arithmetic_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/arithmetic.c rename to mindspore/lite/nnacl/fp32/arithmetic_fp32.c index ffa799ef82..916f359603 100644 --- a/mindspore/lite/nnacl/fp32/arithmetic.c +++ b/mindspore/lite/nnacl/fp32/arithmetic_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include #define ACCURACY_DATA 0.00000001 diff --git a/mindspore/lite/nnacl/fp32/arithmetic.h b/mindspore/lite/nnacl/fp32/arithmetic_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/arithmetic.h rename to mindspore/lite/nnacl/fp32/arithmetic_fp32.h diff --git a/mindspore/lite/nnacl/fp32/arithmetic_self.c b/mindspore/lite/nnacl/fp32/arithmetic_self_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/arithmetic_self.c rename to mindspore/lite/nnacl/fp32/arithmetic_self_fp32.c index 5312647f6c..5adedddd18 100644 --- a/mindspore/lite/nnacl/fp32/arithmetic_self.c +++ b/mindspore/lite/nnacl/fp32/arithmetic_self_fp32.c @@ -16,7 +16,7 @@ #include #include -#include "nnacl/fp32/arithmetic_self.h" +#include "nnacl/fp32/arithmetic_self_fp32.h" // abs: int ElementAbs(const float *input, float *output, const int element_size) { diff --git a/mindspore/lite/nnacl/fp32/arithmetic_self.h b/mindspore/lite/nnacl/fp32/arithmetic_self_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/arithmetic_self.h rename to mindspore/lite/nnacl/fp32/arithmetic_self_fp32.h diff --git a/mindspore/lite/nnacl/fp32/batchnorm.c b/mindspore/lite/nnacl/fp32/batchnorm_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/batchnorm.c rename to mindspore/lite/nnacl/fp32/batchnorm_fp32.c index a11138daca..196038df7e 100644 --- a/mindspore/lite/nnacl/fp32/batchnorm.c +++ b/mindspore/lite/nnacl/fp32/batchnorm_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/batchnorm.h" +#include "nnacl/fp32/batchnorm_fp32.h" #include #include "nnacl/batchnorm_parameter.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/batchnorm.h b/mindspore/lite/nnacl/fp32/batchnorm_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/batchnorm.h rename to mindspore/lite/nnacl/fp32/batchnorm_fp32.h diff --git a/mindspore/lite/nnacl/fp32/broadcast_to.c b/mindspore/lite/nnacl/fp32/broadcast_to_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/broadcast_to.c rename to mindspore/lite/nnacl/fp32/broadcast_to_fp32.c index 8e6fc5322d..2fcf17be93 100644 --- a/mindspore/lite/nnacl/fp32/broadcast_to.c +++ b/mindspore/lite/nnacl/fp32/broadcast_to_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/broadcast_to.h" +#include "nnacl/fp32/broadcast_to_fp32.h" #include #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/broadcast_to.h b/mindspore/lite/nnacl/fp32/broadcast_to_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/broadcast_to.h rename to mindspore/lite/nnacl/fp32/broadcast_to_fp32.h diff --git a/mindspore/lite/nnacl/fp32/cast.c b/mindspore/lite/nnacl/fp32/cast_fp32.c similarity index 96% rename from mindspore/lite/nnacl/fp32/cast.c rename to mindspore/lite/nnacl/fp32/cast_fp32.c index 4e8f13225c..0f563c89f0 100644 --- a/mindspore/lite/nnacl/fp32/cast.c +++ b/mindspore/lite/nnacl/fp32/cast_fp32.c @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "nnacl/fp32/cast.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/cast_fp32.h" +#include "nnacl/fp32/common_func_fp32.h" void BoolToFloat32(const bool *input, float *output, int number) { for (int i = 0; i < number; ++i) { diff --git a/mindspore/lite/nnacl/fp32/cast.h b/mindspore/lite/nnacl/fp32/cast_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/cast.h rename to mindspore/lite/nnacl/fp32/cast_fp32.h diff --git a/mindspore/lite/nnacl/fp32/common_func.c b/mindspore/lite/nnacl/fp32/common_func_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/common_func.c rename to mindspore/lite/nnacl/fp32/common_func_fp32.c index 095987f01c..c0b0a8400c 100644 --- a/mindspore/lite/nnacl/fp32/common_func.c +++ b/mindspore/lite/nnacl/fp32/common_func_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" void PostConvFuncComm(const float *src_ptr_, float *out_ptr, const float *bias_ptr, size_t output_channel, size_t plane_size, size_t plane_stride, size_t oc_stride, ActType relu_type, int size) { diff --git a/mindspore/lite/nnacl/fp32/common_func.h b/mindspore/lite/nnacl/fp32/common_func_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/common_func.h rename to mindspore/lite/nnacl/fp32/common_func_fp32.h diff --git a/mindspore/lite/nnacl/fp32/concat.c b/mindspore/lite/nnacl/fp32/concat_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/concat.c rename to mindspore/lite/nnacl/fp32/concat_fp32.c index e24856632d..a8cda81802 100644 --- a/mindspore/lite/nnacl/fp32/concat.c +++ b/mindspore/lite/nnacl/fp32/concat_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/concat.h" +#include "nnacl/fp32/concat_fp32.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/nnacl/fp32/concat.h b/mindspore/lite/nnacl/fp32/concat_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/concat.h rename to mindspore/lite/nnacl/fp32/concat_fp32.h diff --git a/mindspore/lite/nnacl/fp32/constant_of_shape.c b/mindspore/lite/nnacl/fp32/constant_of_shape_fp32.c similarity index 96% rename from mindspore/lite/nnacl/fp32/constant_of_shape.c rename to mindspore/lite/nnacl/fp32/constant_of_shape_fp32.c index 2a81cc71c2..fae593cb10 100644 --- a/mindspore/lite/nnacl/fp32/constant_of_shape.c +++ b/mindspore/lite/nnacl/fp32/constant_of_shape_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/constant_of_shape.h" +#include "nnacl/fp32/constant_of_shape_fp32.h" int ConstantOfShape(float *output, int tid, ConstantOfShapeParameter *param) { int size = param->unit_; diff --git a/mindspore/lite/nnacl/fp32/constant_of_shape.h b/mindspore/lite/nnacl/fp32/constant_of_shape_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/constant_of_shape.h rename to mindspore/lite/nnacl/fp32/constant_of_shape_fp32.h diff --git a/mindspore/lite/nnacl/fp32/conv_depthwise.c b/mindspore/lite/nnacl/fp32/conv_depthwise_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/conv_depthwise.c rename to mindspore/lite/nnacl/fp32/conv_depthwise_fp32.c index 7883dc919b..54b4b174f0 100644 --- a/mindspore/lite/nnacl/fp32/conv_depthwise.c +++ b/mindspore/lite/nnacl/fp32/conv_depthwise_fp32.c @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "nnacl/fp32/conv_depthwise.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" +#include "nnacl/fp32/common_func_fp32.h" #include "nnacl/winograd_transform.h" #ifdef ENABLE_ARM64 #include diff --git a/mindspore/lite/nnacl/fp32/conv_depthwise.h b/mindspore/lite/nnacl/fp32/conv_depthwise_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/conv_depthwise.h rename to mindspore/lite/nnacl/fp32/conv_depthwise_fp32.h diff --git a/mindspore/lite/nnacl/fp32/conv.c b/mindspore/lite/nnacl/fp32/conv_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/conv.c rename to mindspore/lite/nnacl/fp32/conv_fp32.c index 3bdfd40636..bb05bb228d 100644 --- a/mindspore/lite/nnacl/fp32/conv.c +++ b/mindspore/lite/nnacl/fp32/conv_fp32.c @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_fp32.h" #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "nnacl/winograd_transform.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" // fp32 conv common void ConvFp32(const float *input_data, float *packed_input, const float *packed_weight, const float *bias_data, diff --git a/mindspore/lite/nnacl/fp32/conv.h b/mindspore/lite/nnacl/fp32/conv_fp32.h similarity index 97% rename from mindspore/lite/nnacl/fp32/conv.h rename to mindspore/lite/nnacl/fp32/conv_fp32.h index 4e9ed71e63..890d6f98aa 100644 --- a/mindspore/lite/nnacl/fp32/conv.h +++ b/mindspore/lite/nnacl/fp32/conv_fp32.h @@ -25,7 +25,7 @@ #include "nnacl/common_func.h" #include "nnacl/conv_parameter.h" #include "nnacl/winograd_utils.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" typedef float *TmpBufferAddress; diff --git a/mindspore/lite/nnacl/fp32/crop.c b/mindspore/lite/nnacl/fp32/crop_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/crop.c rename to mindspore/lite/nnacl/fp32/crop_fp32.c index 304dffd45f..2111a4ded5 100644 --- a/mindspore/lite/nnacl/fp32/crop.c +++ b/mindspore/lite/nnacl/fp32/crop_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/crop.h" +#include "nnacl/fp32/crop_fp32.h" #include #include "nnacl/op_base.h" #include "nnacl/crop_parameter.h" diff --git a/mindspore/lite/nnacl/fp32/crop.h b/mindspore/lite/nnacl/fp32/crop_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/crop.h rename to mindspore/lite/nnacl/fp32/crop_fp32.h diff --git a/mindspore/lite/nnacl/fp32/deconv.c b/mindspore/lite/nnacl/fp32/deconv_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/deconv.c rename to mindspore/lite/nnacl/fp32/deconv_fp32.c index 1a0e88e3d0..9bd1b7d97a 100644 --- a/mindspore/lite/nnacl/fp32/deconv.c +++ b/mindspore/lite/nnacl/fp32/deconv_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/deconv.h" +#include "nnacl/fp32/deconv_fp32.h" void PackDeConvWeightFp32(const float *weight, float *dst, int input_channel, int output_channel, int plane) { /* ichwoc(nhwc) -> oc4 * h * w * incUP4 * 4 */ diff --git a/mindspore/lite/nnacl/fp32/deconv.h b/mindspore/lite/nnacl/fp32/deconv_fp32.h similarity index 94% rename from mindspore/lite/nnacl/fp32/deconv.h rename to mindspore/lite/nnacl/fp32/deconv_fp32.h index e3140d39ee..fd3f68e40a 100644 --- a/mindspore/lite/nnacl/fp32/deconv.h +++ b/mindspore/lite/nnacl/fp32/deconv_fp32.h @@ -21,8 +21,8 @@ #include "nnacl/op_base.h" #include "nnacl/conv_parameter.h" #include "nnacl/errorcode.h" -#include "nnacl/fp32/common_func.h" -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/common_func_fp32.h" +#include "nnacl/fp32/conv_fp32.h" #include "nnacl/minimal_filtering_generator.h" #ifdef __cplusplus diff --git a/mindspore/lite/nnacl/fp32/deconv_winograd.c b/mindspore/lite/nnacl/fp32/deconv_winograd_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/deconv_winograd.c rename to mindspore/lite/nnacl/fp32/deconv_winograd_fp32.c index 7416770093..25095d9581 100644 --- a/mindspore/lite/nnacl/fp32/deconv_winograd.c +++ b/mindspore/lite/nnacl/fp32/deconv_winograd_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/deconv_winograd.h" +#include "nnacl/fp32/deconv_winograd_fp32.h" int PackDeConvWgDataFp32(float *nhwc_weight, DeConvComputeUnit *unit, ConvParameter *conv_param, DeConvParam *deconv_param) { diff --git a/mindspore/lite/nnacl/fp32/deconv_winograd.h b/mindspore/lite/nnacl/fp32/deconv_winograd_fp32.h similarity index 97% rename from mindspore/lite/nnacl/fp32/deconv_winograd.h rename to mindspore/lite/nnacl/fp32/deconv_winograd_fp32.h index 47c1993f02..beefa56315 100644 --- a/mindspore/lite/nnacl/fp32/deconv_winograd.h +++ b/mindspore/lite/nnacl/fp32/deconv_winograd_fp32.h @@ -21,7 +21,7 @@ #include "nnacl/op_base.h" #include "nnacl/conv_parameter.h" #include "nnacl/errorcode.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "nnacl/minimal_filtering_generator.h" #ifdef __cplusplus diff --git a/mindspore/lite/nnacl/fp32/detection_post_process.c b/mindspore/lite/nnacl/fp32/detection_post_process_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/detection_post_process.c rename to mindspore/lite/nnacl/fp32/detection_post_process_fp32.c index 771085690d..1fce048bad 100644 --- a/mindspore/lite/nnacl/fp32/detection_post_process.c +++ b/mindspore/lite/nnacl/fp32/detection_post_process_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/detection_post_process.h" +#include "nnacl/fp32/detection_post_process_fp32.h" #include #include "nnacl/errorcode.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/detection_post_process.h b/mindspore/lite/nnacl/fp32/detection_post_process_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/detection_post_process.h rename to mindspore/lite/nnacl/fp32/detection_post_process_fp32.h diff --git a/mindspore/lite/nnacl/fp32/elu.c b/mindspore/lite/nnacl/fp32/elu_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/elu.c rename to mindspore/lite/nnacl/fp32/elu_fp32.c index 01d5a2f848..87a3e27e22 100644 --- a/mindspore/lite/nnacl/fp32/elu.c +++ b/mindspore/lite/nnacl/fp32/elu_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/elu.h" +#include "nnacl/fp32/elu_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/elu.h b/mindspore/lite/nnacl/fp32/elu_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/elu.h rename to mindspore/lite/nnacl/fp32/elu_fp32.h diff --git a/mindspore/lite/nnacl/fp32/embedding_lookup.c b/mindspore/lite/nnacl/fp32/embedding_lookup_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/embedding_lookup.c rename to mindspore/lite/nnacl/fp32/embedding_lookup_fp32.c index 9549e8a954..858700b856 100644 --- a/mindspore/lite/nnacl/fp32/embedding_lookup.c +++ b/mindspore/lite/nnacl/fp32/embedding_lookup_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/embedding_lookup_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/embedding_lookup.h b/mindspore/lite/nnacl/fp32/embedding_lookup_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/embedding_lookup.h rename to mindspore/lite/nnacl/fp32/embedding_lookup_fp32.h diff --git a/mindspore/lite/nnacl/fp32/exp.c b/mindspore/lite/nnacl/fp32/exp_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/exp.c rename to mindspore/lite/nnacl/fp32/exp_fp32.c index e1790e47bc..a59f8925c3 100644 --- a/mindspore/lite/nnacl/fp32/exp.c +++ b/mindspore/lite/nnacl/fp32/exp_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/exp.h" +#include "nnacl/fp32/exp_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/exp.h b/mindspore/lite/nnacl/fp32/exp_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/exp.h rename to mindspore/lite/nnacl/fp32/exp_fp32.h diff --git a/mindspore/lite/nnacl/fp32/expandDims.c b/mindspore/lite/nnacl/fp32/expandDims_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/expandDims.c rename to mindspore/lite/nnacl/fp32/expandDims_fp32.c index 2bc9bc30be..373199f1ce 100644 --- a/mindspore/lite/nnacl/fp32/expandDims.c +++ b/mindspore/lite/nnacl/fp32/expandDims_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/expandDims.h" +#include "nnacl/fp32/expandDims_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/expandDims.h b/mindspore/lite/nnacl/fp32/expandDims_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/expandDims.h rename to mindspore/lite/nnacl/fp32/expandDims_fp32.h diff --git a/mindspore/lite/nnacl/fp32/fill.c b/mindspore/lite/nnacl/fp32/fill_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/fill.c rename to mindspore/lite/nnacl/fp32/fill_fp32.c index ba241f1a08..06a4423a6d 100644 --- a/mindspore/lite/nnacl/fp32/fill.c +++ b/mindspore/lite/nnacl/fp32/fill_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/fill.h" +#include "nnacl/fp32/fill_fp32.h" int Fill(float *output, int size, float data) { for (int i = 0; i < size; ++i) { diff --git a/mindspore/lite/nnacl/fp32/fill.h b/mindspore/lite/nnacl/fp32/fill_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/fill.h rename to mindspore/lite/nnacl/fp32/fill_fp32.h diff --git a/mindspore/lite/nnacl/fp32/gatherNd.c b/mindspore/lite/nnacl/fp32/gatherNd_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/gatherNd.c rename to mindspore/lite/nnacl/fp32/gatherNd_fp32.c index 1a0dc7120a..88cfdacf2a 100644 --- a/mindspore/lite/nnacl/fp32/gatherNd.c +++ b/mindspore/lite/nnacl/fp32/gatherNd_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/gatherNd.h" +#include "nnacl/fp32/gatherNd_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/gatherNd.h b/mindspore/lite/nnacl/fp32/gatherNd_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/gatherNd.h rename to mindspore/lite/nnacl/fp32/gatherNd_fp32.h diff --git a/mindspore/lite/nnacl/fp32/gather.c b/mindspore/lite/nnacl/fp32/gather_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/gather.c rename to mindspore/lite/nnacl/fp32/gather_fp32.c index 17eab54582..c899ec1fb8 100644 --- a/mindspore/lite/nnacl/fp32/gather.c +++ b/mindspore/lite/nnacl/fp32/gather_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/gather.h" +#include "nnacl/fp32/gather_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/gather.h b/mindspore/lite/nnacl/fp32/gather_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/gather.h rename to mindspore/lite/nnacl/fp32/gather_fp32.h diff --git a/mindspore/lite/nnacl/fp32/instance_norm.c b/mindspore/lite/nnacl/fp32/instance_norm_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/instance_norm.c rename to mindspore/lite/nnacl/fp32/instance_norm_fp32.c index 37daf57c7a..38eaf5444d 100644 --- a/mindspore/lite/nnacl/fp32/instance_norm.c +++ b/mindspore/lite/nnacl/fp32/instance_norm_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/instance_norm.h" +#include "nnacl/fp32/instance_norm_fp32.h" #include #include "nnacl/errorcode.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/instance_norm.h b/mindspore/lite/nnacl/fp32/instance_norm_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/instance_norm.h rename to mindspore/lite/nnacl/fp32/instance_norm_fp32.h diff --git a/mindspore/lite/nnacl/fp32/layer_norm.c b/mindspore/lite/nnacl/fp32/layer_norm_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/layer_norm.c rename to mindspore/lite/nnacl/fp32/layer_norm_fp32.c index 20eccc21e4..7a957bd856 100644 --- a/mindspore/lite/nnacl/fp32/layer_norm.c +++ b/mindspore/lite/nnacl/fp32/layer_norm_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/layer_norm.h" +#include "nnacl/fp32/layer_norm_fp32.h" #include #include "nnacl/errorcode.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/layer_norm.h b/mindspore/lite/nnacl/fp32/layer_norm_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/layer_norm.h rename to mindspore/lite/nnacl/fp32/layer_norm_fp32.h diff --git a/mindspore/lite/nnacl/fp32/local_response_norm.c b/mindspore/lite/nnacl/fp32/local_response_norm_fp32.c similarity index 96% rename from mindspore/lite/nnacl/fp32/local_response_norm.c rename to mindspore/lite/nnacl/fp32/local_response_norm_fp32.c index d50f2cdabf..93e2a0636a 100644 --- a/mindspore/lite/nnacl/fp32/local_response_norm.c +++ b/mindspore/lite/nnacl/fp32/local_response_norm_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/local_response_norm.h" +#include "nnacl/fp32/local_response_norm_fp32.h" #include int LocalResponseNorm(float *input_ptr, int out_size, int channel, float *output_ptr, diff --git a/mindspore/lite/nnacl/fp32/local_response_norm.h b/mindspore/lite/nnacl/fp32/local_response_norm_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/local_response_norm.h rename to mindspore/lite/nnacl/fp32/local_response_norm_fp32.h diff --git a/mindspore/lite/nnacl/fp32/lstm.c b/mindspore/lite/nnacl/fp32/lstm_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/lstm.c rename to mindspore/lite/nnacl/fp32/lstm_fp32.c index 2d8e96df20..802526e93c 100644 --- a/mindspore/lite/nnacl/fp32/lstm.c +++ b/mindspore/lite/nnacl/fp32/lstm_fp32.c @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "nnacl/fp32/lstm.h" +#include "nnacl/fp32/lstm_fp32.h" #include -#include "nnacl/fp32/activation.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/activation_fp32.h" +#include "nnacl/fp32/arithmetic_fp32.h" void InitGate(float *gate_buffer, const float *bias, LstmParameter *lstm_parm) { int gate_offest = 0; diff --git a/mindspore/lite/nnacl/fp32/lstm.h b/mindspore/lite/nnacl/fp32/lstm_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/lstm.h rename to mindspore/lite/nnacl/fp32/lstm_fp32.h diff --git a/mindspore/lite/nnacl/fp32/matmul.c b/mindspore/lite/nnacl/fp32/matmul_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/matmul.c rename to mindspore/lite/nnacl/fp32/matmul_fp32.c index e9c863cc69..f05bed22c3 100644 --- a/mindspore/lite/nnacl/fp32/matmul.c +++ b/mindspore/lite/nnacl/fp32/matmul_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" void RowMajor2ColMajor(const float *src_ptr, float *dst_ptr, int row, int col) { for (int r = 0; r < row; ++r) { diff --git a/mindspore/lite/nnacl/fp32/matmul.h b/mindspore/lite/nnacl/fp32/matmul_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/matmul.h rename to mindspore/lite/nnacl/fp32/matmul_fp32.h diff --git a/mindspore/lite/nnacl/fp32/one_hot.c b/mindspore/lite/nnacl/fp32/one_hot_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/one_hot.c rename to mindspore/lite/nnacl/fp32/one_hot_fp32.c index 913f375754..9878fee10d 100644 --- a/mindspore/lite/nnacl/fp32/one_hot.c +++ b/mindspore/lite/nnacl/fp32/one_hot_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/one_hot.h" +#include "nnacl/fp32/one_hot_fp32.h" #include "nnacl/errorcode.h" int OneHot(const int *indices, float *output, const OneHotParameter *one_hot_param, const int tid, diff --git a/mindspore/lite/nnacl/fp32/one_hot.h b/mindspore/lite/nnacl/fp32/one_hot_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/one_hot.h rename to mindspore/lite/nnacl/fp32/one_hot_fp32.h diff --git a/mindspore/lite/nnacl/fp32/pad.c b/mindspore/lite/nnacl/fp32/pad_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/pad.c rename to mindspore/lite/nnacl/fp32/pad_fp32.c index 4ee30f099e..7a69cca25d 100644 --- a/mindspore/lite/nnacl/fp32/pad.c +++ b/mindspore/lite/nnacl/fp32/pad_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/pad.h" +#include "nnacl/fp32/pad_fp32.h" #include "nnacl/common_func.h" void Pad(const float *input_data, float *output_data, const int *input_shape, const int *output_shape, diff --git a/mindspore/lite/nnacl/fp32/pad.h b/mindspore/lite/nnacl/fp32/pad_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/pad.h rename to mindspore/lite/nnacl/fp32/pad_fp32.h diff --git a/mindspore/lite/nnacl/fp32/pooling.c b/mindspore/lite/nnacl/fp32/pooling_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/pooling.c rename to mindspore/lite/nnacl/fp32/pooling_fp32.c index 8aab662d52..d13b664972 100644 --- a/mindspore/lite/nnacl/fp32/pooling.c +++ b/mindspore/lite/nnacl/fp32/pooling_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/pooling.h b/mindspore/lite/nnacl/fp32/pooling_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/pooling.h rename to mindspore/lite/nnacl/fp32/pooling_fp32.h diff --git a/mindspore/lite/nnacl/fp32/prelu.c b/mindspore/lite/nnacl/fp32/prelu_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/prelu.c rename to mindspore/lite/nnacl/fp32/prelu_fp32.c index cbfad6b48d..2599a7a14e 100644 --- a/mindspore/lite/nnacl/fp32/prelu.c +++ b/mindspore/lite/nnacl/fp32/prelu_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/prelu.h" +#include "nnacl/fp32/prelu_fp32.h" #ifdef ENABLE_NEON #include #endif diff --git a/mindspore/lite/nnacl/fp32/prelu.h b/mindspore/lite/nnacl/fp32/prelu_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/prelu.h rename to mindspore/lite/nnacl/fp32/prelu_fp32.h diff --git a/mindspore/lite/nnacl/fp32/range.c b/mindspore/lite/nnacl/fp32/range_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/range.c rename to mindspore/lite/nnacl/fp32/range_fp32.c index 4eec9be3e8..8234688700 100644 --- a/mindspore/lite/nnacl/fp32/range.c +++ b/mindspore/lite/nnacl/fp32/range_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/range.h" +#include "nnacl/fp32/range_fp32.h" void Range(float *output_ptr, int start, int limit, int delta) { size_t index = 0; diff --git a/mindspore/lite/nnacl/fp32/range.h b/mindspore/lite/nnacl/fp32/range_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/range.h rename to mindspore/lite/nnacl/fp32/range_fp32.h diff --git a/mindspore/lite/nnacl/fp32/rank.c b/mindspore/lite/nnacl/fp32/rank_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/rank.c rename to mindspore/lite/nnacl/fp32/rank_fp32.c index ddc6575e3b..e7c0de453f 100644 --- a/mindspore/lite/nnacl/fp32/rank.c +++ b/mindspore/lite/nnacl/fp32/rank_fp32.c @@ -14,6 +14,6 @@ * limitations under the License. */ -#include "nnacl/fp32/rank.h" +#include "nnacl/fp32/rank_fp32.h" void Rank(float *output, int rank) { output[0] = (float)(rank); } diff --git a/mindspore/lite/nnacl/fp32/rank.h b/mindspore/lite/nnacl/fp32/rank_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/rank.h rename to mindspore/lite/nnacl/fp32/rank_fp32.h diff --git a/mindspore/lite/nnacl/fp32/reduce.c b/mindspore/lite/nnacl/fp32/reduce_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/reduce.c rename to mindspore/lite/nnacl/fp32/reduce_fp32.c index 156579a276..9a277768b5 100644 --- a/mindspore/lite/nnacl/fp32/reduce.c +++ b/mindspore/lite/nnacl/fp32/reduce_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce_fp32.h" #include #include "nnacl/errorcode.h" #include "nnacl/common_func.h" diff --git a/mindspore/lite/nnacl/fp32/reduce.h b/mindspore/lite/nnacl/fp32/reduce_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/reduce.h rename to mindspore/lite/nnacl/fp32/reduce_fp32.h diff --git a/mindspore/lite/nnacl/fp32/resize.c b/mindspore/lite/nnacl/fp32/resize_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/resize.c rename to mindspore/lite/nnacl/fp32/resize_fp32.c index 00eced68e7..b82fffb742 100644 --- a/mindspore/lite/nnacl/fp32/resize.c +++ b/mindspore/lite/nnacl/fp32/resize_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include "nnacl/fp32/resize.h" +#include "nnacl/fp32/resize_fp32.h" #include "nnacl/common_func.h" #include "nnacl/errorcode.h" int PrepareResizeBilinear(const int *input_shape, const int *output_shape, bool align_corners, int *y_bottoms, diff --git a/mindspore/lite/nnacl/fp32/resize.h b/mindspore/lite/nnacl/fp32/resize_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/resize.h rename to mindspore/lite/nnacl/fp32/resize_fp32.h diff --git a/mindspore/lite/nnacl/fp32/reverse.c b/mindspore/lite/nnacl/fp32/reverse_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/reverse.c rename to mindspore/lite/nnacl/fp32/reverse_fp32.c index 329577a3cc..aa15d32016 100644 --- a/mindspore/lite/nnacl/fp32/reverse.c +++ b/mindspore/lite/nnacl/fp32/reverse_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/reverse.h" +#include "nnacl/fp32/reverse_fp32.h" #include #include "nnacl/op_base.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/reverse.h b/mindspore/lite/nnacl/fp32/reverse_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/reverse.h rename to mindspore/lite/nnacl/fp32/reverse_fp32.h diff --git a/mindspore/lite/nnacl/fp32/roi_pooling.c b/mindspore/lite/nnacl/fp32/roi_pooling_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/roi_pooling.c rename to mindspore/lite/nnacl/fp32/roi_pooling_fp32.c index 68f3fa4f76..cccb0b6e1b 100644 --- a/mindspore/lite/nnacl/fp32/roi_pooling.c +++ b/mindspore/lite/nnacl/fp32/roi_pooling_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/roi_pooling.h" +#include "nnacl/fp32/roi_pooling_fp32.h" #include #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/roi_pooling.h b/mindspore/lite/nnacl/fp32/roi_pooling_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/roi_pooling.h rename to mindspore/lite/nnacl/fp32/roi_pooling_fp32.h diff --git a/mindspore/lite/nnacl/fp32/scale.c b/mindspore/lite/nnacl/fp32/scale_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/scale.c rename to mindspore/lite/nnacl/fp32/scale_fp32.c index 03cc7bf3b7..e81c6ffd04 100644 --- a/mindspore/lite/nnacl/fp32/scale.c +++ b/mindspore/lite/nnacl/fp32/scale_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/scale.h" +#include "nnacl/fp32/scale_fp32.h" #ifdef ENABLE_ARM #include #endif diff --git a/mindspore/lite/nnacl/fp32/scale.h b/mindspore/lite/nnacl/fp32/scale_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/scale.h rename to mindspore/lite/nnacl/fp32/scale_fp32.h diff --git a/mindspore/lite/nnacl/fp32/skip_gram.h b/mindspore/lite/nnacl/fp32/skip_gram_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/skip_gram.h rename to mindspore/lite/nnacl/fp32/skip_gram_fp32.h diff --git a/mindspore/lite/nnacl/fp32/slice.c b/mindspore/lite/nnacl/fp32/slice_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/slice.c rename to mindspore/lite/nnacl/fp32/slice_fp32.c index 4233bd88b3..9e72e74544 100644 --- a/mindspore/lite/nnacl/fp32/slice.c +++ b/mindspore/lite/nnacl/fp32/slice_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/slice.h" +#include "nnacl/fp32/slice_fp32.h" #include #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/slice.h b/mindspore/lite/nnacl/fp32/slice_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/slice.h rename to mindspore/lite/nnacl/fp32/slice_fp32.h diff --git a/mindspore/lite/nnacl/fp32/softmax.c b/mindspore/lite/nnacl/fp32/softmax_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/softmax.c rename to mindspore/lite/nnacl/fp32/softmax_fp32.c index 2315ce8c90..aa2d2a0248 100644 --- a/mindspore/lite/nnacl/fp32/softmax.c +++ b/mindspore/lite/nnacl/fp32/softmax_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.h" #include // output = exp(input) / reduce_sum(exp(input), axis) diff --git a/mindspore/lite/nnacl/fp32/softmax.h b/mindspore/lite/nnacl/fp32/softmax_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/softmax.h rename to mindspore/lite/nnacl/fp32/softmax_fp32.h diff --git a/mindspore/lite/nnacl/fp32/space_to_batch.c b/mindspore/lite/nnacl/fp32/space_to_batch_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/space_to_batch.c rename to mindspore/lite/nnacl/fp32/space_to_batch_fp32.c index 68f880f61d..7e6b9e98aa 100644 --- a/mindspore/lite/nnacl/fp32/space_to_batch.c +++ b/mindspore/lite/nnacl/fp32/space_to_batch_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" #include "nnacl/arithmetic_common.h" void DoSpaceToBatchNHWC(const float *input, float *output, const int *block_sizes, const int *in_shape, diff --git a/mindspore/lite/nnacl/fp32/space_to_batch.h b/mindspore/lite/nnacl/fp32/space_to_batch_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/space_to_batch.h rename to mindspore/lite/nnacl/fp32/space_to_batch_fp32.h diff --git a/mindspore/lite/nnacl/fp32/space_to_depth.c b/mindspore/lite/nnacl/fp32/space_to_depth_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/space_to_depth.c rename to mindspore/lite/nnacl/fp32/space_to_depth_fp32.c index bc0ee6d5df..ceac8f7368 100644 --- a/mindspore/lite/nnacl/fp32/space_to_depth.c +++ b/mindspore/lite/nnacl/fp32/space_to_depth_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/space_to_depth.h" +#include "nnacl/fp32/space_to_depth_fp32.h" #include "nnacl/arithmetic_common.h" #include "nnacl/errorcode.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/nnacl/fp32/space_to_depth.h b/mindspore/lite/nnacl/fp32/space_to_depth_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/space_to_depth.h rename to mindspore/lite/nnacl/fp32/space_to_depth_fp32.h diff --git a/mindspore/lite/nnacl/fp32/sparse_to_dense.c b/mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.c similarity index 97% rename from mindspore/lite/nnacl/fp32/sparse_to_dense.c rename to mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.c index ccc795b95a..0e7e4696b5 100644 --- a/mindspore/lite/nnacl/fp32/sparse_to_dense.c +++ b/mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "nnacl/fp32/sparse_to_dense.h" +#include "nnacl/fp32/sparse_to_dense_fp32.h" void SparseToDense(int **sparse_indices, const int *output_shape, const float *sparse_values, float default_value, float *output, bool isScalar, int index_start, int index_end, int out_width) { diff --git a/mindspore/lite/nnacl/fp32/sparse_to_dense.h b/mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/sparse_to_dense.h rename to mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.h diff --git a/mindspore/lite/nnacl/fp32/stack.c b/mindspore/lite/nnacl/fp32/stack_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/stack.c rename to mindspore/lite/nnacl/fp32/stack_fp32.c index 6dd4d3b9e7..b8ebad4b69 100644 --- a/mindspore/lite/nnacl/fp32/stack.c +++ b/mindspore/lite/nnacl/fp32/stack_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/stack.h" +#include "nnacl/fp32/stack_fp32.h" #include "nnacl/arithmetic_common.h" size_t GetStackCopyNum(int axis, const int *in_shape, size_t shape_size) { diff --git a/mindspore/lite/nnacl/fp32/stack.h b/mindspore/lite/nnacl/fp32/stack_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/stack.h rename to mindspore/lite/nnacl/fp32/stack_fp32.h diff --git a/mindspore/lite/nnacl/fp32/tile.c b/mindspore/lite/nnacl/fp32/tile_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/tile.c rename to mindspore/lite/nnacl/fp32/tile_fp32.c index 7903f68a7f..23e8ef0a56 100644 --- a/mindspore/lite/nnacl/fp32/tile.c +++ b/mindspore/lite/nnacl/fp32/tile_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/tile.h" +#include "nnacl/fp32/tile_fp32.h" #include void DoCopyData(const float *input_data, float *output_data, size_t size, size_t multiple) { diff --git a/mindspore/lite/nnacl/fp32/tile.h b/mindspore/lite/nnacl/fp32/tile_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/tile.h rename to mindspore/lite/nnacl/fp32/tile_fp32.h diff --git a/mindspore/lite/nnacl/fp32/topk.c b/mindspore/lite/nnacl/fp32/topk_fp32.c similarity index 98% rename from mindspore/lite/nnacl/fp32/topk.c rename to mindspore/lite/nnacl/fp32/topk_fp32.c index a9b48d7295..e27848fcb8 100644 --- a/mindspore/lite/nnacl/fp32/topk.c +++ b/mindspore/lite/nnacl/fp32/topk_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/topk.h" +#include "nnacl/fp32/topk_fp32.h" int DescendCmp(const void *a, const void *b) { float sub = ((const TopkNode *)b)->element - ((const TopkNode *)a)->element; diff --git a/mindspore/lite/nnacl/fp32/topk.h b/mindspore/lite/nnacl/fp32/topk_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/topk.h rename to mindspore/lite/nnacl/fp32/topk_fp32.h diff --git a/mindspore/lite/nnacl/fp32/transpose.c b/mindspore/lite/nnacl/fp32/transpose_fp32.c similarity index 99% rename from mindspore/lite/nnacl/fp32/transpose.c rename to mindspore/lite/nnacl/fp32/transpose_fp32.c index e70f796aff..5b4f587953 100644 --- a/mindspore/lite/nnacl/fp32/transpose.c +++ b/mindspore/lite/nnacl/fp32/transpose_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/transpose.h" +#include "nnacl/fp32/transpose_fp32.h" void TransposeDim2Fp32(const float *in_data, float *out_data, const int *strides, int *out_strides, const int *perm, const int *output_shape, int h_start, int h_end) { diff --git a/mindspore/lite/nnacl/fp32/transpose.h b/mindspore/lite/nnacl/fp32/transpose_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/transpose.h rename to mindspore/lite/nnacl/fp32/transpose_fp32.h diff --git a/mindspore/lite/nnacl/fp32/unique.c b/mindspore/lite/nnacl/fp32/unique_fp32.c similarity index 96% rename from mindspore/lite/nnacl/fp32/unique.c rename to mindspore/lite/nnacl/fp32/unique_fp32.c index ea9214dca9..96a5a89732 100644 --- a/mindspore/lite/nnacl/fp32/unique.c +++ b/mindspore/lite/nnacl/fp32/unique_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/unique.h" +#include "nnacl/fp32/unique_fp32.h" int Find(const float *array, int len, float target) { for (int i = 0; i < len; ++i) { diff --git a/mindspore/lite/nnacl/fp32/unique.h b/mindspore/lite/nnacl/fp32/unique_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/unique.h rename to mindspore/lite/nnacl/fp32/unique_fp32.h diff --git a/mindspore/lite/nnacl/fp32/unsqueeze.c b/mindspore/lite/nnacl/fp32/unsqueeze_fp32.c similarity index 95% rename from mindspore/lite/nnacl/fp32/unsqueeze.c rename to mindspore/lite/nnacl/fp32/unsqueeze_fp32.c index 4eba6b7edf..b45befa55a 100644 --- a/mindspore/lite/nnacl/fp32/unsqueeze.c +++ b/mindspore/lite/nnacl/fp32/unsqueeze_fp32.c @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "nnacl/fp32/unsqueeze.h" +#include "nnacl/fp32/unsqueeze_fp32.h" #include #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32/unsqueeze.h b/mindspore/lite/nnacl/fp32/unsqueeze_fp32.h similarity index 100% rename from mindspore/lite/nnacl/fp32/unsqueeze.h rename to mindspore/lite/nnacl/fp32/unsqueeze_fp32.h diff --git a/mindspore/lite/nnacl/fp32_grad/activation_grad.c b/mindspore/lite/nnacl/fp32_grad/activation_grad.c index df20d9447e..cb8c7fb16d 100644 --- a/mindspore/lite/nnacl/fp32_grad/activation_grad.c +++ b/mindspore/lite/nnacl/fp32_grad/activation_grad.c @@ -16,7 +16,7 @@ #include #include "nnacl/op_base.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/fp32_grad/activation_grad.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/nnacl/fp32_grad/activation_grad.h b/mindspore/lite/nnacl/fp32_grad/activation_grad.h index 7ce788badd..5863f87284 100644 --- a/mindspore/lite/nnacl/fp32_grad/activation_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/activation_grad.h @@ -18,7 +18,7 @@ #include #include "nnacl/op_base.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/errorcode.h" typedef struct ActivationGradParameter { diff --git a/mindspore/lite/nnacl/fp32_grad/gemm.c b/mindspore/lite/nnacl/fp32_grad/gemm.c index 92a718cef6..a48d7c0c8c 100644 --- a/mindspore/lite/nnacl/fp32_grad/gemm.c +++ b/mindspore/lite/nnacl/fp32_grad/gemm.c @@ -19,7 +19,7 @@ #ifdef __ARM_NEON #include #endif -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" static void addv(const float *restrict v1, float *restrict v2, float beta, int row, int col, int stride) { const float *src_ptr = v1; diff --git a/mindspore/lite/nnacl/fp32_grad/pooling_grad.h b/mindspore/lite/nnacl/fp32_grad/pooling_grad.h index 005f13384a..0af884b449 100644 --- a/mindspore/lite/nnacl/fp32_grad/pooling_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/pooling_grad.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_NNACL_FP32_GRAD_POOLING_GRAD_H_ #define MINDSPORE_LITE_NNACL_FP32_GRAD_POOLING_GRAD_H_ -#include "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/nnacl/fp32_grad/softmax_grad.h b/mindspore/lite/nnacl/fp32_grad/softmax_grad.h index 44da4864d5..5acef0c2e3 100644 --- a/mindspore/lite/nnacl/fp32_grad/softmax_grad.h +++ b/mindspore/lite/nnacl/fp32_grad/softmax_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_NNACL_FP32_GRAD_SOFTMAX_GRAD_H_ #include "nnacl/op_base.h" -#include "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.h" #ifdef __cplusplus extern "C" { @@ -32,8 +32,8 @@ typedef struct SoftmaxCrossEntropyParameter { int input_shape_[5]; } SoftmaxCrossEntropyParameter; -void SoftmaxGrad(const float *input_ptr, const float *yt_ptr, float *output_ptr, float *sum_data, - float *sum_mul, SoftmaxParameter *parameter); +void SoftmaxGrad(const float *input_ptr, const float *yt_ptr, float *output_ptr, float *sum_data, float *sum_mul, + SoftmaxParameter *parameter); #ifdef __cplusplus } #endif diff --git a/mindspore/lite/nnacl/int8/conv_depthwise_int8.h b/mindspore/lite/nnacl/int8/conv_depthwise_int8.h index 123c0675d3..9ff845a3e7 100644 --- a/mindspore/lite/nnacl/int8/conv_depthwise_int8.h +++ b/mindspore/lite/nnacl/int8/conv_depthwise_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_NNACL_INT8_CONV_DEPTHWISE_H_ #include "nnacl/conv_parameter.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/nnacl/int8/pooling_int8.h b/mindspore/lite/nnacl/int8/pooling_int8.h index 7bf013dcdb..623aa05dbd 100644 --- a/mindspore/lite/nnacl/int8/pooling_int8.h +++ b/mindspore/lite/nnacl/int8/pooling_int8.h @@ -21,7 +21,7 @@ #include #endif #include "nnacl/op_base.h" -#include "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/nnacl/int8/space_to_batch_int8.h b/mindspore/lite/nnacl/int8/space_to_batch_int8.h index ad9f00f9f4..a8e6df17a8 100644 --- a/mindspore/lite/nnacl/int8/space_to_batch_int8.h +++ b/mindspore/lite/nnacl/int8/space_to_batch_int8.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_NNACL_INT8_SPACE_TO_BATCH_INT8_H_ #include "nnacl/op_base.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" #ifdef __cplusplus extern "C" { diff --git a/mindspore/lite/nnacl/int8/tanh_int8.h b/mindspore/lite/nnacl/int8/tanh_int8.h index 17c8ab3edd..e814ce01c1 100644 --- a/mindspore/lite/nnacl/int8/tanh_int8.h +++ b/mindspore/lite/nnacl/int8/tanh_int8.h @@ -21,7 +21,7 @@ #include "nnacl/quantization/quantize.h" #include "nnacl/quantization/fixed_point.h" #include "nnacl/int8/quant_dtype_cast_int8.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" typedef struct TanhQuantParameter { int32_t in_zp_; diff --git a/mindspore/lite/nnacl/int8/topk_int8.h b/mindspore/lite/nnacl/int8/topk_int8.h index d318b62eed..6dfb76725c 100644 --- a/mindspore/lite/nnacl/int8/topk_int8.h +++ b/mindspore/lite/nnacl/int8/topk_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_NNACL_INT8_TOPK_INT8_H_ #include "nnacl/op_base.h" -#include "nnacl/fp32/topk.h" +#include "nnacl/fp32/topk_fp32.h" typedef struct TopkNodeInt8 { int8_t element; diff --git a/mindspore/lite/nnacl/winograd_transform.h b/mindspore/lite/nnacl/winograd_transform.h index 4d28eaa037..de5053a433 100644 --- a/mindspore/lite/nnacl/winograd_transform.h +++ b/mindspore/lite/nnacl/winograd_transform.h @@ -22,7 +22,7 @@ #endif #include #include "nnacl/pack.h" -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_fp32.h" #include "nnacl/winograd_utils.h" #include "nnacl/quantization/fixed_point.h" diff --git a/mindspore/lite/nnacl/x86_64_sse/DepthwiseFp32_Sse.c b/mindspore/lite/nnacl/x86_64_sse/DepthwiseFp32_Sse.c index e4cc2fb689..bd2bad1487 100644 --- a/mindspore/lite/nnacl/x86_64_sse/DepthwiseFp32_Sse.c +++ b/mindspore/lite/nnacl/x86_64_sse/DepthwiseFp32_Sse.c @@ -16,7 +16,7 @@ #ifdef ENABLE_X86_64_SSE #include -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" void ConvDwFp32Border(float *dst, const float *src, const float *weight, const float *bias, size_t height, size_t width, size_t in_kh_step, size_t in_kw_step, size_t kernel_w_step, size_t relu, size_t relu6) { diff --git a/mindspore/lite/nnacl/x86_64_sse/PosFuncBiasRelu.c b/mindspore/lite/nnacl/x86_64_sse/PosFuncBiasRelu.c index df015db0c4..ffc54c1988 100644 --- a/mindspore/lite/nnacl/x86_64_sse/PosFuncBiasRelu.c +++ b/mindspore/lite/nnacl/x86_64_sse/PosFuncBiasRelu.c @@ -16,7 +16,7 @@ #ifdef ENABLE_X86_64_SSE #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" void PostFuncBiasReluC8(float *dst, const float *src, const float *bias, size_t oc8div, size_t oc8mod, size_t plane_size, size_t stride, size_t relu_type) { diff --git a/mindspore/lite/nnacl/x86_64_sse/WinogradTrans.c b/mindspore/lite/nnacl/x86_64_sse/WinogradTrans.c index b8dbba797d..03282532a7 100644 --- a/mindspore/lite/nnacl/x86_64_sse/WinogradTrans.c +++ b/mindspore/lite/nnacl/x86_64_sse/WinogradTrans.c @@ -15,7 +15,7 @@ */ #ifdef ENABLE_X86_64_SSE #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" void WinogradTransLeft(const float *S, const float *B, float *M, size_t w, size_t h, size_t k, size_t length) { size_t len_c4 = length * 4; diff --git a/mindspore/lite/src/ops/populate/activation_populate.cc b/mindspore/lite/src/ops/populate/activation_populate.cc index 3688bb414e..82a4e99046 100644 --- a/mindspore/lite/src/ops/populate/activation_populate.cc +++ b/mindspore/lite/src/ops/populate/activation_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/activation.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/broadcast_to_populate.cc b/mindspore/lite/src/ops/populate/broadcast_to_populate.cc index f30bc7f5de..b73188cbff 100644 --- a/mindspore/lite/src/ops/populate/broadcast_to_populate.cc +++ b/mindspore/lite/src/ops/populate/broadcast_to_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/broadcast_to.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/broadcast_to.h" +#include "nnacl/fp32/broadcast_to_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/cast_populate.cc b/mindspore/lite/src/ops/populate/cast_populate.cc index b83d6af0eb..62aa39d292 100644 --- a/mindspore/lite/src/ops/populate/cast_populate.cc +++ b/mindspore/lite/src/ops/populate/cast_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/cast.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/cast.h" +#include "nnacl/fp32/cast_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/constant_of_shape_populate.cc b/mindspore/lite/src/ops/populate/constant_of_shape_populate.cc index dee7ac9a59..9286c2cc3b 100644 --- a/mindspore/lite/src/ops/populate/constant_of_shape_populate.cc +++ b/mindspore/lite/src/ops/populate/constant_of_shape_populate.cc @@ -19,7 +19,7 @@ #include "src/tensor.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/constant_of_shape.h" +#include "nnacl/fp32/constant_of_shape_fp32.h" namespace mindspore::lite { namespace { diff --git a/mindspore/lite/src/ops/populate/elu_populate.cc b/mindspore/lite/src/ops/populate/elu_populate.cc index 107e9f4135..95821b6481 100644 --- a/mindspore/lite/src/ops/populate/elu_populate.cc +++ b/mindspore/lite/src/ops/populate/elu_populate.cc @@ -15,7 +15,7 @@ */ #include "src/ops/elu.h" -#include "nnacl/fp32/elu.h" +#include "nnacl/fp32/elu_fp32.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" diff --git a/mindspore/lite/src/ops/populate/embedding_lookup_populate.cc b/mindspore/lite/src/ops/populate/embedding_lookup_populate.cc index 18fa81e1b0..907aa261f9 100644 --- a/mindspore/lite/src/ops/populate/embedding_lookup_populate.cc +++ b/mindspore/lite/src/ops/populate/embedding_lookup_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/embedding_lookup.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/embedding_lookup_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/exp_populate.cc b/mindspore/lite/src/ops/populate/exp_populate.cc index 0ceee08e05..4535413fe7 100644 --- a/mindspore/lite/src/ops/populate/exp_populate.cc +++ b/mindspore/lite/src/ops/populate/exp_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/exp.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/exp.h" +#include "nnacl/fp32/exp_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/expand_dims_populate.cc b/mindspore/lite/src/ops/populate/expand_dims_populate.cc index cb48fe701a..23696d7575 100644 --- a/mindspore/lite/src/ops/populate/expand_dims_populate.cc +++ b/mindspore/lite/src/ops/populate/expand_dims_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/expand_dims.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/expandDims.h" +#include "nnacl/fp32/expandDims_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/fill_populate.cc b/mindspore/lite/src/ops/populate/fill_populate.cc index a3c3d75b86..b4ce010664 100644 --- a/mindspore/lite/src/ops/populate/fill_populate.cc +++ b/mindspore/lite/src/ops/populate/fill_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/fill.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/fill.h" +#include "nnacl/fp32/fill_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/gather_nd_populate.cc b/mindspore/lite/src/ops/populate/gather_nd_populate.cc index 045dc9e3fd..ee546a7d30 100644 --- a/mindspore/lite/src/ops/populate/gather_nd_populate.cc +++ b/mindspore/lite/src/ops/populate/gather_nd_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/gather_nd.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/gatherNd.h" +#include "nnacl/fp32/gatherNd_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/local_response_normalization_populate.cc b/mindspore/lite/src/ops/populate/local_response_normalization_populate.cc index b2260a712b..36fc15ce04 100644 --- a/mindspore/lite/src/ops/populate/local_response_normalization_populate.cc +++ b/mindspore/lite/src/ops/populate/local_response_normalization_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/local_response_normalization.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/local_response_norm.h" +#include "nnacl/fp32/local_response_norm_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/lstm_populate.cc b/mindspore/lite/src/ops/populate/lstm_populate.cc index 182282d852..7939498b10 100644 --- a/mindspore/lite/src/ops/populate/lstm_populate.cc +++ b/mindspore/lite/src/ops/populate/lstm_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/lstm.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/lstm.h" +#include "nnacl/fp32/lstm_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/one_hot_populate.cc b/mindspore/lite/src/ops/populate/one_hot_populate.cc index fa470131b0..2964637be0 100644 --- a/mindspore/lite/src/ops/populate/one_hot_populate.cc +++ b/mindspore/lite/src/ops/populate/one_hot_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/one_hot.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/one_hot.h" +#include "nnacl/fp32/one_hot_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/range_populate.cc b/mindspore/lite/src/ops/populate/range_populate.cc index 0c02abcbd9..71baee7067 100644 --- a/mindspore/lite/src/ops/populate/range_populate.cc +++ b/mindspore/lite/src/ops/populate/range_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/range.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/range.h" +#include "nnacl/fp32/range_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/reverse_populate.cc b/mindspore/lite/src/ops/populate/reverse_populate.cc index 3e22f38e8c..08a4c989c6 100644 --- a/mindspore/lite/src/ops/populate/reverse_populate.cc +++ b/mindspore/lite/src/ops/populate/reverse_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/reverse.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/reverse.h" +#include "nnacl/fp32/reverse_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/roi_pooling_populate.cc b/mindspore/lite/src/ops/populate/roi_pooling_populate.cc index 016328de83..e0c2f09453 100644 --- a/mindspore/lite/src/ops/populate/roi_pooling_populate.cc +++ b/mindspore/lite/src/ops/populate/roi_pooling_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/roi_pooling.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/roi_pooling.h" +#include "nnacl/fp32/roi_pooling_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/skip_gram_populate.cc b/mindspore/lite/src/ops/populate/skip_gram_populate.cc index 6f690e9ab7..36c7fb97cd 100644 --- a/mindspore/lite/src/ops/populate/skip_gram_populate.cc +++ b/mindspore/lite/src/ops/populate/skip_gram_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/skip_gram.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/skip_gram.h" +#include "nnacl/fp32/skip_gram_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc b/mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc index a2d89ec44e..e7bd5b7012 100644 --- a/mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc +++ b/mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc @@ -18,7 +18,7 @@ #include "src/common/common.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/space_to_batch_populate.cc b/mindspore/lite/src/ops/populate/space_to_batch_populate.cc index de096f1fd4..94546565d5 100644 --- a/mindspore/lite/src/ops/populate/space_to_batch_populate.cc +++ b/mindspore/lite/src/ops/populate/space_to_batch_populate.cc @@ -18,7 +18,7 @@ #include "src/common/common.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/space_to_depth_populate.cc b/mindspore/lite/src/ops/populate/space_to_depth_populate.cc index 6ea0c6dd62..5c6c3f6c64 100644 --- a/mindspore/lite/src/ops/populate/space_to_depth_populate.cc +++ b/mindspore/lite/src/ops/populate/space_to_depth_populate.cc @@ -18,7 +18,7 @@ #include "src/common/common.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/space_to_depth.h" +#include "nnacl/fp32/space_to_depth_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/tile_populate.cc b/mindspore/lite/src/ops/populate/tile_populate.cc index 8d8bbdd2b5..7608a307f1 100644 --- a/mindspore/lite/src/ops/populate/tile_populate.cc +++ b/mindspore/lite/src/ops/populate/tile_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/tile.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/tile.h" +#include "nnacl/fp32/tile_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/topk_populate.cc b/mindspore/lite/src/ops/populate/topk_populate.cc index e75069311d..bafb35493e 100644 --- a/mindspore/lite/src/ops/populate/topk_populate.cc +++ b/mindspore/lite/src/ops/populate/topk_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/topk.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/topk.h" +#include "nnacl/fp32/topk_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/unique_populate.cc b/mindspore/lite/src/ops/populate/unique_populate.cc index d81aa778fe..1ba3424ab8 100644 --- a/mindspore/lite/src/ops/populate/unique_populate.cc +++ b/mindspore/lite/src/ops/populate/unique_populate.cc @@ -17,7 +17,7 @@ #include "src/ops/unique.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/unique.h" +#include "nnacl/fp32/unique_fp32.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/unsqueeze_populate.cc b/mindspore/lite/src/ops/populate/unsqueeze_populate.cc index d4fbd20506..1af7f210c7 100644 --- a/mindspore/lite/src/ops/populate/unsqueeze_populate.cc +++ b/mindspore/lite/src/ops/populate/unsqueeze_populate.cc @@ -19,7 +19,7 @@ #include "src/tensor.h" #include "src/ops/primitive_c.h" #include "src/ops/populate/populate_register.h" -#include "nnacl/fp32/unsqueeze.h" +#include "nnacl/fp32/unsqueeze_fp32.h" namespace mindspore { namespace lite { 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 20a36b1f55..05418a54a0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/concat_base.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/base/concat_base.h" #include #include "src/runtime/kernel/arm/fp32/concat_fp32.h" -#include "nnacl/fp32/concat.h" +#include "nnacl/fp32/concat_fp32.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/base/detection_post_process_base.h b/mindspore/lite/src/runtime/kernel/arm/base/detection_post_process_base.h index 480bf8f686..5f9fce4d1f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/detection_post_process_base.h +++ b/mindspore/lite/src/runtime/kernel/arm/base/detection_post_process_base.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/detection_post_process.h" +#include "nnacl/fp32/detection_post_process_fp32.h" using mindspore::lite::InnerContext; 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 a837e452f0..c14594d53a 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 "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" #include "include/errorcode.h" using mindspore::lite::InnerContext; 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 0afe0206fb..6b24bfcb97 100644 --- a/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc +++ b/mindspore/lite/src/runtime/kernel/arm/base/softmax_base.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/base/softmax_base.h" #include #include "src/runtime/kernel/arm/fp32/softmax_fp32.h" -#include "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/activation_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/activation_fp32.h index 3ea436f8cc..9ea331c41e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/activation_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/activation_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" namespace mindspore::kernel { class ActivationCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc index 6f52c3bb5b..7d7b032b9f 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/arithmetic_compare_fp32.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/arithmetic_compare.h" +#include "nnacl/fp32/arithmetic_compare_fp32.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_fp32.h index 128d2b851c..552118fef2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "schema/model_generated.h" using mindspore::schema::PrimitiveType_Add; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self_fp32.cc index 41a3abbe31..7482874ff0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/arithmetic_self_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/arithmetic_self_fp32.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/arithmetic_self.h" +#include "nnacl/fp32/arithmetic_self_fp32.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm_fp32.h index 5eb97da9b4..f0ca7df919 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/batchnorm_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/batchnorm.h" +#include "nnacl/fp32/batchnorm_fp32.h" #include "nnacl/batchnorm_parameter.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/bias_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/bias_fp32.h index 800af6ffc9..f9958e2410 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/bias_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/bias_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BIAS_H_ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" namespace mindspore::kernel { class BiasCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to_fp32.h index 3a7cf853a7..349b18ddb0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/broadcast_to_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/broadcast_to.h" +#include "nnacl/fp32/broadcast_to_fp32.h" namespace mindspore::kernel { class BroadcastToCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/cast_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/cast_fp32.cc index 3b826b5a3f..a38db5ef17 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/cast_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/cast_fp32.cc @@ -18,7 +18,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/tensor.h" -#include "nnacl/fp32/cast.h" +#include "nnacl/fp32/cast_fp32.h" #include "nnacl/op_base.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/concat_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/concat_fp32.cc index dc508e0351..b5ca931e00 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/concat_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/concat_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/concat_fp32.h" #include -#include "nnacl/fp32/concat.h" +#include "nnacl/fp32/concat_fp32.h" #include "src/kernel_registry.h" #include "schema/model_generated.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape_fp32.h index e9ca8bcf75..682ae1b9d7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/constant_of_shape_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/constant_of_shape.h" +#include "nnacl/fp32/constant_of_shape_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1_fp32.h index 1755bb1da4..cfebe35e00 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_1x1_fp32.h @@ -25,10 +25,10 @@ #include "nnacl/winograd_transform.h" #include "src/runtime/kernel/arm/base/convolution_base.h" #include "src/runtime/kernel/arm/base/layout_transform.h" -#include "nnacl/fp32/conv.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/conv_fp32.h" +#include "nnacl/fp32/common_func_fp32.h" #include "nnacl/matmul_parameter.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" namespace mindspore::kernel { class Convolution1x1CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3_fp32.h index f16ca37811..e37ab40002 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_3x3_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class ConvolutionDepthwise3x3CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32.h index ed9067f6c0..27a51372d9 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class ConvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_slidewindow_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_slidewindow_fp32.h index 726de88f7d..ac40964498 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_slidewindow_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_depthwise_slidewindow_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class ConvolutionDepthwiseSWCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.cc index 1dfa2e01d2..195c69e90e 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.cc @@ -18,7 +18,7 @@ #include "src/runtime/kernel/arm/fp32/convolution_1x1_fp32.h" #include "src/runtime/kernel/arm/fp32/convolution_winograd_fp32.h" #include "src/runtime/kernel/arm/fp32/group_convolution_fp32.h" -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_fp32.h" #include "nnacl/common_func.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.h index 41e41d9599..f4879c11d0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_fp32.h @@ -21,7 +21,7 @@ #include "src/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_fp32.h" namespace mindspore::kernel { class ConvolutionCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd_fp32.cc index 51ebcc7261..121b7797d5 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/convolution_winograd_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/convolution_winograd_fp32.h" -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_fp32.h" #include "nnacl/pack.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/crop_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/crop_fp32.cc index 0376fb4c29..07e35e4487 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/crop_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/crop_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/crop_fp32.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/crop.h" +#include "nnacl/fp32/crop_fp32.h" #include "nnacl/crop_parameter.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise_fp32.h index ccd07327e3..350584a2b7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_depthwise_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class DeconvolutionDepthwiseCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_fp32.h index 386358067c..593d9eec82 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_fp32.h @@ -24,8 +24,8 @@ #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/deconv.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/deconv_fp32.h" +#include "nnacl/fp32/matmul_fp32.h" namespace mindspore::kernel { class DeConvolutionCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_winograd_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_winograd_fp32.h index 9522438299..f949066606 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_winograd_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_winograd_fp32.h @@ -23,8 +23,8 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "schema/model_generated.h" -#include "nnacl/fp32/matmul.h" -#include "nnacl/fp32/deconv_winograd.h" +#include "nnacl/fp32/matmul_fp32.h" +#include "nnacl/fp32/deconv_winograd_fp32.h" #include "src/runtime/kernel/arm/base/convolution_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/detection_post_process_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/detection_post_process_fp32.h index 4afe75500c..29da37f837 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/detection_post_process_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/detection_post_process_fp32.h @@ -21,7 +21,7 @@ #include "src/lite_kernel.h" #include "include/context.h" #include "src/runtime/kernel/arm/base/detection_post_process_base.h" -#include "nnacl/fp32/detection_post_process.h" +#include "nnacl/fp32/detection_post_process_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/elu_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/elu_fp32.h index c382b84187..ced5262679 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/elu_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/elu_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/elu.h" +#include "nnacl/fp32/elu_fp32.h" namespace mindspore::kernel { class EluCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup_fp32.h index 40f9b75d35..edbfe0af49 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/embedding_lookup_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/embedding_lookup_fp32.h" namespace mindspore::kernel { class EmbeddingLookupCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/exp_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/exp_fp32.h index cc00b46ab9..6918d23dee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/exp_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/exp_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/exp.h" +#include "nnacl/fp32/exp_fp32.h" namespace mindspore::kernel { class ExpCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims_fp32.h index 166f8b3249..2598079261 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/expandDims_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/expandDims.h" +#include "nnacl/fp32/expandDims_fp32.h" #include "schema/model_generated.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/fill_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/fill_fp32.h index 3cad52d42d..5927c854e6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/fill_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/fill_fp32.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/fill.h" +#include "nnacl/fp32/fill_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection_fp32.h index ee159fcb27..7b08a9d968 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/fullconnection_fp32.h @@ -21,7 +21,7 @@ #include "src/runtime/kernel/arm/base/fullconnection_base.h" #include "include/context.h" #include "include/errorcode.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd_fp32.h index ecf3df6261..48ad065332 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/gatherNd_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GATHERND_H_ #include -#include "nnacl/fp32/gatherNd.h" +#include "nnacl/fp32/gatherNd_fp32.h" #include "src/lite_kernel.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/gather_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/gather_fp32.cc index 5328826a3c..caea551a70 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/gather_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/gather_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/gather_fp32.h" #include #include "nnacl/gather_parameter.h" -#include "nnacl/fp32/gather.h" +#include "nnacl/fp32/gather_fp32.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/fp32/group_convolution_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/group_convolution_fp32.h index 8bf578b798..c00cd71726 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/group_convolution_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/group_convolution_fp32.h @@ -22,7 +22,7 @@ #include "src/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv.h" +#include "nnacl/fp32/conv_fp32.h" namespace mindspore::kernel { class GroupConvolutionCPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/instance_norm_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/instance_norm_fp32.h index 7d699722bd..5b193cbcea 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/instance_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/instance_norm_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/instance_norm.h" +#include "nnacl/fp32/instance_norm_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/layer_norm_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/layer_norm_fp32.h index e5534c8ede..7cbd497b85 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/layer_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/layer_norm_fp32.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/layer_norm.h" +#include "nnacl/fp32/layer_norm_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm_fp32.h index 81ccdfbed6..5600993994 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/local_response_norm_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_LOCAL_RESPONSE_NORM_H_ #include -#include "nnacl/fp32/local_response_norm.h" +#include "nnacl/fp32/local_response_norm_fp32.h" #include "src/lite_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/lstm_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/lstm_fp32.h index 66d2fe3663..82ed1d6e70 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/lstm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/lstm_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/lstm.h" +#include "nnacl/fp32/lstm_fp32.h" namespace mindspore::kernel { class LstmCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32.cc index d0c14e244b..b947998ca4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/matmul_fp32.h" #include "include/errorcode.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" #include "src/runtime/kernel/arm/base/dequant.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot_fp32.cc index 4b452297cd..bc32453c69 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/one_hot_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/one_hot_fp32.h" -#include "nnacl/fp32/one_hot.h" +#include "nnacl/fp32/one_hot_fp32.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_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/pad_fp32.h index c6bb02221f..9edc553bbe 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pad_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/pad_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/pad.h" +#include "nnacl/fp32/pad_fp32.h" #include "src/runtime/kernel/arm/base/layout_transform.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_fp32.cc index e7474e25af..dc8f7b3f32 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/pooling_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/pooling_fp32.h" #include -#include "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu_fp32.h index a9ca09eb36..54dfa1c8c6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/prelu_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/prelu_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/prelu.h" +#include "nnacl/fp32/prelu_fp32.h" namespace mindspore::kernel { class PReluCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/range_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/range_fp32.h index c650fdf023..da6ed7110a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/range_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/range_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/range.h" +#include "nnacl/fp32/range_fp32.h" namespace mindspore::kernel { class RangeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/rank_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/rank_fp32.h index fdf6eed2d3..f1ed8bef81 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/rank_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/rank_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/rank.h" +#include "nnacl/fp32/rank_fp32.h" namespace mindspore::kernel { class RankCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.cc index bbe08c2ade..09075ca63b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.cc @@ -19,7 +19,7 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" -#include "nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce_fp32.h" #include "src/runtime/kernel/arm/base/reduce_base.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.h index e7bc495c0f..f3872089ef 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reduce_fp32.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce_fp32.h" #include "src/runtime/kernel/arm/base/reduce_base.h" using mindspore::schema::ReduceMode; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/resize_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/resize_fp32.cc index 15affd17d7..564b10d4e3 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/resize_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/resize_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/fp32/resize_fp32.h" #include #include "include/errorcode.h" -#include "nnacl/fp32/resize.h" +#include "nnacl/fp32/resize_fp32.h" #include "schema/model_generated.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_fp32.cc index 09b43ac4cc..47ed9878a1 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/reverse_fp32.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/reverse.h" +#include "nnacl/fp32/reverse_fp32.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.cc index 0d65a35be0..b474adcfb8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/arm/fp32/roi_pooling_fp32.h" -#include "nnacl/fp32/roi_pooling.h" +#include "nnacl/fp32/roi_pooling_fp32.h" #include #include "schema/model_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.h index 557604050f..7f284acac7 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/roi_pooling_fp32.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/roi_pooling.h" +#include "nnacl/fp32/roi_pooling_fp32.h" namespace mindspore::kernel { class ROIPoolingCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/scale_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/scale_fp32.h index 765a7352c7..180a55b375 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/scale_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/scale_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/scale.h" +#include "nnacl/fp32/scale_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h index f14b911425..e044a91956 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/skip_gram_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/skip_gram.h" +#include "nnacl/fp32/skip_gram_fp32.h" #include "src/common/string_util.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/slice_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/slice_fp32.cc index 2a44c8129b..cb87f0f85c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/slice_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/slice_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32/slice_fp32.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/slice.h" +#include "nnacl/fp32/slice_fp32.h" #include "src/ops/slice.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/softmax_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/softmax_fp32.cc index 1c94561e2e..addf9ad0d8 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/softmax_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/softmax_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/fp32/softmax_fp32.h" #include #include -#include "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.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_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch_fp32.cc index 83119458a6..135486f0ab 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_batch_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/fp32/space_to_batch_fp32.h" #include #include "src/kernel_registry.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth_fp32.cc index 0e02aa96b3..d055b80c91 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/space_to_depth_fp32.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/space_to_depth.h" +#include "nnacl/fp32/space_to_depth_fp32.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.cc index 906128506b..20a914e3e6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.cc @@ -18,7 +18,7 @@ #include #include "include/errorcode.h" -#include "mindspore/lite/nnacl/fp32/sparse_to_dense.h" +#include "mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.h" #include "schema/model_generated.h" #include "schema/ops_generated.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.h index 6d9de08360..87f900311a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32.h @@ -20,7 +20,7 @@ #include "src/lite_kernel.h" #include "include/context.h" -#include "mindspore/lite/nnacl/fp32/sparse_to_dense.h" +#include "mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.h" #include "src/runtime/kernel/arm/base/layout_transform.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/stack_fp32.cc b/mindspore/lite/src/runtime/kernel/arm/fp32/stack_fp32.cc index f1c2b99fb2..756a00f3c4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/stack_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/stack_fp32.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/stack.h" +#include "nnacl/fp32/stack_fp32.h" #include "nnacl/stack_parameter.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/tile_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/tile_fp32.h index 02906ac809..b0452dc7f6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/tile_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/tile_fp32.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/tile.h" +#include "nnacl/fp32/tile_fp32.h" namespace mindspore::kernel { class TileCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/topk_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/topk_fp32.h index af4ef4f4f8..5e5d951352 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/topk_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/topk_fp32.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/topk.h" +#include "nnacl/fp32/topk_fp32.h" namespace mindspore::kernel { class TopKCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/transpose_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/transpose_fp32.h index e0067a879c..c459cfa6ee 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/transpose_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/transpose_fp32.h @@ -19,7 +19,7 @@ #include #include "include/errorcode.h" -#include "nnacl/fp32/transpose.h" +#include "nnacl/fp32/transpose_fp32.h" #include "src/lite_kernel.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/unique_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/unique_fp32.h index 35238f993d..4aa7dd801c 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/unique_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/unique_fp32.h @@ -18,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/unique.h" +#include "nnacl/fp32/unique_fp32.h" namespace mindspore::kernel { class UniqueCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze_fp32.h b/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze_fp32.h index 13491f5321..a15bf43529 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze_fp32.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32/unsqueeze_fp32.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" #include "include/context.h" -#include "nnacl/fp32/unsqueeze.h" +#include "nnacl/fp32/unsqueeze_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h index 1d0083231b..5000d11277 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/activation_grad.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" namespace mindspore::kernel { class ActivationGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h index c11d01f079..6932a328ea 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "schema/model_generated.h" using mindspore::schema::PrimitiveType_AddGrad; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc index 2d32c82255..479e56877d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc @@ -19,7 +19,7 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h index 43f4cf389b..ae4916a1bd 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/bias_grad.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" namespace mindspore::kernel { class BiasGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/neg_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/neg_grad.cc index 7185db7966..eb90801ec0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/neg_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/neg_grad.cc @@ -19,7 +19,7 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" -#include "nnacl/fp32/arithmetic_self.h" +#include "nnacl/fp32/arithmetic_self_fp32.h" using mindspore::kernel::KERNEL_ARCH::kCPU; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc index 2949cef869..80aebea72d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/pooling_grad.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/arm/fp32_grad/pooling_grad.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" #include "nnacl/fp32_grad/pooling_grad.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc index c8650bc47f..f87a90a74b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc @@ -18,7 +18,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "src/runtime/runtime_api.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.cc index 762349084f..5b4a5be4a2 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.cc @@ -17,7 +17,7 @@ #include #include "src/kernel_registry.h" #include "nnacl/softmax_parameter.h" -#include "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.h" #include "src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.h index 53180618e8..faf4da056a 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/softmax_cross_entropy_with_logits.h @@ -20,7 +20,7 @@ #include #include "src/train/loss_kernel.h" #include "nnacl/fp32_grad/softmax_grad.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/softmax_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc index 1d3fb6feb2..2e18530207 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc @@ -17,7 +17,7 @@ #include #include "src/kernel_registry.h" #include "nnacl/softmax_parameter.h" -#include "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.h" #include "src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h index 13e2d0f21c..d26b53b6d6 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/sparse_softmax_cross_entropy_with_logits.h @@ -20,7 +20,7 @@ #include #include "src/train/loss_kernel.h" #include "nnacl/fp32_grad/softmax_grad.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/softmax_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/tuple_getitem.h b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/tuple_getitem.h index b23533bd24..7bd93fc560 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/tuple_getitem.h +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/tuple_getitem.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" namespace mindspore::kernel { class TupleGetItemCPUKernel : public LiteKernel { 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 646a2a27c3..651054c698 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,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/bias_add_int8.h" -#include "nnacl/fp32/arithmetic.h" +#include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/errorcode.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/bias_add_int8.h index 3d2b6870a1..3f58fc0d00 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,7 +18,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/unique.h" +#include "nnacl/fp32/unique_fp32.h" #include "nnacl/arithmetic_common.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_3x3_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_3x3_int8.h index f01e2935c2..627a85bd25 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_3x3_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_3x3_int8.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class ConvolutionDepthwise3x3Int8CPUKernel : public ConvolutionBaseCPUKernel { 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 a3398310c1..f7f668e5e1 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 "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class ConvolutionDepthwiseInt8CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_slidewindow_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_slidewindow_int8.h index d6c5b828fa..be0b6c95ab 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_slidewindow_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/convolution_depthwise_slidewindow_int8.h @@ -20,7 +20,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/arm/base/convolution_base.h" -#include "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class ConvolutionDepthwiseSWInt8CPUKernel : public ConvolutionBaseCPUKernel { 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 40b347c5ec..230dcf8796 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 "nnacl/fp32/conv_depthwise.h" +#include "nnacl/fp32/conv_depthwise_fp32.h" namespace mindspore::kernel { class DeconvolutionDepthwiseInt8CPUKernel : public ConvolutionBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/detection_post_process_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/detection_post_process_int8.h index 55c02a1f18..6f1473767b 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/detection_post_process_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/detection_post_process_int8.h @@ -21,7 +21,7 @@ #include "src/lite_kernel.h" #include "include/context.h" #include "src/runtime/kernel/arm/base/detection_post_process_base.h" -#include "nnacl/fp32/detection_post_process.h" +#include "nnacl/fp32/detection_post_process_fp32.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc index d770a19455..3243f678cb 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/leaky_relu_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/leaky_relu_int8.h" #include -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" #include "nnacl/int8/leaky_relu_int8.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" 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 36f0843e8a..e814eeb101 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/pooling_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/pooling_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/arm/int8/pooling_int8.h" #include "nnacl/int8/pooling_int8.h" -#include "nnacl/fp32/cast.h" +#include "nnacl/fp32/cast_fp32.h" #include "include/errorcode.h" #include "src/runtime/runtime_api.h" #include "src/kernel_registry.h" diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h b/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h index 64b172e57a..5b266af2e4 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h +++ b/mindspore/lite/src/runtime/kernel/arm/int8/relux_int8.h @@ -19,7 +19,7 @@ #include #include "src/lite_kernel.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" #include "nnacl/int8/relux_int8.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/arm/int8/space_to_batch_int8.cc b/mindspore/lite/src/runtime/kernel/arm/int8/space_to_batch_int8.cc index 495a781bba..18ec0c6943 100644 --- a/mindspore/lite/src/runtime/kernel/arm/int8/space_to_batch_int8.cc +++ b/mindspore/lite/src/runtime/kernel/arm/int8/space_to_batch_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/int8/space_to_batch_int8.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" #include "nnacl/int8/space_to_batch_int8.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc index 8f281297b1..e3fa1cc1c1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc @@ -24,7 +24,7 @@ #include "src/kernel_registry.h" #include "src/runtime/runtime_api.h" #include "include/errorcode.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "src/runtime/kernel/opencl/cl/activation.cl.inc" using mindspore::kernel::KERNEL_ARCH::kGPU; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h index 6bd2ace379..6c0b4635fc 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.h @@ -21,7 +21,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic.cc index a01690603d..859aafa2b2 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic.cc @@ -18,7 +18,7 @@ #include #include #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h index 435962cc5c..ab32611fa0 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/batchnorm.h" +#include "nnacl/fp32/batchnorm_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.h index 32d0972817..5b2b981364 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.h @@ -20,7 +20,7 @@ #include #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/cast.h" +#include "nnacl/fp32/cast_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.cc index 5040ab150c..efc5e71ea4 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/opencl/kernel/conv2d_transpose.h" #include #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "src/kernel_registry.h" #ifndef PROGRAM_WITH_IL #include "src/runtime/kernel/opencl/cl/conv2d_transpose.cl.inc" 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 3fabd425ab..82289cabb0 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc @@ -23,7 +23,7 @@ #include #include "src/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "nnacl/op_base.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h index 5d6da3120d..62c66fbb3c 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_FILL_H_ #include -#include "mindspore/lite/nnacl/fp32/fill.h" +#include "mindspore/lite/nnacl/fp32/fill_fp32.h" #include "mindspore/lite/nnacl/shape.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc index 031d9d2ffe..b2edf58f90 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc @@ -17,7 +17,7 @@ #include #include #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "src/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/fullconnection.h" #include "src/runtime/kernel/opencl/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/hswish.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/hswish.h index bd44c198dc..33b2a27317 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/hswish.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/hswish.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_HSWISH_H_ #include -#include "mindspore/lite/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation_fp32.h" #include "src/runtime/kernel/opencl/opencl_kernel.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 d7d8ba071b..3100b45be0 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc @@ -17,7 +17,7 @@ #include #include #include -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "src/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/matmul.h" #ifndef PROGRAM_WITH_IL diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.h index 8f8c9c1f2a..c24e21ba96 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.h @@ -21,7 +21,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/one_hot.h" +#include "nnacl/fp32/one_hot_fp32.h" namespace mindspore::kernel { class OneHotOpenCLKernel : public OpenCLKernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.h index 537f80bba0..aa4ae8e368 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 "nnacl/fp32/pooling.h" +#include "nnacl/fp32/pooling_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc index fc2cc555c9..58b5a1a674 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc @@ -21,7 +21,7 @@ #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "src/runtime/kernel/opencl/kernel/prelu.h" #include "src/runtime/kernel/opencl/cl/prelu.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc index 40f7ee4cae..15e1d32789 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc @@ -20,7 +20,7 @@ #include #include "schema/model_generated.h" #include "src/kernel_registry.h" -#include "nnacl/fp32/common_func.h" +#include "nnacl/fp32/common_func_fp32.h" #include "src/runtime/kernel/opencl/utils.h" #ifndef PROGRAM_WITH_IL #include "src/runtime/kernel/opencl/cl/scale.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.h index b67936f701..a68cf41105 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 "nnacl/fp32/softmax.h" +#include "nnacl/fp32/softmax_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.h index 46362e4fac..f1fead8674 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.h index af9ff202e1..55b1d48792 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.h @@ -21,7 +21,7 @@ #include #include "src/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/space_to_depth.h" +#include "nnacl/fp32/space_to_depth_fp32.h" namespace mindspore::kernel { class SpaceToDepthOpenCLKernel : public OpenCLKernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.h index 542bc417bf..98b68177b1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "mindspore/lite/nnacl/fp32/sparse_to_dense.h" +#include "mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.h index f29c7f19b2..7edbf437c1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "nnacl/fp32/slice.h" +#include "nnacl/fp32/slice_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/train/train_populate_parameter.cc b/mindspore/lite/src/train/train_populate_parameter.cc index 3d5f4c028e..be9c602263 100644 --- a/mindspore/lite/src/train/train_populate_parameter.cc +++ b/mindspore/lite/src/train/train_populate_parameter.cc @@ -21,7 +21,7 @@ #include "src/ops/softmax_cross_entropy.h" #include "nnacl/fp32_grad/softmax_grad.h" #include "src/ops/activation_grad.h" -#include "nnacl/fp32/activation.h" +#include "nnacl/fp32/activation_fp32.h" #include "src/ops/conv2d_grad_filter.h" #include "src/ops/conv2d_grad_input.h" #include "src/ops/group_conv2d_grad_input.h" diff --git a/mindspore/lite/test/ut/internal/src/kernel/fp32/arithmetic_fp32_test.cc b/mindspore/lite/test/ut/internal/src/kernel/fp32/arithmetic_fp32_test.cc index 6c36401395..0027ebb1e5 100644 --- a/mindspore/lite/test/ut/internal/src/kernel/fp32/arithmetic_fp32_test.cc +++ b/mindspore/lite/test/ut/internal/src/kernel/fp32/arithmetic_fp32_test.cc @@ -16,7 +16,7 @@ #include "test/common/common_test.h" #include "src/common/file_utils.h" #include "schema/ops_generated.h" -#include "mindspore/lite/nnacl/fp32/arithmetic.h" +#include "mindspore/lite/nnacl/fp32/arithmetic_fp32.h" #include "internal/src/allocator.h" #include "internal/include/model.h" #include "internal/include/ms_tensor.h" diff --git a/mindspore/lite/test/ut/internal/src/kernel/fp32/bias_add_fp32_test.cc b/mindspore/lite/test/ut/internal/src/kernel/fp32/bias_add_fp32_test.cc index b88791b818..5f7334905b 100644 --- a/mindspore/lite/test/ut/internal/src/kernel/fp32/bias_add_fp32_test.cc +++ b/mindspore/lite/test/ut/internal/src/kernel/fp32/bias_add_fp32_test.cc @@ -16,7 +16,7 @@ #include "test/common/common_test.h" #include "src/common/file_utils.h" #include "schema/ops_generated.h" -#include "mindspore/lite/nnacl/fp32/arithmetic.h" +#include "mindspore/lite/nnacl/fp32/arithmetic_fp32.h" #include "internal/src/allocator.h" #include "internal/include/model.h" #include "internal/include/ms_tensor.h" 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 7a867717c9..7ac5752430 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 "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation_fp32.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 ea417b5597..9b3bcfce10 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,7 +15,7 @@ */ #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/arg_min_max.h" +#include "mindspore/lite/nnacl/fp32/arg_min_max_fp32.h" #include "mindspore/lite/nnacl/arg_min_max.h" #include "mindspore/lite/nnacl/arithmetic_common.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc index bd46f0b417..53da47b5f6 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/arithmetic_fp32_tests.cc @@ -18,7 +18,7 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "mindspore/lite/nnacl/fp32/arithmetic.h" +#include "mindspore/lite/nnacl/fp32/arithmetic_fp32.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "include/errorcode.h" 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 fe1c1bb30b..442b0c03a4 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc @@ -16,7 +16,7 @@ #include #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/batchnorm.h" +#include "mindspore/lite/nnacl/fp32/batchnorm_fp32.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/crop_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/crop_fp32_test.cc index ae58fbca4a..605dc7cc49 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/nnacl/fp32/crop.h" +#include "mindspore/lite/nnacl/fp32/crop_fp32.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/crop_fp32.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc index db620ac94b..716931bbcd 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/deconvolution_fp32_tests.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/deconvolution_fp32.h" -#include "mindspore/lite/nnacl/fp32/deconv.h" +#include "mindspore/lite/nnacl/fp32/deconv_fp32.h" #include "mindspore/lite/nnacl/op_base.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc index 097c285dfe..52255efd4c 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/elu_fp32_test.cc @@ -16,7 +16,7 @@ #include #include "src/runtime/kernel/arm/fp32/elu_fp32.h" -#include "nnacl/fp32/elu.h" +#include "nnacl/fp32/elu_fp32.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc index 0a7185f69e..a96d6df352 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/embedding_lookup_fp32_test.cc @@ -16,7 +16,7 @@ #include #include "src/runtime/kernel/arm/fp32/embedding_lookup_fp32.h" -#include "nnacl/fp32/embedding_lookup.h" +#include "nnacl/fp32/embedding_lookup_fp32.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/fullconnection_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/fullconnection_fp32_tests.cc index 61dff107d8..4e80dfa2de 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 @@ -18,7 +18,7 @@ #include #include #include "common/common_test.h" -#include "nnacl/fp32/matmul.h" +#include "nnacl/fp32/matmul_fp32.h" #include "src/common/file_utils.h" #include "src/common/log_adapter.h" #include "src/runtime/kernel/arm/fp32/fullconnection_fp32.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/instance_norm_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/instance_norm_fp32_tests.cc index 3e400cd7e6..48f1d9c6dc 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/instance_norm_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/instance_norm_fp32_tests.cc @@ -16,7 +16,7 @@ #include #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/instance_norm.h" +#include "mindspore/lite/nnacl/fp32/instance_norm_fp32.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/lstm_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lstm_fp32_tests.cc index 472c70b88d..1013b8b2bb 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 "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/lstm.h" +#include "mindspore/lite/nnacl/fp32/lstm_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/matmul_fp32_tests.cc index 9b755531e8..5de567f478 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 "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32.h" -#include "mindspore/lite/nnacl/fp32/matmul.h" +#include "mindspore/lite/nnacl/fp32/matmul_fp32.h" #include "src/kernel_registry.h" #include "src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc index ede2906c49..bb1a294d0b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reduce_fp32_tests.cc @@ -16,7 +16,7 @@ #include #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/reduce.h" +#include "mindspore/lite/nnacl/fp32/reduce_fp32.h" #include "schema/inner/model_generated.h" #include "src/tensor.h" #include "mindspore/lite/src/kernel_registry.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scale_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scale_fp32_tests.cc index 970ae8461f..0b0995e4ff 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scale_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scale_fp32_tests.cc @@ -20,7 +20,7 @@ #include "nnacl/pad_parameter.h" #include "mindspore/lite/src/kernel_registry.h" #include "schema/ops_generated.h" -#include "nnacl/fp32/scale.h" +#include "nnacl/fp32/scale_fp32.h" using mindspore::schema::ActivationType; using mindspore::schema::ActivationType_NO_ACTIVATION; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc index 12cbf375ea..d2dd4002d6 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/skip_gram_fp32.cc @@ -16,7 +16,7 @@ #include #include "src/runtime/kernel/arm/fp32/skip_gram_fp32.h" -#include "nnacl/fp32/skip_gram.h" +#include "nnacl/fp32/skip_gram_fp32.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h" 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 4d5c65c87a..5ac88efd4a 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 "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/space_to_batch.h" +#include "mindspore/lite/nnacl/fp32/space_to_batch_fp32.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 8b29459961..01482e8b77 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 "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/space_to_depth.h" +#include "mindspore/lite/nnacl/fp32/space_to_depth_fp32.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/sparse_to_dense_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32_tests.cc index 198a86e96e..aabf787a41 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/sparse_to_dense_fp32_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/sparse_to_dense.h" +#include "mindspore/lite/nnacl/fp32/sparse_to_dense_fp32.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" #include "mindspore/lite/src/tensor.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/stack_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/stack_fp32_test.cc index 9780a75d1f..50a1340863 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/stack_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/stack_fp32_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/stack.h" +#include "mindspore/lite/nnacl/fp32/stack_fp32.h" namespace mindspore { class StackTestFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc index 17f317ab49..5831161cb9 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/tile_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/tile.h" +#include "mindspore/lite/nnacl/fp32/tile_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/topk_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/topk_fp32_tests.cc index 4601a0a2cf..f69e9699d7 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/nnacl/fp32/topk.h" +#include "mindspore/lite/nnacl/fp32/topk_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc index 10bc091870..0246336a73 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unique_fp32_tests.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/unique.h" +#include "mindspore/lite/nnacl/fp32/unique_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc index 788fb7971c..f6f47086aa 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/arithmetic_grad_fp32_tests.cc @@ -19,7 +19,7 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce_fp32.h" #include "src/runtime/kernel/arm/fp32_grad/arithmetic_grad.h" #include "src/kernel_registry.h" #include "src/ops/arithmetic_grad.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bn_grad_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bn_grad_fp32_test.cc index bd0554c04d..fd3d9c9ad2 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bn_grad_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bn_grad_fp32_test.cc @@ -20,7 +20,7 @@ #include "src/common/file_utils.h" #include "src/runtime/kernel/arm/fp32_grad/bn_grad.h" #include "nnacl/fp32_grad/batch_norm.h" -#include "nnacl/fp32/batchnorm.h" +#include "nnacl/fp32/batchnorm_fp32.h" #include "src/kernel_registry.h" namespace mindspore { 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 3de3a098c7..8224faee7b 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 @@ -21,7 +21,7 @@ #include "src/common/file_utils.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/nnacl/pack.h" -#include "mindspore/lite/nnacl/fp32/matmul.h" +#include "mindspore/lite/nnacl/fp32/matmul_fp32.h" #include "mindspore/lite/nnacl/int8/deconv_int8.h" #include "mindspore/lite/src/runtime/kernel/arm/int8/deconvolution_int8.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gatherNd_int8_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gatherNd_int8_test.cc index aa64abcd44..b0fa6f5689 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gatherNd_int8_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gatherNd_int8_test.cc @@ -16,7 +16,7 @@ #include #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/gatherNd.h" +#include "mindspore/lite/nnacl/fp32/gatherNd_fp32.h" #include "mindspore/lite/nnacl/int8/gatherNd_int8.h" #include "mindspore/lite/src/kernel_registry.h" #include "mindspore/lite/src/lite_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc index fd63d07ae1..4d6668ebd9 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/hswish_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/arm/fp32/activation_fp32.h" -#include "mindspore/lite/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation_fp32.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/reduce_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reduce_int8_tests.cc index 947a307c70..d83e1705f9 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reduce_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reduce_int8_tests.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "src/tensor.h" #include "mindspore/lite/src/kernel_registry.h" -#include "nnacl/fp32/reduce.h" +#include "nnacl/fp32/reduce_fp32.h" namespace mindspore { using mindspore::lite::QuantArg; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc index 0677d024fa..9a74a06daa 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sigmoid_int8_tests.cc @@ -17,7 +17,7 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/activation.h" +#include "mindspore/lite/nnacl/fp32/activation_fp32.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/space_to_batch_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/space_to_batch_int8_tests.cc index cb49866a65..cd0a304497 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/space_to_batch_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/space_to_batch_int8_tests.cc @@ -15,7 +15,7 @@ */ #include #include "common/common_test.h" -#include "nnacl/fp32/space_to_batch.h" +#include "nnacl/fp32/space_to_batch_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { 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 a9345f0a8a..47a1efdc5a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/topk_int8_tests.cc @@ -18,7 +18,7 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "mindspore/lite/nnacl/fp32/topk.h" +#include "mindspore/lite/nnacl/fp32/topk_fp32.h" #include "mindspore/lite/src/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc index 64357ce127..1ffc81fbf5 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/string/normalize.cc @@ -18,7 +18,7 @@ #include "src/runtime/kernel/arm/fp32/skip_gram_fp32.h" #include "src/runtime/kernel/arm/string/normalize.h" #include "mindspore/lite/src/kernel_registry.h" -#include "nnacl/fp32/skip_gram.h" +#include "nnacl/fp32/skip_gram_fp32.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h"