From d651b8062bdabcac305429f2af590bb2f93e58d6 Mon Sep 17 00:00:00 2001 From: zhaizhiqiang Date: Tue, 10 May 2022 11:15:26 +0800 Subject: [PATCH] refactor lite --- .jenkins/check/config/filter_cppcheck.txt | 2 +- .jenkins/check/config/filter_cpplint.txt | 2 +- .jenkins/check/config/whitelizard.txt | 12 +- mindspore/lite/CMakeLists.txt | 2 +- .../experimental/kernel/convolution_1x1.h | 2 +- .../experimental/kernel/convolution_fp32.h | 2 +- mindspore/lite/experimental/src/tensor.h | 2 +- mindspore/lite/minddata/CMakeLists.txt | 10 +- mindspore/lite/src/CMakeLists.txt | 120 +++++++++--------- mindspore/lite/src/common/context_util.h | 2 +- .../lite/src/{ => common}/ops/CMakeLists.txt | 0 .../lite/src/{ => common}/ops/anf_utils.cc | 2 +- .../lite/src/{ => common}/ops/anf_utils.h | 2 +- .../lite/src/{ => common}/ops/ops_def.cc | 4 +- mindspore/lite/src/{ => common}/ops/ops_def.h | 4 +- .../src/{ => common}/ops/ops_func_declare.h | 0 .../lite/src/{ => common}/ops/ops_utils.cc | 2 +- .../lite/src/{ => common}/ops/ops_utils.h | 2 +- .../ops/populate/activation_grad_populate.cc | 2 +- .../ops/populate/activation_populate.cc | 2 +- .../ops/populate/adam_populate.cc | 2 +- .../{ => common}/ops/populate/add_populate.cc | 4 +- .../ops/populate/adder_populate.cc | 2 +- .../ops/populate/affine_populate.cc | 2 +- .../{ => common}/ops/populate/all_gather.cc | 2 +- .../ops/populate/argmax_populate.cc | 2 +- .../ops/populate/argmin_populate.cc | 2 +- .../ops/populate/arithmetic_populate.cc | 4 +- .../ops/populate/arithmetic_populate.h | 0 .../ops/populate/arithmetic_self_populate.cc | 2 +- .../ops/populate/assert_populate.cc | 2 +- .../ops/populate/assign_add_populate.cc | 2 +- .../ops/populate/assign_populate.cc | 2 +- .../populate/audio_spectrogram_populate.cc | 2 +- .../ops/populate/batch_norm_populate.cc | 2 +- .../ops/populate/batch_to_space_populate.cc | 2 +- .../ops/populate/bias_add_populate.cc | 2 +- .../binary_cross_entropy_grad_populate.cc | 2 +- .../populate/binary_cross_entropy_populate.cc | 2 +- .../ops/populate/broadcast_to_populate.cc | 2 +- .../ops/populate/call_populate.cc | 2 +- .../ops/populate/cast_populate.cc | 2 +- .../ops/populate/clip_populate.cc | 2 +- .../ops/populate/common_populate.cc | 2 +- .../ops/populate/concat_populate.cc | 2 +- .../populate/constant_of_shape_populate.cc | 2 +- .../ops/populate/control/switch_populate.cc | 2 +- .../populate/control/tensor_array_populate.cc | 2 +- .../control/tensorlistfromtensor_populate.cc | 2 +- .../control/tensorlistgetitem_populate.cc | 2 +- .../control/tensorlistreserve_populate.cc | 2 +- .../control/tensorlistsetlitem_populate.cc | 2 +- .../control/tensorliststack_populate.cc | 2 +- .../ops/populate/conv2d_populate.cc | 2 +- .../ops/populate/crop_and_resize_populate.cc | 2 +- .../ops/populate/crop_populate.cc | 2 +- .../ops/populate/cumsum_populate.cc | 2 +- .../ops/populate/custom_populate.cc | 2 +- .../ops/populate/deconv2d_populate.cc | 2 +- .../ops/populate/default_populate.cc | 2 +- .../ops/populate/default_populate.h | 0 .../ops/populate/depth_to_space_populate.cc | 2 +- .../detection_post_process_populate.cc | 2 +- .../{ => common}/ops/populate/div_populate.cc | 4 +- .../ops/populate/dynamic_quant_populate.cc | 2 +- .../ops/populate/eltwise_populate.cc | 4 +- .../ops/populate/embedding_lookup_populate.cc | 2 +- .../{ => common}/ops/populate/erf_populate.cc | 4 +- .../{ => common}/ops/populate/exp_populate.cc | 2 +- .../ops/populate/expand_dims_populate.cc | 2 +- .../ops/populate/fill_populate.cc | 2 +- .../ops/populate/flatten_populate.cc | 2 +- .../ops/populate/full_connection_populate.cc | 2 +- .../ops/populate/fused_batchnorm_populate.cc | 2 +- .../ops/populate/gather_d_populate.cc | 2 +- .../ops/populate/gather_nd_populate.cc | 2 +- .../ops/populate/gather_populate.cc | 2 +- .../{ => common}/ops/populate/glu_populate.cc | 2 +- .../ops/populate/group_norm_populate.cc | 2 +- .../{ => common}/ops/populate/gru_populate.cc | 2 +- .../ops/populate/instance_norm_populate.cc | 2 +- .../populate/invert_permutation_populate.cc | 4 +- .../ops/populate/isfinite_populate.cc | 4 +- .../ops/populate/l2_norm_populate.cc | 2 +- .../ops/populate/layer_norm_grad_populate.cc | 2 +- .../ops/populate/layer_norm_populate.cc | 2 +- .../ops/populate/lin_space_populate.cc | 4 +- .../local_response_normalization_populate.cc | 2 +- .../ops/populate/log_softmax_populate.cc | 2 +- .../ops/populate/lstm_populate.cc | 2 +- .../ops/populate/matmul_populate.cc | 2 +- .../ops/populate/mfcc_populate.cc | 2 +- .../{ => common}/ops/populate/mul_populate.cc | 4 +- .../ops/populate/nllloss_populate.cc | 2 +- .../populate/non_max_suppression_populate.cc | 2 +- .../ops/populate/nonzero_populate.cc | 4 +- .../ops/populate/one_hot_populate.cc | 2 +- .../ops/populate/oneslike_populate.cc | 2 +- .../ops/populate/p_relu_populate.cc | 2 +- .../{ => common}/ops/populate/pad_populate.cc | 2 +- .../ops/populate/partial_populate.cc | 2 +- .../ops/populate/pooling_populate.cc | 2 +- .../ops/populate/populate_register.cc | 2 +- .../ops/populate/populate_register.h | 0 .../ops/populate/power_populate.cc | 2 +- .../ops/populate/prior_box_populate.cc | 2 +- .../ops/populate/quant_dtype_cast_populate.cc | 2 +- .../ops/populate/ragged_range_populate.cc | 2 +- .../ops/populate/random_normal_populate.cc | 2 +- .../random_standard_normal_populate.cc | 2 +- .../ops/populate/range_populate.cc | 2 +- .../ops/populate/rank_populate.cc | 2 +- .../ops/populate/reduce_populate.cc | 2 +- .../ops/populate/reduce_scatter.cc | 2 +- .../ops/populate/reshape_populate.cc | 2 +- .../ops/populate/resize_populate.cc | 2 +- .../ops/populate/reverse_populate.cc | 2 +- .../ops/populate/reverse_sequence_populate.cc | 2 +- .../ops/populate/roi_pooling_populate.cc | 2 +- .../ops/populate/scale_populate.cc | 2 +- .../ops/populate/scatter_nd_populate.cc | 2 +- .../populate/scatter_nd_update_populate.cc | 2 +- .../ops/populate/select_populate.cc | 4 +- .../ops/populate/shape_populate.cc | 2 +- .../ops/populate/size_populate.cc | 4 +- .../ops/populate/slice_populate.cc | 2 +- .../ops/populate/softmax_populate.cc | 2 +- .../populate/space_to_batch_nd_populate.cc | 2 +- .../ops/populate/space_to_batch_populate.cc | 2 +- .../ops/populate/space_to_depth_populate.cc | 2 +- ...parse_softmax_cross_entropy_with_logits.cc | 2 +- .../ops/populate/sparse_to_dense_populate.cc | 2 +- .../ops/populate/splice_populate.cc | 2 +- .../ops/populate/split_populate.cc | 2 +- .../populate/split_with_overlap_populate.cc | 2 +- .../ops/populate/squeeze_populate.cc | 2 +- .../ops/populate/stack_populate.cc | 2 +- .../populate/strided_slice_grad_populate.cc | 2 +- .../ops/populate/strided_slice_populate.cc | 2 +- .../ops/populate/strided_slice_populate.h | 2 +- .../custom_extract_features_populate.cc | 2 +- .../string/custom_normalize_populate.cc | 2 +- .../string/custom_predict_populate.cc | 2 +- .../string/hashtable_lookup_populate.cc | 2 +- .../string/lsh_projection_populate.cc | 2 +- .../ops/populate/string/skip_gram_populate.cc | 2 +- .../{ => common}/ops/populate/sub_populate.cc | 4 +- .../ops/populate/tile_populate.cc | 2 +- .../ops/populate/topk_populate.cc | 2 +- .../ops/populate/transpose_populate.cc | 2 +- .../ops/populate/uniform_real_populate.cc | 4 +- .../ops/populate/unique_populate.cc | 2 +- .../populate/unsorted_segment_sum_populate.cc | 2 +- .../ops/populate/unsqueeze_populate.cc | 2 +- .../ops/populate/unstack_populate.cc | 2 +- .../ops/populate/where_populate.cc | 2 +- .../src/{ => common}/ops/schema_register.h | 0 .../lite/src/common/primitive_t_utils.cc | 2 +- mindspore/lite/src/common/primitive_t_utils.h | 2 +- mindspore/lite/src/common/tensor_util.h | 2 +- .../src/control_flow/actor/entrance_actor.h | 2 +- .../lite/src/control_flow/actor/exit_actor.cc | 2 +- .../lite/src/control_flow/actor/exit_actor.h | 2 +- .../src/control_flow/actor/switch_actor.cc | 2 +- .../src/control_flow/actor/switch_actor.h | 2 +- .../src/control_flow/control_actor_creator.cc | 2 +- .../src/control_flow/control_actor_creator.h | 4 +- .../control_flow/control_flow_scheduler.cc | 2 +- .../src/control_flow/control_flow_scheduler.h | 4 +- .../control_flow/control_subgraph_creator.h | 4 +- .../kernel/entrance_subgraph_kernel.h | 8 +- .../kernel/exit_subgraph_kernel.h | 8 +- .../control_flow/kernel/identity_kernel.cc | 2 +- .../src/control_flow/kernel/identity_kernel.h | 8 +- mindspore/lite/src/expression/import.cc | 2 +- mindspore/lite/src/expression/net.cc | 2 +- mindspore/lite/src/expression/node.cc | 2 +- .../lite/src/expression/ops/activation.cc | 2 +- mindspore/lite/src/expression/ops/adam.cc | 2 +- .../lite/src/expression/ops/arithmetic.cc | 2 +- .../lite/src/expression/ops/batchnorm.cc | 2 +- mindspore/lite/src/expression/ops/conv.cc | 2 +- mindspore/lite/src/expression/ops/dense.cc | 2 +- mindspore/lite/src/expression/ops/dropout.cc | 2 +- mindspore/lite/src/expression/ops/flatten.cc | 2 +- mindspore/lite/src/expression/ops/pooling.cc | 2 +- mindspore/lite/src/expression/ops/reduce.cc | 2 +- mindspore/lite/src/expression/ops/softmax.cc | 2 +- .../lite/src/expression/ops/softmaxCE.cc | 2 +- .../parameter_cache/cache_algorithm.h | 0 .../delegate/parameter_cache/cache_mem_base.h | 0 .../parameter_cache/embedding_cache.cc | 8 +- .../parameter_cache/embedding_cache.h | 4 +- .../embedding_cache_manager.cc | 2 +- .../parameter_cache/embedding_cache_manager.h | 6 +- .../parameter_cache/factory_mgr_base.h | 0 .../parameter_cache/gpu/gpu_cache_mem.cc | 6 +- .../parameter_cache/gpu/gpu_cache_mem.h | 2 +- .../delegate/parameter_cache/lfu_cache.cc | 4 +- .../delegate/parameter_cache/lfu_cache.h | 2 +- .../parameter_cache/load_host_cache_model.cc | 2 +- .../parameter_cache/load_host_cache_model.h | 2 +- .../delegate/tensorrt/CMakeLists.txt | 2 +- .../delegate/tensorrt/cuda_impl/activation.cu | 4 +- .../tensorrt/cuda_impl/activation.cuh | 0 .../delegate/tensorrt/cuda_impl/cast.cu | 4 +- .../delegate/tensorrt/cuda_impl/cast.cuh | 0 .../tensorrt/cuda_impl/cublas_utils.cc | 2 +- .../tensorrt/cuda_impl/cublas_utils.h | 2 +- .../tensorrt/cuda_impl/cuda_helper.cc | 2 +- .../delegate/tensorrt/cuda_impl/cuda_helper.h | 0 .../tensorrt/cuda_impl/cudnn_utils.cc | 2 +- .../delegate/tensorrt/cuda_impl/cudnn_utils.h | 2 +- .../delegate/tensorrt/cuda_impl/equal.cu | 4 +- .../delegate/tensorrt/cuda_impl/equal.cuh | 0 .../delegate/tensorrt/cuda_impl/hash.cu | 4 +- .../delegate/tensorrt/cuda_impl/hash.cuh | 0 .../distribution/distribution_base.cc | 2 +- .../tensorrt/distribution/distribution_base.h | 0 .../distribution/distribution_base_impl.cc | 4 +- .../distribution/distribution_collective.cc | 2 +- .../distribution/distribution_collective.h | 2 +- .../distribution_collective_impl.cc | 6 +- .../distribution/distribution_utils.cc | 2 +- .../distribution/distribution_utils.h | 0 .../tensorrt/op/activation_opt_plugin.cc | 6 +- .../tensorrt/op/activation_opt_plugin.h | 6 +- .../tensorrt/op/activation_tensorrt.cc | 6 +- .../tensorrt/op/activation_tensorrt.h | 2 +- .../tensorrt/op/allgather_tensorrt.cc | 2 +- .../delegate/tensorrt/op/allgather_tensorrt.h | 6 +- .../delegate/tensorrt/op/cast_tensorrt.cc | 4 +- .../delegate/tensorrt/op/cast_tensorrt.h | 6 +- .../delegate/tensorrt/op/concate_tensorrt.cc | 2 +- .../delegate/tensorrt/op/concate_tensorrt.h | 2 +- .../tensorrt/op/convolution_tensorrt.cc | 4 +- .../tensorrt/op/convolution_tensorrt.h | 2 +- .../tensorrt/op/deconvolution_tensorrt.cc | 4 +- .../tensorrt/op/deconvolution_tensorrt.h | 2 +- .../tensorrt/op/elementwise_tensorrt.cc | 6 +- .../tensorrt/op/elementwise_tensorrt.h | 2 +- .../delegate/tensorrt/op/equal_tensorrt.cc | 4 +- .../delegate/tensorrt/op/equal_tensorrt.h | 6 +- .../tensorrt/op/fullyconnected_tensorrt.cc | 6 +- .../tensorrt/op/fullyconnected_tensorrt.h | 2 +- .../delegate/tensorrt/op/gather_tensorrt.cc | 4 +- .../delegate/tensorrt/op/gather_tensorrt.h | 2 +- .../delegate/tensorrt/op/lstm_tensorrt.cc | 4 +- .../delegate/tensorrt/op/lstm_tensorrt.h | 2 +- .../delegate/tensorrt/op/matmul_opt_plugin.cc | 6 +- .../delegate/tensorrt/op/matmul_opt_plugin.h | 6 +- .../delegate/tensorrt/op/matmul_tensorrt.cc | 10 +- .../delegate/tensorrt/op/matmul_tensorrt.h | 2 +- .../tensorrt/op/normalize_tensorrt.cc | 2 +- .../delegate/tensorrt/op/normalize_tensorrt.h | 2 +- .../delegate/tensorrt/op/pad_tensorrt.cc | 4 +- .../delegate/tensorrt/op/pad_tensorrt.h | 2 +- .../delegate/tensorrt/op/pool_tensorrt.cc | 6 +- .../delegate/tensorrt/op/pool_tensorrt.h | 2 +- .../delegate/tensorrt/op/reduce_tensorrt.cc | 2 +- .../delegate/tensorrt/op/reduce_tensorrt.h | 2 +- .../tensorrt/op/reducescatter_tensorrt.cc | 2 +- .../tensorrt/op/reducescatter_tensorrt.h | 8 +- .../delegate/tensorrt/op/resize_tensorrt.cc | 2 +- .../delegate/tensorrt/op/resize_tensorrt.h | 2 +- .../delegate/tensorrt/op/scale_tensorrt.cc | 6 +- .../delegate/tensorrt/op/scale_tensorrt.h | 2 +- .../delegate/tensorrt/op/shape_tensorrt.cc | 2 +- .../delegate/tensorrt/op/shape_tensorrt.h | 2 +- .../delegate/tensorrt/op/shuffle_tensorrt.cc | 2 +- .../delegate/tensorrt/op/shuffle_tensorrt.h | 4 +- .../delegate/tensorrt/op/slice_tensorrt.cc | 4 +- .../delegate/tensorrt/op/slice_tensorrt.h | 2 +- .../delegate/tensorrt/op/softmax_tensorrt.cc | 2 +- .../delegate/tensorrt/op/softmax_tensorrt.h | 2 +- .../delegate/tensorrt/op/split_tensorrt.cc | 4 +- .../delegate/tensorrt/op/split_tensorrt.h | 2 +- .../delegate/tensorrt/op/tensorrt_op.cc | 4 +- .../delegate/tensorrt/op/tensorrt_op.h | 4 +- .../delegate/tensorrt/op/tensorrt_plugin.cc | 2 +- .../delegate/tensorrt/op/tensorrt_plugin.h | 2 +- .../delegate/tensorrt/op/topk_tensorrt.cc | 2 +- .../delegate/tensorrt/op/topk_tensorrt.h | 2 +- .../delegate/tensorrt/op/unary_tensorrt.cc | 2 +- .../delegate/tensorrt/op/unary_tensorrt.h | 2 +- .../delegate/tensorrt/tensorrt_allocator.cc | 4 +- .../delegate/tensorrt/tensorrt_allocator.h | 2 +- .../delegate/tensorrt/tensorrt_delegate.cc | 6 +- .../delegate/tensorrt/tensorrt_delegate.h | 4 +- .../delegate/tensorrt/tensorrt_runtime.cc | 2 +- .../delegate/tensorrt/tensorrt_runtime.h | 4 +- .../delegate/tensorrt/tensorrt_serializer.cc | 4 +- .../delegate/tensorrt/tensorrt_serializer.h | 4 +- .../delegate/tensorrt/tensorrt_subgraph.cc | 4 +- .../delegate/tensorrt/tensorrt_subgraph.h | 8 +- .../delegate/tensorrt/tensorrt_utils.cc | 4 +- .../delegate/tensorrt/tensorrt_utils.h | 4 +- .../kernel/ascend/CMakeLists.txt | 0 .../kernel/ascend/src/acl_env_guard.cc | 2 +- .../kernel/ascend/src/acl_env_guard.h | 0 .../kernel/ascend/src/acl_model_options.h | 0 .../kernel/ascend/src/acl_options_parser.cc | 2 +- .../kernel/ascend/src/acl_options_parser.h | 2 +- .../kernel/ascend/src/custom_interface.cc | 2 +- .../kernel/ascend/src/custom_interface.h | 0 .../kernel/ascend/src/custom_kernel.cc | 6 +- .../kernel/ascend/src/custom_kernel.h | 4 +- .../kernel/ascend/src/model_infer.cc | 2 +- .../kernel/ascend/src/model_infer.h | 6 +- .../kernel/ascend/src/model_process.cc | 2 +- .../kernel/ascend/src/model_process.h | 2 +- .../kernel/cuda/CMakeLists.txt | 0 .../kernel/cuda/batchtospace.cc | 2 +- .../kernel/cuda/batchtospace.h | 2 +- .../kernel/cuda/cuda_kernel.cc | 2 +- .../kernel/cuda/cuda_kernel.h | 4 +- .../kernel/cuda/unary.cc | 2 +- .../{runtime => extendrt}/kernel/cuda/unary.h | 2 +- .../kernel/cuda/unique.cc | 2 +- .../kernel/cuda/unique.h | 2 +- .../mindir_loader}/abstract_base_model.h | 2 +- .../mindir_loader}/abstract_kernel.h | 0 .../mindir_loader}/abstract_tensor.h | 0 .../mindir_model/inner_kernel.cc | 2 +- .../mindir_model/inner_kernel.h | 4 +- .../mindir_model/kernel_mod_util.cc | 2 +- .../mindir_model/kernel_mod_util.h | 2 +- .../mindir_model/less_test_kernel_mod.cc | 2 +- .../mindir_model/less_test_kernel_mod.h | 0 .../mindir_model/mindir_model.cc | 10 +- .../mindir_model/mindir_model.h | 4 +- .../mindir_model/mindir_model_convertor.cc | 4 +- .../mindir_model/mindir_model_convertor.h | 4 +- .../mindir_model/mindir_model_loader.cc | 6 +- .../mindir_model/mindir_model_loader.h | 4 +- .../mindir_model/mindir_model_util.cc | 2 +- .../mindir_model/mindir_model_util.h | 0 .../mindir_loader}/model_loader.cc | 2 +- .../mindir_loader}/model_loader.h | 2 +- .../lite/src/{ => runtime}/c_api/context_c.cc | 2 +- .../lite/src/{ => runtime}/c_api/context_c.h | 0 .../lite/src/{ => runtime}/c_api/model_c.cc | 8 +- .../lite/src/{ => runtime}/c_api/tensor_c.cc | 2 +- mindspore/lite/src/{ => runtime}/cpu_info.cc | 2 +- mindspore/lite/src/{ => runtime}/cpu_info.h | 0 .../cxx_api/callback/callback_adapter.h | 0 .../cxx_api/callback/callback_impl.h | 0 .../cxx_api/callback/ckpt_saver.cc | 2 +- .../cxx_api/callback/loss_monitor.cc | 2 +- .../cxx_api/callback/lr_scheduler.cc | 2 +- .../cxx_api/callback/train_accuracy.cc | 2 +- .../lite/src/{ => runtime}/cxx_api/cell.cc | 0 .../lite/src/{ => runtime}/cxx_api/context.cc | 4 +- .../lite/src/{ => runtime}/cxx_api/context.h | 0 .../src/{ => runtime}/cxx_api/converters.cc | 2 +- .../src/{ => runtime}/cxx_api/converters.h | 4 +- .../{ => runtime}/cxx_api/expression/net.cc | 4 +- .../cxx_api/expression/net_impl.cc | 4 +- .../cxx_api/expression/net_impl.h | 4 +- .../cxx_api/expression/node_impl.cc | 2 +- .../cxx_api/expression/node_impl.h | 0 .../src/{ => runtime}/cxx_api/graph/graph.cc | 4 +- .../{ => runtime}/cxx_api/graph/graph_data.h | 2 +- .../{ => runtime}/cxx_api/graph/net_data.cc | 4 +- .../{ => runtime}/cxx_api/graph/net_data.h | 0 .../lite/src/{ => runtime}/cxx_api/kernel.cc | 0 .../cxx_api/kernel_executor/CMakeLists.txt | 0 .../kernel_executor/kernel_executor.cc | 4 +- .../cxx_api/kernel_executor/kernel_executor.h | 0 .../kernel_executor/kernel_executor_impl.cc | 10 +- .../kernel_executor/kernel_executor_impl.h | 4 +- .../{ => runtime}/cxx_api/metrics/accuracy.cc | 2 +- .../cxx_api/metrics/metrics_adapter.h | 0 .../cxx_api/metrics/metrics_impl.h | 0 .../src/{ => runtime}/cxx_api/model/model.cc | 8 +- .../{ => runtime}/cxx_api/model/model_impl.cc | 14 +- .../{ => runtime}/cxx_api/model/model_impl.h | 6 +- .../model_pool/model_parallel_runner.cc | 6 +- .../cxx_api/model_pool/model_pool.cc | 4 +- .../cxx_api/model_pool/model_pool.h | 4 +- .../cxx_api/model_pool/model_worker.cc | 2 +- .../cxx_api/model_pool/model_worker.h | 2 +- .../cxx_api/model_pool/predict_task_queue.cc | 2 +- .../cxx_api/model_pool/predict_task_queue.h | 2 +- .../cxx_api/model_pool/runner_config.h | 0 .../{ => runtime}/cxx_api/serialization.cc | 10 +- .../cxx_api/tensor/tensor_impl.cc | 4 +- .../cxx_api/tensor/tensor_impl.h | 0 .../src/{ => runtime}/cxx_api/tensor_utils.cc | 2 +- .../src/{ => runtime}/cxx_api/tensor_utils.h | 2 +- .../{ => runtime}/cxx_api/train/converters.cc | 2 +- .../src/{ => runtime}/cxx_api/train/model.cc | 4 +- .../cxx_api/train/model_build.cc | 2 +- .../cxx_api/train/model_build_impl.cc | 8 +- .../{ => runtime}/cxx_api/train/model_impl.cc | 14 +- .../cxx_api/train/train_support.cc | 22 ++-- .../lite/src/{ => runtime}/cxx_api/types.cc | 2 +- .../delegate/auto_registration_factory.h | 0 .../{ => runtime}/delegate/delegate_utils.cc | 2 +- .../{ => runtime}/delegate/delegate_utils.h | 0 .../{ => runtime}/delegate/npu/CMakeLists.txt | 0 .../delegate/npu/npu_converter_utils.cc | 4 +- .../delegate/npu/npu_converter_utils.h | 0 .../delegate/npu/npu_delegate.cc | 82 ++++++------ .../{ => runtime}/delegate/npu/npu_delegate.h | 6 +- .../delegate/npu/npu_executor.cc | 4 +- .../{ => runtime}/delegate/npu/npu_executor.h | 4 +- .../{ => runtime}/delegate/npu/npu_graph.cc | 10 +- .../{ => runtime}/delegate/npu/npu_graph.h | 4 +- .../{ => runtime}/delegate/npu/npu_manager.cc | 2 +- .../{ => runtime}/delegate/npu/npu_manager.h | 0 .../delegate/npu/npu_subgraph.cc | 4 +- .../{ => runtime}/delegate/npu/npu_subgraph.h | 2 +- .../{ => runtime}/delegate/npu/op/abs_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/abs_npu.h | 2 +- .../delegate/npu/op/activation_npu.cc | 4 +- .../delegate/npu/op/activation_npu.h | 2 +- .../delegate/npu/op/argmax_npu.cc | 2 +- .../delegate/npu/op/argmax_npu.h | 2 +- .../delegate/npu/op/arithmetic_npu.cc | 4 +- .../delegate/npu/op/arithmetic_npu.h | 2 +- .../delegate/npu/op/arithmetic_self_npu.cc | 2 +- .../delegate/npu/op/arithmetic_self_npu.h | 2 +- .../delegate/npu/op/avg_pooling_npu.cc | 6 +- .../delegate/npu/op/avg_pooling_npu.h | 2 +- .../delegate/npu/op/batchnorm_npu.cc | 4 +- .../delegate/npu/op/batchnorm_npu.h | 2 +- .../{ => runtime}/delegate/npu/op/cast_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/cast_npu.h | 2 +- .../delegate/npu/op/concat_npu.cc | 4 +- .../delegate/npu/op/concat_npu.h | 2 +- .../delegate/npu/op/convolution_base_npu.cc | 6 +- .../delegate/npu/op/convolution_base_npu.h | 2 +- .../npu/op/convolution_depthwise_int8_npu.cc | 4 +- .../npu/op/convolution_depthwise_int8_npu.h | 2 +- .../npu/op/convolution_depthwise_npu.cc | 4 +- .../npu/op/convolution_depthwise_npu.h | 2 +- .../delegate/npu/op/convolution_int8_npu.cc | 4 +- .../delegate/npu/op/convolution_int8_npu.h | 2 +- .../delegate/npu/op/convolution_npu.cc | 10 +- .../delegate/npu/op/convolution_npu.h | 2 +- .../delegate/npu/op/crop_and_resize_npu.cc | 2 +- .../delegate/npu/op/crop_and_resize_npu.h | 2 +- .../delegate/npu/op/deconvolution_npu.cc | 4 +- .../delegate/npu/op/deconvolution_npu.h | 2 +- .../delegate/npu/op/eltwise_npu.cc | 6 +- .../delegate/npu/op/eltwise_npu.h | 2 +- .../delegate/npu/op/expand_dims_npu.cc | 4 +- .../delegate/npu/op/expand_dims_npu.h | 2 +- .../delegate/npu/op/flatten_npu.cc | 6 +- .../delegate/npu/op/flatten_npu.h | 2 +- .../npu/op/fullconnection_int8_npu.cc | 4 +- .../delegate/npu/op/fullconnection_int8_npu.h | 2 +- .../delegate/npu/op/fullconnection_npu.cc | 6 +- .../delegate/npu/op/fullconnection_npu.h | 2 +- .../delegate/npu/op/gather_npu.cc | 4 +- .../delegate/npu/op/gather_npu.h | 2 +- .../delegate/npu/op/instance_norm_npu.cc | 4 +- .../delegate/npu/op/instance_norm_npu.h | 2 +- .../delegate/npu/op/matmul_npu.cc | 4 +- .../delegate/npu/op/matmul_npu.h | 2 +- .../delegate/npu/op/max_pooling_npu.cc | 4 +- .../delegate/npu/op/max_pooling_npu.h | 2 +- .../{ => runtime}/delegate/npu/op/npu_op.h | 0 .../{ => runtime}/delegate/npu/op/pad_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/pad_npu.h | 2 +- .../delegate/npu/op/reduce_npu.cc | 4 +- .../delegate/npu/op/reduce_npu.h | 2 +- .../delegate/npu/op/reshape_npu.cc | 4 +- .../delegate/npu/op/reshape_npu.h | 2 +- .../delegate/npu/op/resize_npu.cc | 6 +- .../delegate/npu/op/resize_npu.h | 2 +- .../delegate/npu/op/scale_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/scale_npu.h | 2 +- .../delegate/npu/op/slice_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/slice_npu.h | 2 +- .../delegate/npu/op/softmax_npu.cc | 4 +- .../delegate/npu/op/softmax_npu.h | 2 +- .../delegate/npu/op/split_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/split_npu.h | 2 +- .../delegate/npu/op/squeeze_npu.cc | 2 +- .../delegate/npu/op/squeeze_npu.h | 2 +- .../delegate/npu/op/strided_slice_npu.cc | 4 +- .../delegate/npu/op/strided_slice_npu.h | 2 +- .../{ => runtime}/delegate/npu/op/tile_npu.cc | 4 +- .../{ => runtime}/delegate/npu/op/tile_npu.h | 2 +- .../delegate/npu/op/transpose_npu.cc | 2 +- .../delegate/npu/op/transpose_npu.h | 2 +- .../delegate/npu/op/unsqueeze_npu.cc | 2 +- .../delegate/npu/op/unsqueeze_npu.h | 2 +- .../delegate/npu/pass/npu_base_pass.h | 2 +- .../delegate/npu/pass/npu_fusion_pass.cc | 6 +- .../delegate/npu/pass/npu_fusion_pass.h | 4 +- .../npu/pass/npu_insert_transform_pass.cc | 6 +- .../npu/pass/npu_insert_transform_pass.h | 4 +- .../delegate/npu/pass/npu_pass_manager.cc | 2 +- .../delegate/npu/pass/npu_pass_manager.h | 2 +- .../delegate/npu/pass/npu_pass_utils.cc | 8 +- .../delegate/npu/pass/npu_pass_utils.h | 4 +- .../delegate/npu/pass/npu_transform_pass.cc | 6 +- .../delegate/npu/pass/npu_transform_pass.h | 4 +- .../delegate/npu/transpose_kernel.cc | 6 +- .../delegate/npu/transpose_kernel.h | 0 mindspore/lite/src/{ => runtime}/executor.cc | 2 +- mindspore/lite/src/{ => runtime}/executor.h | 2 +- .../lite/src/{ => runtime}/huffman_decode.cc | 2 +- .../lite/src/{ => runtime}/huffman_decode.h | 0 mindspore/lite/src/runtime/infer_manager.cc | 4 +- .../lite/src/{ => runtime}/inner_context.cc | 4 +- .../lite/src/{ => runtime}/inner_context.h | 2 +- .../runtime/kernel/cpu/base/argminmax_base.cc | 2 +- .../runtime/kernel/cpu/base/argminmax_base.h | 2 +- .../runtime/kernel/cpu/base/arithmetic_base.h | 2 +- .../src/runtime/kernel/cpu/base/assert.cc | 2 +- .../lite/src/runtime/kernel/cpu/base/assert.h | 2 +- .../lite/src/runtime/kernel/cpu/base/call.cc | 2 +- .../lite/src/runtime/kernel/cpu/base/call.h | 2 +- .../runtime/kernel/cpu/base/concat_base.cc | 2 +- .../src/runtime/kernel/cpu/base/concat_base.h | 2 +- .../kernel/cpu/base/constant_of_shape.cc | 2 +- .../kernel/cpu/base/constant_of_shape.h | 2 +- .../kernel/cpu/base/convolution_base.cc | 2 +- .../kernel/cpu/base/convolution_base.h | 6 +- .../src/runtime/kernel/cpu/base/crop_base.cc | 2 +- .../src/runtime/kernel/cpu/base/crop_base.h | 2 +- .../cpu/base/detection_post_process_base.cc | 2 +- .../cpu/base/detection_post_process_base.h | 2 +- .../kernel/cpu/base/format_transpose.cc | 2 +- .../kernel/cpu/base/format_transpose.h | 2 +- .../src/runtime/kernel/cpu/base/gather_base.h | 2 +- .../kernel/cpu/base/group_convolution_base.h | 2 +- .../cpu/base/group_convolution_creator.h | 4 +- .../runtime/kernel/cpu/base/one_hot_base.cc | 2 +- .../runtime/kernel/cpu/base/one_hot_base.h | 2 +- .../runtime/kernel/cpu/base/partial_fusion.cc | 2 +- .../runtime/kernel/cpu/base/partial_fusion.h | 2 +- .../runtime/kernel/cpu/base/pooling_base.cc | 2 +- .../runtime/kernel/cpu/base/pooling_base.h | 2 +- .../src/runtime/kernel/cpu/base/prior_box.cc | 2 +- .../src/runtime/kernel/cpu/base/prior_box.h | 2 +- .../kernel/cpu/base/quant_dtype_cast.cc | 2 +- .../kernel/cpu/base/quant_dtype_cast.h | 2 +- .../runtime/kernel/cpu/base/random_normal.cc | 2 +- .../runtime/kernel/cpu/base/random_normal.h | 2 +- .../runtime/kernel/cpu/base/reduce_base.cc | 2 +- .../src/runtime/kernel/cpu/base/reduce_base.h | 2 +- .../runtime/kernel/cpu/base/reshape_base.cc | 2 +- .../runtime/kernel/cpu/base/reshape_base.h | 2 +- .../runtime/kernel/cpu/base/resize_base.cc | 2 +- .../src/runtime/kernel/cpu/base/resize_base.h | 2 +- .../kernel/cpu/base/scatter_nd_base.cc | 2 +- .../runtime/kernel/cpu/base/scatter_nd_base.h | 2 +- .../src/runtime/kernel/cpu/base/select.cc | 2 +- .../lite/src/runtime/kernel/cpu/base/select.h | 2 +- .../src/runtime/kernel/cpu/base/slice_base.cc | 2 +- .../src/runtime/kernel/cpu/base/slice_base.h | 2 +- .../runtime/kernel/cpu/base/softmax_base.cc | 2 +- .../runtime/kernel/cpu/base/softmax_base.h | 2 +- .../src/runtime/kernel/cpu/base/split_base.cc | 2 +- .../src/runtime/kernel/cpu/base/split_base.h | 2 +- .../cpu/base/split_with_over_lap_base.cc | 2 +- .../cpu/base/split_with_over_lap_base.h | 2 +- .../src/runtime/kernel/cpu/base/stack_base.cc | 2 +- .../src/runtime/kernel/cpu/base/stack_base.h | 2 +- .../runtime/kernel/cpu/base/strided_slice.cc | 2 +- .../runtime/kernel/cpu/base/strided_slice.h | 2 +- .../src/runtime/kernel/cpu/base/tile_base.cc | 2 +- .../src/runtime/kernel/cpu/base/tile_base.h | 2 +- .../runtime/kernel/cpu/base/transpose_base.h | 2 +- .../src/runtime/kernel/cpu/control/switch.cc | 2 +- .../src/runtime/kernel/cpu/control/switch.h | 2 +- .../kernel/cpu/control/switch_layer.cc | 2 +- .../runtime/kernel/cpu/control/switch_layer.h | 2 +- .../kernel/cpu/control/tensor_array.cc | 4 +- .../runtime/kernel/cpu/control/tensor_array.h | 2 +- .../cpu/control/tensorlist_fromtensor.cc | 2 +- .../cpu/control/tensorlist_fromtensor.h | 2 +- .../kernel/cpu/control/tensorlist_getitem.cc | 2 +- .../kernel/cpu/control/tensorlist_getitem.h | 2 +- .../kernel/cpu/control/tensorlist_reserve.cc | 2 +- .../kernel/cpu/control/tensorlist_reserve.h | 2 +- .../kernel/cpu/control/tensorlist_setitem.cc | 2 +- .../kernel/cpu/control/tensorlist_setitem.h | 2 +- .../kernel/cpu/control/tensorlist_stack.cc | 2 +- .../kernel/cpu/control/tensorlist_stack.h | 2 +- .../lite/src/runtime/kernel/cpu/cpu_kernel.h | 4 +- .../kernel/cpu/fp16/activation_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/activation_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/addn_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/addn_fp16.h | 2 +- .../cpu/fp16/arithmetic_compare_fp16.cc | 2 +- .../kernel/cpu/fp16/arithmetic_compare_fp16.h | 2 +- .../kernel/cpu/fp16/arithmetic_fp16.cc | 2 +- .../kernel/cpu/fp16/arithmetic_self_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/batchnorm_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/biasadd_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/biasadd_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/cast_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/cast_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/common_fp16.h | 2 +- .../runtime/kernel/cpu/fp16/concat_fp16.cc | 2 +- .../kernel/cpu/fp16/convolution_1x1_fp16.h | 2 +- .../cpu/fp16/convolution_delegate_fp16.cc | 2 +- .../cpu/fp16/convolution_delegate_fp16.h | 2 +- .../cpu/fp16/convolution_depthwise_3x3_fp16.h | 2 +- .../cpu/fp16/convolution_depthwise_fp16.h | 2 +- .../convolution_depthwise_slidewindow_fp16.h | 2 +- .../kernel/cpu/fp16/convolution_fp16.h | 2 +- .../cpu/fp16/convolution_winograd_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/crop_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/crop_fp16.h | 2 +- .../cpu/fp16/deconvolution_depthwise_fp16.h | 2 +- .../kernel/cpu/fp16/deconvolution_fp16.h | 2 +- .../kernel/cpu/fp16/depth_to_space_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/fill_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/fill_fp16.h | 2 +- .../kernel/cpu/fp16/fullconnection_fp16.cc | 2 +- .../kernel/cpu/fp16/fused_batchnorm_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/gather_fp16.cc | 2 +- .../kernel/cpu/fp16/group_convolution_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/gru_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/gru_fp16.h | 2 +- .../kernel/cpu/fp16/instance_norm_fp16.cc | 2 +- .../kernel/cpu/fp16/instance_norm_fp16.h | 2 +- .../kernel/cpu/fp16/layer_norm_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/layer_norm_fp16.h | 2 +- .../kernel/cpu/fp16/log_softmax_fp16.cc | 2 +- .../kernel/cpu/fp16/log_softmax_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/lstm_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/lstm_fp16.h | 2 +- .../kernel/cpu/fp16/matmul_base_fp16.h | 2 +- .../runtime/kernel/cpu/fp16/matmul_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/pad_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/pooling_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/pooling_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/power_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/power_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/prelu_fp16.cc | 2 +- .../kernel/cpu/fp16/quant_dtype_cast_fp16.cc | 2 +- .../kernel/cpu/fp16/quant_dtype_cast_fp16.h | 2 +- .../kernel/cpu/fp16/ragged_range_fp16.cc | 2 +- .../kernel/cpu/fp16/ragged_range_fp16.h | 2 +- .../runtime/kernel/cpu/fp16/reduce_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/resize_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/scale_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/scale_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/slice_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/slice_fp16.h | 2 +- .../runtime/kernel/cpu/fp16/softmax_fp16.cc | 2 +- .../runtime/kernel/cpu/fp16/softmax_fp16.h | 2 +- .../src/runtime/kernel/cpu/fp16/stack_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/stack_fp16.h | 2 +- .../runtime/kernel/cpu/fp16/transpose_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp16/where_fp16.cc | 2 +- .../cpu/fp16_grad/activation_fp16_grad.cc | 2 +- .../cpu/fp16_grad/activation_fp16_grad.h | 2 +- .../cpu/fp16_grad/arithmetic_fp16_grad.cc | 2 +- .../cpu/fp16_grad/arithmetic_fp16_grad.h | 2 +- .../fp16_grad/arithmetic_fp16_self_grad.cc | 2 +- .../cpu/fp16_grad/arithmetic_fp16_self_grad.h | 2 +- .../kernel/cpu/fp16_grad/bias_fp16_grad.cc | 2 +- .../kernel/cpu/fp16_grad/bias_fp16_grad.h | 2 +- .../kernel/cpu/fp16_grad/bn_fp16_grad.cc | 2 +- .../kernel/cpu/fp16_grad/bn_fp16_grad.h | 2 +- .../fp16_grad/convolution_fp16_grad_filter.cc | 2 +- .../fp16_grad/convolution_fp16_grad_filter.h | 2 +- .../fp16_grad/convolution_fp16_grad_input.cc | 2 +- .../fp16_grad/convolution_fp16_grad_input.h | 2 +- .../kernel/cpu/fp16_grad/dropout_fp16_grad.cc | 2 +- .../kernel/cpu/fp16_grad/dropout_fp16_grad.h | 2 +- .../cpu/fp16_grad/layernorm_fp16_grad.cc | 2 +- .../cpu/fp16_grad/layernorm_fp16_grad.h | 2 +- .../kernel/cpu/fp16_grad/neg_fp16_grad.cc | 2 +- .../kernel/cpu/fp16_grad/neg_fp16_grad.h | 2 +- .../kernel/cpu/fp16_grad/pooling_fp16_grad.cc | 2 +- .../kernel/cpu/fp16_grad/pooling_fp16_grad.h | 2 +- .../kernel/cpu/fp16_grad/resize_fp16_grad.cc | 2 +- .../kernel/cpu/fp16_grad/resize_fp16_grad.h | 2 +- .../cpu/fp16_grad/strided_slice_fp16_grad.cc | 4 +- .../cpu/fp16_grad/strided_slice_fp16_grad.h | 2 +- .../fp16_grad/unsorted_segment_sum_fp16.cc | 2 +- .../cpu/fp16_grad/unsorted_segment_sum_fp16.h | 2 +- .../kernel/cpu/fp32/activation_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/activation_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/adder_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/adder_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/addn_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/addn_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/affine_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/affine_fp32.h | 2 +- .../kernel/cpu/fp32/all_gather_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/all_gather_fp32.h | 2 +- .../cpu/fp32/arithmetic_compare_fp32.cc | 2 +- .../kernel/cpu/fp32/arithmetic_fp32.cc | 2 +- .../kernel/cpu/fp32/arithmetic_self_fp32.cc | 2 +- .../kernel/cpu/fp32/arithmetic_self_fp32.h | 2 +- .../kernel/cpu/fp32/batch_to_space_fp32.cc | 2 +- .../kernel/cpu/fp32/batch_to_space_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/batchnorm_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/batchnorm_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/bias_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/bias_fp32.h | 2 +- .../kernel/cpu/fp32/broadcast_to_fp32.cc | 2 +- .../kernel/cpu/fp32/broadcast_to_fp32.h | 2 +- .../kernel/cpu/fp32/cast_for_x86_fp16.cc | 2 +- .../src/runtime/kernel/cpu/fp32/cast_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/cast_fp32.h | 2 +- .../kernel/cpu/fp32/convolution_1x1_fp32.cc | 2 +- .../kernel/cpu/fp32/convolution_1x1_fp32.h | 2 +- .../cpu/fp32/convolution_delegate_fp32.cc | 2 +- .../cpu/fp32/convolution_delegate_fp32.h | 2 +- .../cpu/fp32/convolution_depthwise_3x3_fp32.h | 2 +- .../cpu/fp32/convolution_depthwise_fp32.cc | 2 +- .../cpu/fp32/convolution_depthwise_fp32.h | 2 +- .../convolution_depthwise_indirect_fp32.cc | 2 +- .../convolution_depthwise_indirect_fp32.h | 2 +- .../convolution_depthwise_slidewindow_fp32.cc | 2 +- .../convolution_depthwise_slidewindow_fp32.h | 2 +- ...nvolution_depthwise_slidewindow_x86_fp32.h | 2 +- .../kernel/cpu/fp32/convolution_fp32.cc | 4 +- .../kernel/cpu/fp32/convolution_fp32.h | 2 +- .../cpu/fp32/convolution_slidewindow_fp32.cc | 2 +- .../cpu/fp32/convolution_slidewindow_fp32.h | 2 +- .../cpu/fp32/convolution_winograd_fp32.h | 2 +- .../kernel/cpu/fp32/crop_and_resize_fp32.cc | 2 +- .../kernel/cpu/fp32/crop_and_resize_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/crop_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/crop_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/cumsum_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/cumsum_fp32.h | 2 +- .../cpu/fp32/deconvolution_depthwise_fp32.h | 2 +- .../kernel/cpu/fp32/deconvolution_fp32.h | 4 +- .../cpu/fp32/deconvolution_winograd_fp32.h | 4 +- .../kernel/cpu/fp32/depth_to_space_fp32.cc | 2 +- .../kernel/cpu/fp32/depth_to_space_fp32.h | 2 +- .../cpu/fp32/detection_post_process_fp32.cc | 2 +- .../cpu/fp32/detection_post_process_fp32.h | 2 +- .../kernel/cpu/fp32/embedding_lookup_fp32.cc | 2 +- .../kernel/cpu/fp32/embedding_lookup_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/fill_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/fill_fp32.h | 2 +- .../kernel/cpu/fp32/fullconnection_fp32.cc | 2 +- .../kernel/cpu/fp32/fused_batchnorm_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/gatherNd_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/gatherNd_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/gather_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/glu_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/glu_fp32.h | 2 +- .../kernel/cpu/fp32/group_convolution_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/groupnorm_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/groupnorm_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/gru_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/gru_fp32.h | 2 +- .../kernel/cpu/fp32/instance_norm_fp32.cc | 2 +- .../kernel/cpu/fp32/instance_norm_fp32.h | 2 +- .../cpu/fp32/invert_permutation_fp32.cc | 2 +- .../kernel/cpu/fp32/invert_permutation_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/l2_norm_fp32.h | 4 +- .../kernel/cpu/fp32/layer_norm_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/layer_norm_fp32.h | 2 +- .../cpu/fp32/local_response_norm_fp32.cc | 2 +- .../cpu/fp32/local_response_norm_fp32.h | 2 +- .../kernel/cpu/fp32/log_softmax_fp32.cc | 2 +- .../kernel/cpu/fp32/log_softmax_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/lstm_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/lstm_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/matmul_fp32.cc | 2 +- .../kernel/cpu/fp32/matmul_fp32_base.h | 4 +- .../runtime/kernel/cpu/fp32/nllloss_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/nllloss_fp32.h | 2 +- .../cpu/fp32/non_max_suppression_fp32.cc | 2 +- .../cpu/fp32/non_max_suppression_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/nonzero_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/nonzero_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/pad_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/pad_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/pooling_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/pooling_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/power_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/power_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/prelu_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/prelu_fp32.h | 2 +- .../kernel/cpu/fp32/ragged_range_fp32.cc | 2 +- .../kernel/cpu/fp32/ragged_range_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/range_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/range_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/rank_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/rank_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/reduce_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/reduce_fp32.h | 2 +- .../kernel/cpu/fp32/reduce_scatter_fp32.cc | 2 +- .../kernel/cpu/fp32/reduce_scatter_fp32.h | 2 +- .../fp32/relative_position_attention_fp32.cc | 2 +- .../fp32/relative_position_attention_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/resize_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/resize_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/reverse_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/reverse_fp32.h | 2 +- .../kernel/cpu/fp32/reverse_sequence_fp32.cc | 2 +- .../kernel/cpu/fp32/reverse_sequence_fp32.h | 2 +- .../kernel/cpu/fp32/roi_pooling_fp32.cc | 2 +- .../kernel/cpu/fp32/roi_pooling_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/scale_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/scale_fp32.h | 2 +- .../kernel/cpu/fp32/scatter_nd_update_fp32.cc | 2 +- .../kernel/cpu/fp32/scatter_nd_update_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/shape_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/shape_fp32.h | 2 +- .../kernel/cpu/fp32/shape_fusion_fp32.cc | 2 +- .../kernel/cpu/fp32/shape_fusion_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/size_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/size_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/softmax_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/softmax_fp32.h | 2 +- .../kernel/cpu/fp32/space_to_batch_fp32.cc | 2 +- .../kernel/cpu/fp32/space_to_batch_fp32.h | 2 +- .../kernel/cpu/fp32/space_to_depth_fp32.cc | 2 +- .../kernel/cpu/fp32/space_to_depth_fp32.h | 2 +- .../kernel/cpu/fp32/sparse_to_dense_fp32.cc | 2 +- .../kernel/cpu/fp32/sparse_to_dense_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/splice_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/splice_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/topk_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/topk_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/transpose_fp32.cc | 2 +- .../kernel/cpu/fp32/transpose_server_fp32.cc | 2 +- .../kernel/cpu/fp32/uniform_real_fp32.cc | 2 +- .../kernel/cpu/fp32/uniform_real_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/unique_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/unique_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/unstack_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/unstack_fp32.h | 2 +- .../src/runtime/kernel/cpu/fp32/where_fp32.cc | 2 +- .../src/runtime/kernel/cpu/fp32/where_fp32.h | 2 +- .../runtime/kernel/cpu/fp32/zeroslike_fp32.cc | 2 +- .../runtime/kernel/cpu/fp32/zeroslike_fp32.h | 2 +- .../kernel/cpu/fp32_grad/activation_grad.cc | 2 +- .../kernel/cpu/fp32_grad/activation_grad.h | 2 +- .../src/runtime/kernel/cpu/fp32_grad/adam.cc | 2 +- .../kernel/cpu/fp32_grad/apply_momentum.cc | 2 +- .../kernel/cpu/fp32_grad/arithmetic_grad.cc | 2 +- .../kernel/cpu/fp32_grad/arithmetic_grad.h | 2 +- .../cpu/fp32_grad/arithmetic_self_grad.cc | 2 +- .../cpu/fp32_grad/arithmetic_self_grad.h | 2 +- .../runtime/kernel/cpu/fp32_grad/assign.cc | 2 +- .../src/runtime/kernel/cpu/fp32_grad/assign.h | 2 +- .../runtime/kernel/cpu/fp32_grad/bias_grad.cc | 2 +- .../runtime/kernel/cpu/fp32_grad/bias_grad.h | 2 +- .../runtime/kernel/cpu/fp32_grad/bn_grad.cc | 2 +- .../runtime/kernel/cpu/fp32_grad/bn_grad.h | 2 +- .../kernel/cpu/fp32_grad/convolution.h | 2 +- .../cpu/fp32_grad/convolution_grad_filter.cc | 2 +- .../cpu/fp32_grad/convolution_grad_filter.h | 2 +- .../cpu/fp32_grad/convolution_grad_input.cc | 2 +- .../cpu/fp32_grad/convolution_grad_input.h | 2 +- .../fp32_grad/deconvolution_grad_filter.cc | 2 +- .../cpu/fp32_grad/deconvolution_grad_filter.h | 2 +- .../runtime/kernel/cpu/fp32_grad/dropout.cc | 2 +- .../runtime/kernel/cpu/fp32_grad/dropout.h | 2 +- .../kernel/cpu/fp32_grad/dropout_grad.cc | 2 +- .../kernel/cpu/fp32_grad/dropout_grad.h | 2 +- .../kernel/cpu/fp32_grad/layernorm_grad.cc | 2 +- .../kernel/cpu/fp32_grad/layernorm_grad.h | 2 +- .../cpu/fp32_grad/lstm_grad_data_fp32.cc | 2 +- .../cpu/fp32_grad/lstm_grad_data_fp32.h | 2 +- .../kernel/cpu/fp32_grad/lstm_grad_fp32.cc | 2 +- .../kernel/cpu/fp32_grad/lstm_grad_fp32.h | 2 +- .../cpu/fp32_grad/lstm_grad_weight_fp32.cc | 2 +- .../cpu/fp32_grad/lstm_grad_weight_fp32.h | 2 +- .../runtime/kernel/cpu/fp32_grad/make_tuple.h | 2 +- .../runtime/kernel/cpu/fp32_grad/neg_grad.cc | 2 +- .../runtime/kernel/cpu/fp32_grad/neg_grad.h | 2 +- .../kernel/cpu/fp32_grad/nllloss_grad.cc | 2 +- .../kernel/cpu/fp32_grad/nllloss_grad.h | 2 +- .../kernel/cpu/fp32_grad/pooling_grad.cc | 2 +- .../kernel/cpu/fp32_grad/pooling_grad.h | 2 +- .../kernel/cpu/fp32_grad/power_grad.cc | 2 +- .../runtime/kernel/cpu/fp32_grad/power_grad.h | 2 +- .../kernel/cpu/fp32_grad/resize_grad.cc | 2 +- .../kernel/cpu/fp32_grad/resize_grad.h | 2 +- .../src/runtime/kernel/cpu/fp32_grad/sgd.cc | 2 +- .../sigmoid_cross_entropy_with_logits.cc | 2 +- .../sigmoid_cross_entropy_with_logits.h | 2 +- .../sigmoid_cross_entropy_with_logits_grad.cc | 2 +- .../sigmoid_cross_entropy_with_logits_grad.h | 2 +- .../kernel/cpu/fp32_grad/smooth_l1_loss.cc | 2 +- .../kernel/cpu/fp32_grad/smooth_l1_loss.h | 2 +- .../cpu/fp32_grad/smooth_l1_loss_grad.cc | 2 +- .../cpu/fp32_grad/smooth_l1_loss_grad.h | 2 +- .../softmax_cross_entropy_with_logits.cc | 2 +- .../kernel/cpu/fp32_grad/softmax_grad.cc | 2 +- .../kernel/cpu/fp32_grad/softmax_grad.h | 2 +- ...parse_softmax_cross_entropy_with_logits.cc | 2 +- .../cpu/fp32_grad/strided_slice_grad.cc | 4 +- .../kernel/cpu/fp32_grad/strided_slice_grad.h | 2 +- .../cpu/fp32_grad/unsorted_segment_sum.cc | 2 +- .../cpu/fp32_grad/unsorted_segment_sum.h | 2 +- .../cpu/fp32_sparse/matmul_sparse_fp32.cc | 2 +- .../cpu/fp32_sparse/matmul_sparse_fp32.h | 2 +- .../kernel/cpu/int8/activation_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/add_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/add_int8.h | 2 +- .../runtime/kernel/cpu/int8/argminmax_int8.cc | 2 +- .../runtime/kernel/cpu/int8/argminmax_int8.h | 2 +- .../kernel/cpu/int8/arithmetic_int8.cc | 2 +- .../runtime/kernel/cpu/int8/arithmetic_int8.h | 2 +- .../kernel/cpu/int8/arithmetic_self_int8.cc | 2 +- .../kernel/cpu/int8/arithmetic_self_int8.h | 2 +- .../kernel/cpu/int8/batch_to_space_int8.cc | 2 +- .../kernel/cpu/int8/batch_to_space_int8.h | 2 +- .../runtime/kernel/cpu/int8/batchnorm_int8.cc | 2 +- .../runtime/kernel/cpu/int8/batchnorm_int8.h | 2 +- .../runtime/kernel/cpu/int8/concat_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/concat_int8.h | 2 +- .../kernel/cpu/int8/convolution_1x1_int8.h | 2 +- .../kernel/cpu/int8/convolution_3x3_int8.h | 2 +- .../cpu/int8/convolution_depthwise_3x3_int8.h | 2 +- .../cpu/int8/convolution_depthwise_int8.h | 2 +- .../convolution_depthwise_slidewindow_int8.h | 2 +- .../kernel/cpu/int8/convolution_int8.cc | 2 +- .../kernel/cpu/int8/convolution_int8.h | 2 +- .../cpu/int8/convolution_int8_creator.cc | 2 +- .../cpu/int8/convolution_int8_creator.h | 2 +- .../src/runtime/kernel/cpu/int8/crop_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/crop_int8.h | 2 +- .../cpu/int8/deconvolution_depthwise_int8.h | 2 +- .../kernel/cpu/int8/deconvolution_int8.h | 4 +- .../kernel/cpu/int8/depth_to_space_int8.cc | 2 +- .../cpu/int8/detection_post_process_int8.cc | 2 +- .../cpu/int8/detection_post_process_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/div_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/div_int8.h | 2 +- .../kernel/cpu/int8/dynamic_gather_int8.cc | 2 +- .../kernel/cpu/int8/dynamic_gather_int8.h | 2 +- .../runtime/kernel/cpu/int8/dynamic_quant.cc | 2 +- .../runtime/kernel/cpu/int8/dynamic_quant.h | 2 +- .../kernel/cpu/int8/fullconnection_int8.cc | 2 +- .../runtime/kernel/cpu/int8/gatherNd_int8.cc | 2 +- .../runtime/kernel/cpu/int8/gatherNd_int8.h | 2 +- .../runtime/kernel/cpu/int8/gather_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/gather_int8.h | 2 +- .../kernel/cpu/int8/group_convolution_int8.h | 2 +- .../runtime/kernel/cpu/int8/hswish_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/hswish_int8.h | 2 +- .../runtime/kernel/cpu/int8/l2_norm_int8.cc | 2 +- .../runtime/kernel/cpu/int8/layer_norm_int8.h | 2 +- .../kernel/cpu/int8/leaky_relu_int8.cc | 2 +- .../runtime/kernel/cpu/int8/leaky_relu_int8.h | 2 +- .../kernel/cpu/int8/matmul_base_int8.h | 2 +- .../cpu/int8/matmul_dynamic_base_int8.h | 2 +- .../runtime/kernel/cpu/int8/matmul_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/matmul_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/mul_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/mul_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/pad_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/pad_int8.h | 2 +- .../runtime/kernel/cpu/int8/pooling_int8.cc | 2 +- .../runtime/kernel/cpu/int8/pooling_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/power_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/power_int8.h | 2 +- .../runtime/kernel/cpu/int8/reduce_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/reduce_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/relux_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/relux_int8.h | 2 +- .../runtime/kernel/cpu/int8/reshape_int8.cc | 2 +- .../runtime/kernel/cpu/int8/reshape_int8.h | 2 +- .../runtime/kernel/cpu/int8/resize_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/resize_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/scale_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/scale_int8.h | 2 +- .../runtime/kernel/cpu/int8/sigmoid_int8.cc | 2 +- .../runtime/kernel/cpu/int8/sigmoid_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/slice_int8.cc | 2 +- .../runtime/kernel/cpu/int8/softmax_int8.cc | 2 +- .../kernel/cpu/int8/space_to_batch_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/split_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/split_int8.h | 2 +- .../runtime/kernel/cpu/int8/squeeze_int8.cc | 2 +- .../runtime/kernel/cpu/int8/squeeze_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/sub_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/sub_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/tanh_int8.h | 2 +- .../src/runtime/kernel/cpu/int8/topk_int8.cc | 2 +- .../src/runtime/kernel/cpu/int8/topk_int8.h | 2 +- .../runtime/kernel/cpu/int8/transpose_int8.cc | 2 +- .../runtime/kernel/cpu/int8/unsqueeze_int8.cc | 2 +- .../runtime/kernel/cpu/int8/unsqueeze_int8.h | 2 +- .../kernel/cpu/string/extract_feature.cc | 2 +- .../kernel/cpu/string/extract_feature.h | 2 +- .../kernel/cpu/string/hashtable_lookup.cc | 2 +- .../kernel/cpu/string/hashtable_lookup.h | 2 +- .../kernel/cpu/string/lsh_projection.cc | 2 +- .../kernel/cpu/string/lsh_projection.h | 2 +- .../runtime/kernel/cpu/string/normalize.cc | 2 +- .../src/runtime/kernel/cpu/string/normalize.h | 2 +- .../src/runtime/kernel/cpu/string/predict.cc | 2 +- .../src/runtime/kernel/cpu/string/predict.h | 2 +- .../runtime/kernel/cpu/string/skip_gram.cc | 2 +- .../src/runtime/kernel/cpu/string/skip_gram.h | 2 +- .../gpu/opencl/opencl_allocator.cc | 4 +- .../gpu/opencl/opencl_allocator.h | 0 .../gpu/opencl/opencl_executor.cc | 2 +- .../{ => kernel}/gpu/opencl/opencl_executor.h | 4 +- .../{ => kernel}/gpu/opencl/opencl_runtime.cc | 4 +- .../{ => kernel}/gpu/opencl/opencl_runtime.h | 4 +- .../gpu/opencl/opencl_runtime_wrapper.cc | 4 +- .../{ => kernel}/gpu/opencl/opencl_wrapper.cc | 2 +- .../{ => kernel}/gpu/opencl/opencl_wrapper.h | 0 .../kernel/opencl/kernel/activation.cc | 2 +- .../runtime/kernel/opencl/kernel/argminmax.cc | 2 +- .../kernel/opencl/kernel/arithmetic.cc | 2 +- .../kernel/opencl/kernel/arithmetic_self.cc | 2 +- .../kernel/opencl/kernel/batch_to_space_nd.cc | 2 +- .../runtime/kernel/opencl/kernel/batchnorm.cc | 2 +- .../src/runtime/kernel/opencl/kernel/cast.cc | 2 +- .../runtime/kernel/opencl/kernel/concat.cc | 2 +- .../runtime/kernel/opencl/kernel/conv2d.cc | 2 +- .../kernel/opencl/kernel/conv2d_transpose.cc | 2 +- .../kernel/opencl/kernel/conv2d_transpose.h | 2 +- .../kernel/opencl/kernel/depthwise_conv2d.cc | 2 +- .../src/runtime/kernel/opencl/kernel/fill.cc | 2 +- .../kernel/opencl/kernel/fullconnection.cc | 2 +- .../runtime/kernel/opencl/kernel/gather.cc | 2 +- .../runtime/kernel/opencl/kernel/gl_to_cl.cc | 2 +- .../runtime/kernel/opencl/kernel/gl_to_cl.h | 2 +- .../opencl/kernel/int8/arithmetic_int8.cc | 2 +- .../kernel/opencl/kernel/layer_norm.cc | 2 +- .../runtime/kernel/opencl/kernel/matmul.cc | 2 +- .../runtime/kernel/opencl/kernel/one_hot.cc | 2 +- .../runtime/kernel/opencl/kernel/one_hot.h | 2 +- .../src/runtime/kernel/opencl/kernel/pad.cc | 2 +- .../runtime/kernel/opencl/kernel/pooling2d.cc | 2 +- .../src/runtime/kernel/opencl/kernel/power.cc | 2 +- .../src/runtime/kernel/opencl/kernel/prelu.cc | 2 +- .../runtime/kernel/opencl/kernel/reduce.cc | 2 +- .../src/runtime/kernel/opencl/kernel/reduce.h | 2 +- .../runtime/kernel/opencl/kernel/reshape.cc | 2 +- .../runtime/kernel/opencl/kernel/reshape.h | 2 +- .../runtime/kernel/opencl/kernel/resize.cc | 2 +- .../src/runtime/kernel/opencl/kernel/resize.h | 2 +- .../src/runtime/kernel/opencl/kernel/scale.cc | 2 +- .../runtime/kernel/opencl/kernel/softmax.cc | 2 +- .../kernel/opencl/kernel/space_to_batch_nd.cc | 2 +- .../kernel/opencl/kernel/space_to_depth.cc | 2 +- .../kernel/opencl/kernel/space_to_depth.h | 2 +- .../kernel/opencl/kernel/sparse_to_dense.cc | 2 +- .../src/runtime/kernel/opencl/kernel/split.cc | 2 +- .../src/runtime/kernel/opencl/kernel/stack.cc | 2 +- .../kernel/opencl/kernel/strided_slice.cc | 2 +- .../runtime/kernel/opencl/kernel/to_format.cc | 2 +- .../runtime/kernel/opencl/kernel/to_format.h | 2 +- .../runtime/kernel/opencl/kernel/transpose.cc | 2 +- .../runtime/kernel/opencl/kernel/transpose.h | 2 +- .../runtime/kernel/opencl/opencl_fusion.cc | 2 +- .../runtime/kernel/opencl/opencl_kernel.cc | 2 +- .../src/runtime/kernel/opencl/opencl_kernel.h | 7 +- .../runtime/kernel/opencl/opencl_subgraph.cc | 2 +- .../runtime/kernel/opencl/opencl_subgraph.h | 6 +- .../lite/src/runtime/kernel/opencl/utils.cc | 2 +- .../lite/src/runtime/kernel/opencl/utils.h | 2 +- .../lite/src/{ => runtime}/kernel_exec.cc | 2 +- .../lite/src/{ => runtime}/kernel_exec.h | 8 +- .../src/{ => runtime}/kernel_exec_util.cc | 6 +- .../lite/src/{ => runtime}/kernel_exec_util.h | 6 +- .../lite/src/{ => runtime}/kernel_registry.cc | 4 +- .../lite/src/{ => runtime}/kernel_registry.h | 2 +- .../lite/src/{ => runtime}/lite_kernel.cc | 2 +- .../lite/src/{ => runtime}/lite_kernel.h | 8 +- .../lite/src/{ => runtime}/lite_mindrt.cc | 4 +- .../lite/src/{ => runtime}/lite_mindrt.h | 6 +- .../lite/src/{ => runtime}/lite_model.cc | 4 +- mindspore/lite/src/{ => runtime}/lite_model.h | 2 +- .../lite/src/{ => runtime}/lite_session.cc | 22 ++-- .../lite/src/{ => runtime}/lite_session.h | 12 +- .../lite/src/{ => runtime}/mindrt_executor.cc | 6 +- .../lite/src/{ => runtime}/mindrt_executor.h | 6 +- mindspore/lite/src/{ => runtime}/ms_tensor.cc | 0 .../lite/src/{ => runtime}/pack_weight.cc | 2 +- .../lite/src/{ => runtime}/pack_weight.h | 2 +- .../src/{ => runtime}/pack_weight_manager.cc | 2 +- .../src/{ => runtime}/pack_weight_manager.h | 2 +- .../lite/src/{ => runtime}/parallel_config.h | 0 .../runtime/pass/decrease_transpose_algo.cc | 2 +- .../runtime/pass/delete_isolated_kernel.cc | 2 +- .../lite/src/runtime/pass/infershape_pass.cc | 2 +- mindspore/lite/src/runtime/pass/pass_utils.cc | 2 +- mindspore/lite/src/runtime/pass/pass_utils.h | 4 +- .../lite/src/runtime/pass/runtime_ncx_pass.h | 4 +- .../lite/src/runtime/pass/runtime_optimizer.h | 2 +- .../lite/src/runtime/pass/to_nchw_format.cc | 4 +- .../lite/src/runtime/pass/to_nchw_format.h | 2 +- .../src/runtime/pass/transpose_strategy.h | 2 +- mindspore/lite/src/runtime/runtime_pass.h | 4 +- .../src/runtime/runtime_shape_fusion_pass.h | 2 +- mindspore/lite/src/{ => runtime}/scheduler.cc | 20 +-- mindspore/lite/src/{ => runtime}/scheduler.h | 6 +- .../lite/src/{ => runtime}/scheduler_cb.h | 0 .../{ => runtime}/schema_tensor_wrapper.cc | 2 +- .../src/{ => runtime}/schema_tensor_wrapper.h | 0 .../src/{ => runtime}/sub_graph_kernel.cc | 4 +- .../lite/src/{ => runtime}/sub_graph_kernel.h | 6 +- .../lite/src/{ => runtime}/sub_graph_split.cc | 8 +- .../lite/src/{ => runtime}/sub_graph_split.h | 10 +- .../lite/src/{ => runtime}/tensor_category.cc | 2 +- .../lite/src/{ => runtime}/tensor_category.h | 0 .../src/{ => runtime}/thread_cost_model.cc | 4 +- .../src/{ => runtime}/thread_cost_model.h | 0 .../lite/src/{ => runtime}/weight_decoder.cc | 4 +- .../lite/src/{ => runtime}/weight_decoder.h | 4 +- mindspore/lite/src/tensor.h | 2 +- mindspore/lite/src/train/loss_kernel.h | 2 +- mindspore/lite/src/train/optimizer_kernel.h | 2 +- mindspore/lite/src/train/train_export.cc | 2 +- mindspore/lite/src/train/train_export.h | 4 +- .../src/train/train_populate_parameter.cc | 4 +- mindspore/lite/src/train/train_session.cc | 6 +- mindspore/lite/src/train/train_session.h | 2 +- mindspore/lite/src/train/train_utils.cc | 2 +- mindspore/lite/src/train/train_utils.h | 2 +- mindspore/lite/src/train/transfer_session.cc | 2 +- mindspore/lite/src/train/transfer_session.h | 2 +- mindspore/lite/test/CMakeLists.txt | 4 +- mindspore/lite/test/common/common_test.h | 2 +- mindspore/lite/test/st/graph_test.cc | 4 +- .../test/st/mindrt_parallel_runtime_test.cc | 6 +- .../lite/test/st/mindrt_parallel_test.cc | 6 +- mindspore/lite/test/st/mix_data_type_test.cc | 6 +- .../lite/test/st/multiple_device_test.cc | 8 +- .../lite/test/st/optimize_allocator_test.cc | 4 +- mindspore/lite/test/st/sub_graph_test.cc | 2 +- mindspore/lite/test/ut/src/graph_test.cc | 2 +- mindspore/lite/test/ut/src/infer_test.cc | 2 +- .../lite/test/ut/src/lite_mindrt_test.cc | 2 +- .../src/registry/registry_custom_op_test.cc | 2 +- .../registry/registry_gpu_custom_op_test.cc | 2 +- .../test/ut/src/registry/registry_test.cc | 2 +- .../kernel/arm/common/strided_slice_tests.cc | 2 +- .../kernel/arm/fp16/reduce_fp16_tests.cc | 2 +- .../arm/fp32-sparsity/matmul_fp32_tests.cc | 2 +- .../kernel/arm/fp32/activation_fp32_test.cc | 4 +- .../kernel/arm/fp32/batchnorm_fp32_tests.cc | 4 +- .../arm/fp32/constant_of_shape_fp32_test.cc | 4 +- .../fp32/convolution_depthwise_fp32_tests.cc | 2 +- .../runtime/kernel/arm/fp32/crop_fp32_test.cc | 2 +- .../runtime/kernel/arm/fp32/cumsum_tests.cc | 2 +- .../arm/fp32/deconvolution_fp32_tests.cc | 2 +- .../arm/fp32/detection_post_process_test.cc | 4 +- .../arm/fp32/embedding_lookup_fp32_test.cc | 2 +- .../arm/fp32/fullconnection_fp32_tests.cc | 4 +- .../kernel/arm/fp32/l2norm_fp32_test.cc | 4 +- .../kernel/arm/fp32/logicalor_fp32_test.cc | 4 +- .../arm/fp32/lsh_projection_fp32_tests.cc | 4 +- .../kernel/arm/fp32/lstm_fp32_tests.cc | 2 +- .../kernel/arm/fp32/matmul_fp32_tests.cc | 6 +- .../kernel/arm/fp32/nllloss_fp32_test.cc | 6 +- .../fp32/non_max_suppression_fp32_tests.cc | 4 +- .../kernel/arm/fp32/one_hot_fp32_test.cc | 4 +- .../runtime/kernel/arm/fp32/pad_fp32_test.cc | 4 +- .../kernel/arm/fp32/power_fp32_tests.cc | 6 +- .../arm/fp32/ragged_range_fp32_tests.cc | 4 +- .../kernel/arm/fp32/reduce_fp32_tests.cc | 2 +- .../arm/fp32/resize_bilinear_fp32_tests.cc | 4 +- .../resize_nearest_neighbor_fp32_tests.cc | 2 +- .../arm/fp32/reverse_sequence_fp32_tests.cc | 2 +- .../kernel/arm/fp32/roi_pooling_fp32_tests.cc | 4 +- .../kernel/arm/fp32/scale_fp32_tests.cc | 4 +- .../kernel/arm/fp32/scatter_nd_fp32_tests.cc | 2 +- .../runtime/kernel/arm/fp32/skip_gram_fp32.cc | 2 +- .../runtime/kernel/arm/fp32/softmax_tests.cc | 2 +- .../arm/fp32/space_to_batch_fp32_tests.cc | 4 +- .../arm/fp32/space_to_depth_fp32_tests.cc | 4 +- .../arm/fp32/sparse_to_dense_fp32_tests.cc | 4 +- .../arm/fp32/strided_slice_fp32_tests.cc | 4 +- .../kernel/arm/fp32/tile_fp32_tests.cc | 2 +- .../kernel/arm/fp32/topk_fp32_tests.cc | 2 +- .../kernel/arm/fp32/transpose_fp32_tests.cc | 4 +- .../kernel/arm/fp32/uniform_real_fp32_test.cc | 2 +- .../kernel/arm/fp32/unique_fp32_tests.cc | 2 +- .../kernel/arm/fp32/unstack_fp32_tests.cc | 2 +- .../fp32_grad/activation_grad_fp32_tests.cc | 4 +- .../fp32_grad/arithmetic_grad_fp32_tests.cc | 2 +- .../arm/fp32_grad/bias_grad_fp32_tests.cc | 2 +- .../kernel/arm/fp32_grad/bn_grad_fp32_test.cc | 2 +- .../fp32_grad/convolution_grad_fp32_tests.cc | 2 +- .../deconvolution_grad_fp32_tests.cc | 2 +- .../kernel/arm/fp32_grad/network_test.cc | 2 +- .../arm/fp32_grad/nllloss_grad_fp32_test.cc | 6 +- .../arm/fp32_grad/pooling_grad_fp32_tests.cc | 2 +- .../softmax_crossentropy_fp32_tests.cc | 2 +- .../arm/fp32_grad/softmax_grad_fp32_tests.cc | 2 +- .../runtime/kernel/arm/int8/add_int8_tests.cc | 2 +- .../arm/int8/arithmetic_self_int8_tests.cc | 4 +- .../kernel/arm/int8/batchnorm_int8_test.cc | 4 +- .../kernel/arm/int8/concat_int8_tests.cc | 4 +- .../kernel/arm/int8/conv_1x1_int8_tests.cc | 4 +- .../kernel/arm/int8/crop_int8_tests.cc | 4 +- .../kernel/arm/int8/deconv_int8_tests.cc | 2 +- .../arm/int8/fullconnection_int8_tests.cc | 4 +- .../kernel/arm/int8/gatherNd_int8_test.cc | 4 +- .../kernel/arm/int8/gather_int8_test.cc | 4 +- .../kernel/arm/int8/hswish_int8_tests.cc | 2 +- .../kernel/arm/int8/l2_norm_int8_tests.cc | 2 +- .../kernel/arm/int8/matmul_int8_tests.cc | 4 +- .../runtime/kernel/arm/int8/mul_int8_tests.cc | 4 +- .../runtime/kernel/arm/int8/pad_int8_tests.cc | 2 +- .../kernel/arm/int8/power_int8_tests.cc | 2 +- .../kernel/arm/int8/prelu_int8_tests.cc | 4 +- .../kernel/arm/int8/quant_dtype_cast_tests.cc | 4 +- .../kernel/arm/int8/reduce_int8_tests.cc | 2 +- .../kernel/arm/int8/relux_int8_tests.cc | 2 +- .../kernel/arm/int8/reshape_int8_tests.cc | 4 +- .../arm/int8/resize_bilinear_int8_tests.cc | 2 +- .../resize_nearest_neighbor_int8_tests.cc | 2 +- .../src/runtime/kernel/arm/int8/scale_int8.cc | 2 +- .../kernel/arm/int8/sigmoid_int8_tests.cc | 2 +- .../kernel/arm/int8/slice_int8_tests.cc | 2 +- .../kernel/arm/int8/softmax_int8_tests.cc | 2 +- .../arm/int8/space_to_batch_int8_tests.cc | 2 +- .../kernel/arm/int8/split_int8_tests.cc | 4 +- .../kernel/arm/int8/squeeze_int8_tests.cc | 4 +- .../runtime/kernel/arm/int8/sub_int_tests.cc | 2 +- .../kernel/arm/int8/topk_int8_tests.cc | 2 +- .../kernel/arm/int8/unsqueeze_int8_tests.cc | 4 +- .../runtime/kernel/arm/string/normalize.cc | 2 +- .../runtime/kernel/cuda/batchtospace_tests.cc | 4 +- .../ut/src/runtime/kernel/opencl/common.cc | 2 +- .../ut/src/runtime/kernel/opencl/common.h | 2 +- .../test/ut/src/runtime/runtime_pass_tests.cc | 4 +- mindspore/lite/test/ut/src/scheduler_test.cc | 2 +- mindspore/lite/test/ut/src/utils_test.cc | 4 +- .../fusion/activation_fusion_test.cc | 2 +- .../fusion/add_concat_act_fusion_test.cc | 2 +- .../fusion/constant_folding_fusion_test.cc | 2 +- .../fusion/conv_activation_fusion_test.cc | 2 +- .../fusion/conv_biasadd_fusion_test.cc | 2 +- .../optimizer/fusion/conv_bn_fusion_test.cc | 2 +- .../fusion/conv_scale_fusion_test.cc | 2 +- .../fusion/matmul_mul_fusion_test.cc | 2 +- .../fusion/trans_matmul_fusion_test.cc | 2 +- mindspore/lite/tools/common/node_util.cc | 2 +- mindspore/lite/tools/converter/CMakeLists.txt | 80 ++++++------ .../adapter/acl/src/acl_model_process.cc | 2 +- mindspore/lite/tools/converter/converter.cc | 4 +- .../lite/tools/converter/export_model.cc | 2 +- .../tools/converter/import/cast_op_adjust.cc | 2 +- .../legacy_optimizer/graph/infershape_pass.cc | 2 +- .../lite/tools/converter/micro/coder/graph.cc | 2 +- .../coder/opcoders/base/conv2d_base_coder.cc | 3 +- .../nnacl/fp32/conv2d_delegate_fp32_coder.cc | 2 +- .../opcoders/nnacl/fp32/resize_fp32_coder.h | 2 +- .../nnacl/int8/activation_int8_coder.cc | 2 +- .../opcoders/nnacl/int8/conv2d_int8_coder.cc | 2 +- .../converter/micro/coder/opcoders/op_coder.h | 2 +- .../micro/coder/opcoders/op_coder_builder.cc | 2 +- .../micro/coder/opcoders/op_coder_register.h | 2 +- .../tools/converter/micro/coder/session.cc | 6 +- .../converter/parser/lstm_adjust_pass.cc | 2 +- .../tools/converter/quantizer/cle_strategy.cc | 2 +- .../converter/quantizer/debug_info_manager.cc | 3 +- .../tools/converter/quantizer/fse_decoder.h | 2 +- .../quantizer/full_quant_quantizer.cc | 2 +- .../converter/quantizer/huffman_encode.cc | 2 +- .../quant_helper/quant_node_helper.cc | 4 +- .../quantizer/quantization_optimizer.cc | 4 +- .../converter/quantizer/quantize_util.cc | 2 +- .../tools/converter/quantizer/quantize_util.h | 2 +- .../converter/quantizer/weight_quantizer.h | 2 +- .../tools/converter/registry/CMakeLists.txt | 12 +- .../tools/cropper/build_cropper_config.sh | 34 ++--- .../tools/graph_kernel/runtime/akg_kernel.cc | 3 +- .../tools/graph_kernel/runtime/akg_kernel.h | 2 +- .../CMakeLists.txt | 6 +- .../anf_exporter.cc | 11 +- .../anf_exporter.h | 2 +- .../fetch_content.cc | 6 +- .../fetch_content.h | 0 .../CMakeLists.txt | 0 .../mindir_serializer.cc | 2 +- .../mindir_serializer.h | 0 .../tools/optimizer/common/format_utils.cc | 2 +- .../tools/optimizer/const_fold/fold_utils.cc | 10 +- .../tools/optimizer/const_fold/fold_utils.h | 2 +- .../optimizer/fusion/conv_biasadd_fusion.cc | 2 +- .../optimizer/fusion/groupnorm_fusion.cc | 2 +- .../tools/optimizer/fusion/mul_add_fusion.cc | 2 +- .../tools/optimizer/fusion/norm_fusion.cc | 2 +- .../optimizer/fusion/tensor_dot_fusion.cc | 2 +- .../optimizer/graph/lite_tensor_extractor.h | 2 +- .../tools/optimizer/graph/node_infershape.cc | 4 +- .../tools/optimizer/graph/node_infershape.h | 2 +- .../graph/redundant_op_remove_pass.cc | 2 +- .../graph/redundant_op_remove_pass.h | 2 +- .../optimizer/graph/transpose_strategy.cc | 2 +- .../lite/tools/schema_gen/CMakeLists.txt | 2 +- mindspore/lite/tools/schema_gen/schema_gen.cc | 2 +- 1295 files changed, 1815 insertions(+), 1814 deletions(-) rename mindspore/lite/src/{ => common}/ops/CMakeLists.txt (100%) rename mindspore/lite/src/{ => common}/ops/anf_utils.cc (97%) rename mindspore/lite/src/{ => common}/ops/anf_utils.h (96%) rename mindspore/lite/src/{ => common}/ops/ops_def.cc (99%) rename mindspore/lite/src/{ => common}/ops/ops_def.h (98%) rename mindspore/lite/src/{ => common}/ops/ops_func_declare.h (100%) rename mindspore/lite/src/{ => common}/ops/ops_utils.cc (99%) rename mindspore/lite/src/{ => common}/ops/ops_utils.h (98%) rename mindspore/lite/src/{ => common}/ops/populate/activation_grad_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/activation_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/adam_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/add_populate.cc (92%) rename mindspore/lite/src/{ => common}/ops/populate/adder_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/affine_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/all_gather.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/argmax_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/argmin_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/arithmetic_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/arithmetic_populate.h (100%) rename mindspore/lite/src/{ => common}/ops/populate/arithmetic_self_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/assert_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/assign_add_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/assign_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/audio_spectrogram_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/batch_norm_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/batch_to_space_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/bias_add_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/binary_cross_entropy_grad_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/binary_cross_entropy_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/broadcast_to_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/call_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/cast_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/clip_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/common_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/concat_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/constant_of_shape_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/control/switch_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/control/tensor_array_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/control/tensorlistfromtensor_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/control/tensorlistgetitem_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/control/tensorlistreserve_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/control/tensorlistsetlitem_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/control/tensorliststack_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/conv2d_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/crop_and_resize_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/crop_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/cumsum_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/custom_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/deconv2d_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/default_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/default_populate.h (100%) rename mindspore/lite/src/{ => common}/ops/populate/depth_to_space_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/detection_post_process_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/div_populate.cc (90%) rename mindspore/lite/src/{ => common}/ops/populate/dynamic_quant_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/eltwise_populate.cc (92%) rename mindspore/lite/src/{ => common}/ops/populate/embedding_lookup_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/erf_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/exp_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/expand_dims_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/fill_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/flatten_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/full_connection_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/fused_batchnorm_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/gather_d_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/gather_nd_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/gather_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/glu_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/group_norm_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/gru_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/instance_norm_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/invert_permutation_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/isfinite_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/l2_norm_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/layer_norm_grad_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/layer_norm_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/lin_space_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/local_response_normalization_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/log_softmax_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/lstm_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/matmul_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/mfcc_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/mul_populate.cc (92%) rename mindspore/lite/src/{ => common}/ops/populate/nllloss_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/non_max_suppression_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/nonzero_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/one_hot_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/oneslike_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/p_relu_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/pad_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/partial_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/pooling_populate.cc (99%) rename mindspore/lite/src/{ => common}/ops/populate/populate_register.cc (93%) rename mindspore/lite/src/{ => common}/ops/populate/populate_register.h (100%) rename mindspore/lite/src/{ => common}/ops/populate/power_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/prior_box_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/quant_dtype_cast_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/ragged_range_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/random_normal_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/random_standard_normal_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/range_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/rank_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/reduce_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/reduce_scatter.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/reshape_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/resize_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/reverse_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/reverse_sequence_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/roi_pooling_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/scale_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/scatter_nd_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/scatter_nd_update_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/select_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/shape_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/size_populate.cc (88%) rename mindspore/lite/src/{ => common}/ops/populate/slice_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/softmax_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/space_to_batch_nd_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/space_to_batch_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/space_to_depth_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/sparse_softmax_cross_entropy_with_logits.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/sparse_to_dense_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/splice_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/split_populate.cc (98%) rename mindspore/lite/src/{ => common}/ops/populate/split_with_overlap_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/squeeze_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/stack_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/strided_slice_grad_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/strided_slice_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/strided_slice_populate.h (94%) rename mindspore/lite/src/{ => common}/ops/populate/string/custom_extract_features_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/string/custom_normalize_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/string/custom_predict_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/string/hashtable_lookup_populate.cc (95%) rename mindspore/lite/src/{ => common}/ops/populate/string/lsh_projection_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/string/skip_gram_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/sub_populate.cc (92%) rename mindspore/lite/src/{ => common}/ops/populate/tile_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/topk_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/transpose_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/uniform_real_populate.cc (93%) rename mindspore/lite/src/{ => common}/ops/populate/unique_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/unsorted_segment_sum_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/unsqueeze_populate.cc (97%) rename mindspore/lite/src/{ => common}/ops/populate/unstack_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/populate/where_populate.cc (96%) rename mindspore/lite/src/{ => common}/ops/schema_register.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/cache_algorithm.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/cache_mem_base.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/embedding_cache.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/embedding_cache.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/embedding_cache_manager.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/embedding_cache_manager.h (90%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/factory_mgr_base.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/gpu/gpu_cache_mem.cc (96%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/gpu/gpu_cache_mem.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/lfu_cache.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/lfu_cache.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/load_host_cache_model.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/parameter_cache/load_host_cache_model.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/CMakeLists.txt (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/activation.cu (93%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/activation.cuh (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cast.cu (94%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cast.cuh (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cublas_utils.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cublas_utils.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cuda_helper.cc (94%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cuda_helper.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cudnn_utils.cc (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/cudnn_utils.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/equal.cu (91%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/equal.cuh (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/hash.cu (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/cuda_impl/hash.cuh (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_base.cc (90%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_base.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_base_impl.cc (87%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_collective.cc (94%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_collective.h (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_collective_impl.cc (92%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_utils.cc (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/distribution/distribution_utils.h (100%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/activation_opt_plugin.cc (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/activation_opt_plugin.h (94%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/activation_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/activation_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/allgather_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/allgather_tensorrt.h (93%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/cast_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/cast_tensorrt.h (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/concate_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/concate_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/convolution_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/convolution_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/deconvolution_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/deconvolution_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/elementwise_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/elementwise_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/equal_tensorrt.cc (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/equal_tensorrt.h (93%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/fullyconnected_tensorrt.cc (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/fullyconnected_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/gather_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/gather_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/lstm_tensorrt.cc (99%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/lstm_tensorrt.h (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/matmul_opt_plugin.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/matmul_opt_plugin.h (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/matmul_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/matmul_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/normalize_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/normalize_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/pad_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/pad_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/pool_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/pool_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/reduce_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/reduce_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/reducescatter_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/reducescatter_tensorrt.h (93%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/resize_tensorrt.cc (99%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/resize_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/scale_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/scale_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/shape_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/shape_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/shuffle_tensorrt.cc (99%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/shuffle_tensorrt.h (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/slice_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/slice_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/softmax_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/softmax_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/split_tensorrt.cc (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/split_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/tensorrt_op.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/tensorrt_op.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/tensorrt_plugin.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/tensorrt_plugin.h (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/topk_tensorrt.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/topk_tensorrt.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/unary_tensorrt.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/op/unary_tensorrt.h (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_allocator.cc (97%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_allocator.h (96%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_delegate.cc (98%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_delegate.h (94%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_runtime.cc (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_runtime.h (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_serializer.cc (94%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_serializer.h (92%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_subgraph.cc (99%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_subgraph.h (95%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_utils.cc (99%) rename mindspore/lite/src/{ => extendrt}/delegate/tensorrt/tensorrt_utils.h (97%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/CMakeLists.txt (100%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/acl_env_guard.cc (97%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/acl_env_guard.h (100%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/acl_model_options.h (100%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/acl_options_parser.cc (97%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/acl_options_parser.h (95%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/custom_interface.cc (98%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/custom_interface.h (100%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/custom_kernel.cc (98%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/custom_kernel.h (94%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/model_infer.cc (98%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/model_infer.h (91%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/model_process.cc (99%) rename mindspore/lite/src/{runtime => extendrt}/kernel/ascend/src/model_process.h (98%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/CMakeLists.txt (100%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/batchtospace.cc (97%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/batchtospace.h (96%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/cuda_kernel.cc (98%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/cuda_kernel.h (96%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/unary.cc (96%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/unary.h (96%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/unique.cc (97%) rename mindspore/lite/src/{runtime => extendrt}/kernel/cuda/unique.h (96%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/abstract_base_model.h (97%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/abstract_kernel.h (100%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/abstract_tensor.h (100%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/inner_kernel.cc (98%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/inner_kernel.h (97%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/kernel_mod_util.cc (96%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/kernel_mod_util.h (95%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/less_test_kernel_mod.cc (95%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/less_test_kernel_mod.h (100%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model.cc (96%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model.h (96%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model_convertor.cc (85%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model_convertor.h (91%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model_loader.cc (98%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model_loader.h (95%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model_util.cc (99%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/mindir_model/mindir_model_util.h (100%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/model_loader.cc (97%) rename mindspore/lite/src/{model_loader => extendrt/mindir_loader}/model_loader.h (97%) rename mindspore/lite/src/{ => runtime}/c_api/context_c.cc (99%) rename mindspore/lite/src/{ => runtime}/c_api/context_c.h (100%) rename mindspore/lite/src/{ => runtime}/c_api/model_c.cc (99%) rename mindspore/lite/src/{ => runtime}/c_api/tensor_c.cc (99%) rename mindspore/lite/src/{ => runtime}/cpu_info.cc (99%) rename mindspore/lite/src/{ => runtime}/cpu_info.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/callback/callback_adapter.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/callback/callback_impl.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/callback/ckpt_saver.cc (96%) rename mindspore/lite/src/{ => runtime}/cxx_api/callback/loss_monitor.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/callback/lr_scheduler.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/callback/train_accuracy.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/cell.cc (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/context.cc (99%) rename mindspore/lite/src/{ => runtime}/cxx_api/context.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/converters.cc (99%) rename mindspore/lite/src/{ => runtime}/cxx_api/converters.h (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/expression/net.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/expression/net_impl.cc (98%) rename mindspore/lite/src/{ => runtime}/cxx_api/expression/net_impl.h (96%) rename mindspore/lite/src/{ => runtime}/cxx_api/expression/node_impl.cc (96%) rename mindspore/lite/src/{ => runtime}/cxx_api/expression/node_impl.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/graph/graph.cc (93%) rename mindspore/lite/src/{ => runtime}/cxx_api/graph/graph_data.h (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/graph/net_data.cc (87%) rename mindspore/lite/src/{ => runtime}/cxx_api/graph/net_data.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/kernel.cc (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/kernel_executor/CMakeLists.txt (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/kernel_executor/kernel_executor.cc (93%) rename mindspore/lite/src/{ => runtime}/cxx_api/kernel_executor/kernel_executor.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/kernel_executor/kernel_executor_impl.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/kernel_executor/kernel_executor_impl.h (95%) rename mindspore/lite/src/{ => runtime}/cxx_api/metrics/accuracy.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/metrics/metrics_adapter.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/metrics/metrics_impl.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/model/model.cc (98%) rename mindspore/lite/src/{ => runtime}/cxx_api/model/model_impl.cc (98%) rename mindspore/lite/src/{ => runtime}/cxx_api/model/model_impl.h (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/model_parallel_runner.cc (95%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/model_pool.cc (99%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/model_pool.h (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/model_worker.cc (99%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/model_worker.h (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/predict_task_queue.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/predict_task_queue.h (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/model_pool/runner_config.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/serialization.cc (96%) rename mindspore/lite/src/{ => runtime}/cxx_api/tensor/tensor_impl.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/tensor/tensor_impl.h (100%) rename mindspore/lite/src/{ => runtime}/cxx_api/tensor_utils.cc (98%) rename mindspore/lite/src/{ => runtime}/cxx_api/tensor_utils.h (96%) rename mindspore/lite/src/{ => runtime}/cxx_api/train/converters.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/train/model.cc (97%) rename mindspore/lite/src/{ => runtime}/cxx_api/train/model_build.cc (98%) rename mindspore/lite/src/{ => runtime}/cxx_api/train/model_build_impl.cc (93%) rename mindspore/lite/src/{ => runtime}/cxx_api/train/model_impl.cc (90%) rename mindspore/lite/src/{ => runtime}/cxx_api/train/train_support.cc (84%) rename mindspore/lite/src/{ => runtime}/cxx_api/types.cc (99%) rename mindspore/lite/src/{ => runtime}/delegate/auto_registration_factory.h (100%) rename mindspore/lite/src/{ => runtime}/delegate/delegate_utils.cc (94%) rename mindspore/lite/src/{ => runtime}/delegate/delegate_utils.h (100%) rename mindspore/lite/src/{ => runtime}/delegate/npu/CMakeLists.txt (100%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_converter_utils.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_converter_utils.h (100%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_delegate.cc (84%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_delegate.h (91%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_executor.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_executor.h (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_graph.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_graph.h (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_manager.cc (99%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_manager.h (100%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_subgraph.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/npu_subgraph.h (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/abs_npu.cc (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/abs_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/activation_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/activation_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/argmax_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/argmax_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/arithmetic_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/arithmetic_npu.h (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/arithmetic_self_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/arithmetic_self_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/avg_pooling_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/avg_pooling_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/batchnorm_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/batchnorm_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/cast_npu.cc (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/cast_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/concat_npu.cc (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/concat_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_base_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_base_npu.h (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_depthwise_int8_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_depthwise_int8_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_depthwise_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_depthwise_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_int8_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_int8_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/convolution_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/crop_and_resize_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/crop_and_resize_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/deconvolution_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/deconvolution_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/eltwise_npu.cc (94%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/eltwise_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/expand_dims_npu.cc (93%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/expand_dims_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/flatten_npu.cc (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/flatten_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/fullconnection_int8_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/fullconnection_int8_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/fullconnection_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/fullconnection_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/gather_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/gather_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/instance_norm_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/instance_norm_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/matmul_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/matmul_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/max_pooling_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/max_pooling_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/npu_op.h (100%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/pad_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/pad_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/reduce_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/reduce_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/reshape_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/reshape_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/resize_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/resize_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/scale_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/scale_npu.h (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/slice_npu.cc (93%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/slice_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/softmax_npu.cc (94%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/softmax_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/split_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/split_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/squeeze_npu.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/squeeze_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/strided_slice_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/strided_slice_npu.h (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/tile_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/tile_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/transpose_npu.cc (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/transpose_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/unsqueeze_npu.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/op/unsqueeze_npu.h (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_base_pass.h (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_fusion_pass.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_fusion_pass.h (92%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_insert_transform_pass.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_insert_transform_pass.h (94%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_pass_manager.cc (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_pass_manager.h (95%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_pass_utils.cc (97%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_pass_utils.h (96%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_transform_pass.cc (98%) rename mindspore/lite/src/{ => runtime}/delegate/npu/pass/npu_transform_pass.h (92%) rename mindspore/lite/src/{ => runtime}/delegate/npu/transpose_kernel.cc (94%) rename mindspore/lite/src/{ => runtime}/delegate/npu/transpose_kernel.h (100%) rename mindspore/lite/src/{ => runtime}/executor.cc (97%) rename mindspore/lite/src/{ => runtime}/executor.h (97%) rename mindspore/lite/src/{ => runtime}/huffman_decode.cc (99%) rename mindspore/lite/src/{ => runtime}/huffman_decode.h (100%) rename mindspore/lite/src/{ => runtime}/inner_context.cc (99%) rename mindspore/lite/src/{ => runtime}/inner_context.h (98%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_allocator.cc (99%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_allocator.h (100%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_executor.cc (98%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_executor.h (95%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_runtime.cc (99%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_runtime.h (98%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_runtime_wrapper.cc (98%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_wrapper.cc (99%) rename mindspore/lite/src/runtime/{ => kernel}/gpu/opencl/opencl_wrapper.h (100%) rename mindspore/lite/src/{ => runtime}/kernel_exec.cc (98%) rename mindspore/lite/src/{ => runtime}/kernel_exec.h (98%) rename mindspore/lite/src/{ => runtime}/kernel_exec_util.cc (99%) rename mindspore/lite/src/{ => runtime}/kernel_exec_util.h (96%) rename mindspore/lite/src/{ => runtime}/kernel_registry.cc (99%) rename mindspore/lite/src/{ => runtime}/kernel_registry.h (99%) rename mindspore/lite/src/{ => runtime}/lite_kernel.cc (99%) rename mindspore/lite/src/{ => runtime}/lite_kernel.h (97%) rename mindspore/lite/src/{ => runtime}/lite_mindrt.cc (99%) rename mindspore/lite/src/{ => runtime}/lite_mindrt.h (97%) rename mindspore/lite/src/{ => runtime}/lite_model.cc (99%) rename mindspore/lite/src/{ => runtime}/lite_model.h (99%) rename mindspore/lite/src/{ => runtime}/lite_session.cc (99%) rename mindspore/lite/src/{ => runtime}/lite_session.h (97%) rename mindspore/lite/src/{ => runtime}/mindrt_executor.cc (98%) rename mindspore/lite/src/{ => runtime}/mindrt_executor.h (96%) rename mindspore/lite/src/{ => runtime}/ms_tensor.cc (100%) rename mindspore/lite/src/{ => runtime}/pack_weight.cc (99%) rename mindspore/lite/src/{ => runtime}/pack_weight.h (98%) rename mindspore/lite/src/{ => runtime}/pack_weight_manager.cc (98%) rename mindspore/lite/src/{ => runtime}/pack_weight_manager.h (97%) rename mindspore/lite/src/{ => runtime}/parallel_config.h (100%) rename mindspore/lite/src/{ => runtime}/scheduler.cc (99%) rename mindspore/lite/src/{ => runtime}/scheduler.h (98%) rename mindspore/lite/src/{ => runtime}/scheduler_cb.h (100%) rename mindspore/lite/src/{ => runtime}/schema_tensor_wrapper.cc (97%) rename mindspore/lite/src/{ => runtime}/schema_tensor_wrapper.h (100%) rename mindspore/lite/src/{ => runtime}/sub_graph_kernel.cc (99%) rename mindspore/lite/src/{ => runtime}/sub_graph_kernel.h (98%) rename mindspore/lite/src/{ => runtime}/sub_graph_split.cc (99%) rename mindspore/lite/src/{ => runtime}/sub_graph_split.h (97%) rename mindspore/lite/src/{ => runtime}/tensor_category.cc (97%) rename mindspore/lite/src/{ => runtime}/tensor_category.h (100%) rename mindspore/lite/src/{ => runtime}/thread_cost_model.cc (98%) rename mindspore/lite/src/{ => runtime}/thread_cost_model.h (100%) rename mindspore/lite/src/{ => runtime}/weight_decoder.cc (99%) rename mindspore/lite/src/{ => runtime}/weight_decoder.h (99%) rename mindspore/lite/tools/{anf_exporter => lite_exporter}/CMakeLists.txt (66%) rename mindspore/lite/tools/{anf_exporter => lite_exporter}/anf_exporter.cc (99%) rename mindspore/lite/tools/{anf_exporter => lite_exporter}/anf_exporter.h (99%) rename mindspore/lite/tools/{anf_exporter => lite_exporter}/fetch_content.cc (99%) rename mindspore/lite/tools/{anf_exporter => lite_exporter}/fetch_content.h (100%) rename mindspore/lite/tools/{mindir_serializer => mindir_exporter}/CMakeLists.txt (100%) rename mindspore/lite/tools/{mindir_serializer => mindir_exporter}/mindir_serializer.cc (99%) rename mindspore/lite/tools/{mindir_serializer => mindir_exporter}/mindir_serializer.h (100%) diff --git a/.jenkins/check/config/filter_cppcheck.txt b/.jenkins/check/config/filter_cppcheck.txt index 7b1c0cb230a..77c5f5335ff 100644 --- a/.jenkins/check/config/filter_cppcheck.txt +++ b/.jenkins/check/config/filter_cppcheck.txt @@ -42,7 +42,7 @@ "mindspore/mindspore/core/mindrt/src/thread/" "useStlAlgorithm" "mindspore/mindspore/lite/test/" "syntaxError" "mindspore/mindspore/lite/test/ut/tools/converter/registry/pass_registry_test.cc" "unknownMacro" -"mindspore/mindspore/lite/src/ops/unsqueeze.cc" "useStlAlgorithm" +"mindspore/mindspore/lite/src/common/ops/unsqueeze.cc" "useStlAlgorithm" "mindspore/mindspore/lite/tools/common/flag_parser.cc" "useStlAlgorithm" "mindspore/mindspore/lite/tools/common/tensor_util.cc" "useStlAlgorithm" "mindspore/mindspore/lite/tools/converter/parser/onnx/onnx_relu_parser.cc" "useStlAlgorithm" diff --git a/.jenkins/check/config/filter_cpplint.txt b/.jenkins/check/config/filter_cpplint.txt index 34b8c4d2cbe..1c341f3a188 100644 --- a/.jenkins/check/config/filter_cpplint.txt +++ b/.jenkins/check/config/filter_cpplint.txt @@ -60,7 +60,7 @@ "mindspore/mindspore/lite/src/runtime/thread_pool.c" "readability/casting" "mindspore/mindspore/lite/src/runtime/thread_pool.c" "runtime/arrays" "mindspore/mindspore/lite/src/runtime/thread_pool.c" "runtime/int" -"mindspore/mindspore/lite/src/ops/ops_def.cc" "runtime/int" +"mindspore/mindspore/lite/src/common/ops/ops_def.cc" "runtime/int" "mindspore/mindspore/lite/examples/runtime_gpu_extend/src/cl" "legal/copyright" "mindspore/mindspore/lite/examples/runtime_gpu_extend/src/cl" "readability/casting" "mindspore/mindspore/lite/examples/runtime_gpu_extend/src/cl" "readability/fn_size" diff --git a/.jenkins/check/config/whitelizard.txt b/.jenkins/check/config/whitelizard.txt index e9c10d91a26..2c6121398c6 100644 --- a/.jenkins/check/config/whitelizard.txt +++ b/.jenkins/check/config/whitelizard.txt @@ -4,7 +4,7 @@ # file_path:function_name1, function_name2 # mindspore/mindspore/core/mindrt/src/thread/actor_threadpool.cc:mindspore::ActorWorker::RunWithSpin -mindspore/mindspore/lite/src/ops/primitive_c.cc:mindspore::lite::PrimitiveC::Create +mindspore/mindspore/lite/src/common/ops/primitive_c.cc:mindspore::lite::PrimitiveC::Create mindspore/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc:mindspore::dataset::CsvOp::CsvParser::InitCsvParser mindspore/mindspore/lite/tools/converter/graphdef_transform.cc:mindspore::lite::GraphDefTransform::Transform mindspore/mindspore/lite/providers/nnie_proposal/src/proposal.cc:mindspore::proposal::Rpn @@ -23,15 +23,11 @@ mindspore/mindspore/python/mindspore/context.py:set_auto_parallel_context mindspore/mindspore/python/mindspore/common/tensor.py:__init__ mindspore/mindspore/python/mindspore/common/parameter.py:set_data mindspore/mindspore/ccsrc/pybind_api/ir/tensor_py.cc:mindspore::tensor::GetDataType -mindspore/mindspore/lite/nnacl/fp32/avg_pooling_fp32.c:AvgPooling mindspore/mindspore/lite/src/runtime/thread_pool.c:GetArch mindspore/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d.cc:mindspore::kernel::UseWinograd4x4To6x6 -mindspore/mindspore/lite/src/scheduler.cc:mindspore::lite::Scheduler::FindBackendKernel -mindspore/mindspore/lite/nnacl/infer/strided_slice_infer.c:StridedSliceInferShape -mindspore/mindspore/lite/nnacl/fp16/pack_fp16.c:PackNHWCToNCHWFp16 -mindspore/mindspore/lite/src/ios_reg_ops.cc:mindspore::lite::IosRegisterOps -mindspore/mindspore/lite/src/ios_reg_kernels.h:mindspore::kernel::IosRegisterKernels -mindspore/mindspore/lite/nnacl/infer/infer_register.c:RegisterInfer +mindspore/mindspore/lite/src/runtime/scheduler.cc:mindspore::lite::Scheduler::FindBackendKernel +mindspore/mindspore/lite/src/runtime/ios_reg_ops.cc:mindspore::lite::IosRegisterOps +mindspore/mindspore/lite/src/runtime/ios_reg_kernels.h:mindspore::kernel::IosRegisterKernels mindspore/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.cc:mindspore::kernel::QuantDTypeCastCPUKernel::QuantDTypeCast mindspore/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.cc:mindspore::kernel::QuantDTypeCastCPUKernel::Run mindspore/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc:mindspore::abstract::ConvertAbstractToPython diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index e0faa2ed11b..962cd946888 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -741,7 +741,7 @@ if(MSLITE_MINDDATA_IMPLEMENT STREQUAL "lite_cv") add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/minddata) endif() -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/ops) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/common/ops) if(ANDROID_NDK_TOOLCHAIN_INCLUDED) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/converter/micro/coder) endif() diff --git a/mindspore/lite/experimental/kernel/convolution_1x1.h b/mindspore/lite/experimental/kernel/convolution_1x1.h index b15fcc2ae49..5f5bfa57ba4 100644 --- a/mindspore/lite/experimental/kernel/convolution_1x1.h +++ b/mindspore/lite/experimental/kernel/convolution_1x1.h @@ -19,7 +19,7 @@ #include #include "nnacl/op_base.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/kernel.h" namespace mindspore::kernel::experimental { diff --git a/mindspore/lite/experimental/kernel/convolution_fp32.h b/mindspore/lite/experimental/kernel/convolution_fp32.h index 2125dd61f27..df3f4a7e146 100644 --- a/mindspore/lite/experimental/kernel/convolution_fp32.h +++ b/mindspore/lite/experimental/kernel/convolution_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_CONVOLUTION_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/experimental/src/tensor.h b/mindspore/lite/experimental/src/tensor.h index 8eacc113b9b..6885faa61e1 100644 --- a/mindspore/lite/experimental/src/tensor.h +++ b/mindspore/lite/experimental/src/tensor.h @@ -30,7 +30,7 @@ #include "src/common/log_adapter.h" #include "schema/model_generated.h" #include "src/common/utils.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "nnacl/tensor_c.h" namespace mindspore { diff --git a/mindspore/lite/minddata/CMakeLists.txt b/mindspore/lite/minddata/CMakeLists.txt index 29cf6d4ec42..d000d9f655b 100644 --- a/mindspore/lite/minddata/CMakeLists.txt +++ b/mindspore/lite/minddata/CMakeLists.txt @@ -108,12 +108,12 @@ if(MSLITE_MINDDATA_IMPLEMENT STREQUAL "full") include_directories("${TOP_DIR}") set(MINDDATA_FULL_SRC - ${TOP_DIR}/mindspore/lite/src/cxx_api/types.cc - ${TOP_DIR}/mindspore/lite/src/cxx_api/tensor_utils.cc - ${TOP_DIR}/mindspore/lite/src/cxx_api/tensor/tensor_impl.cc + ${TOP_DIR}/mindspore/lite/src/runtime/cxx_api/types.cc + ${TOP_DIR}/mindspore/lite/src/runtime/cxx_api/tensor_utils.cc + ${TOP_DIR}/mindspore/lite/src/runtime/cxx_api/tensor/tensor_impl.cc ${TOP_DIR}/mindspore/lite/src/tensor.cc ${TOP_DIR}/mindspore/lite/src/common/utils.cc - ${TOP_DIR}/mindspore/lite/src/ms_tensor.cc + ${TOP_DIR}/mindspore/lite/src/runtime/ms_tensor.cc ${TOP_DIR}/mindspore/lite/src/common/string_util.cc ${TOP_DIR}/mindspore/lite/src/common/lite_utils.cc ${CORE_DIR}/utils/status.cc @@ -433,7 +433,7 @@ elseif(MSLITE_MINDDATA_IMPLEMENT STREQUAL "wrapper") set(MINDSPORE_LITE_CXXAPI_SRC ${CORE_DIR}/utils/status.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../src/cxx_api/types.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../src/runtime/cxx_api/types.cc ${CMAKE_CURRENT_SOURCE_DIR}/../src/tensor.cc ${CMAKE_CURRENT_SOURCE_DIR}/../src/common/utils.cc ) diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index 39e7de02854..08a233e4e98 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -60,23 +60,23 @@ elseif(NOT MSVC) endif() file(GLOB CXX_API_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/model/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/graph/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/tensor/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/model/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/graph/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/tensor/*.cc ) if(MSLITE_ENABLE_PARALLEL_INFERENCE) set(CXX_API_SRCS ${CXX_API_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/model_pool/predict_task_queue.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/model_pool/model_worker.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/model_pool/model_pool.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/model_pool/model_parallel_runner.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/model_pool/predict_task_queue.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/model_pool/model_worker.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/model_pool/model_pool.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/model_pool/model_parallel_runner.cc ) endif() file(GLOB C_API_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/c_api/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/c_api/*.cc ) set(API_SRC ${CXX_API_SRCS} ${C_API_SRCS}) if(NOT MSLITE_ENABLE_RUNTIME_CONVERT) @@ -85,10 +85,10 @@ if(NOT MSLITE_ENABLE_RUNTIME_CONVERT) endif() if(MSLITE_MINDDATA_IMPLEMENT STREQUAL "full") file(GLOB CXX_API_TRAIN_SRCS - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/train/model.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/train/model_impl.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/metrics/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/callback/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/train/model.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/train/model_impl.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/metrics/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/callback/*.cc ) set(API_TRAIN_SRC ${CXX_API_TRAIN_SRCS} @@ -118,31 +118,31 @@ set(LITE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/runtime/runtime_shape_fusion_pass.cc ${CMAKE_CURRENT_SOURCE_DIR}/runtime/runtime_pass.cc ${CMAKE_CURRENT_SOURCE_DIR}/runtime/pass/runtime_ncx_pass.cc - ${CMAKE_CURRENT_SOURCE_DIR}/schema_tensor_wrapper.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/schema_tensor_wrapper.cc ${CMAKE_CURRENT_SOURCE_DIR}/tensor.cc ${CMAKE_CURRENT_SOURCE_DIR}/tensorlist.cc - ${CMAKE_CURRENT_SOURCE_DIR}/tensor_category.cc - ${CMAKE_CURRENT_SOURCE_DIR}/ms_tensor.cc - ${CMAKE_CURRENT_SOURCE_DIR}/executor.cc - ${CMAKE_CURRENT_SOURCE_DIR}/inner_context.cc - ${CMAKE_CURRENT_SOURCE_DIR}/lite_model.cc - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_registry.cc - ${CMAKE_CURRENT_SOURCE_DIR}/lite_kernel.cc - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_exec.cc - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_exec_util.cc - ${CMAKE_CURRENT_SOURCE_DIR}/sub_graph_kernel.cc - ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.cc - ${CMAKE_CURRENT_SOURCE_DIR}/lite_session.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/tensor_category.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/ms_tensor.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/executor.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/inner_context.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/lite_model.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/kernel_registry.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/lite_kernel.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/kernel_exec.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/kernel_exec_util.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/sub_graph_kernel.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/scheduler.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/lite_session.cc ${CMAKE_CURRENT_SOURCE_DIR}/errorcode.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cpu_info.cc - ${CMAKE_CURRENT_SOURCE_DIR}/pack_weight_manager.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cpu_info.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/pack_weight_manager.cc ${CMAKE_CURRENT_SOURCE_DIR}/control_flow/control_flow_scheduler.cc ${CMAKE_CURRENT_SOURCE_DIR}/control_flow/control_subgraph_creator.cc ) set(MODEL_LOADER_FRAMEWORK_SRC ${MODEL_LOADER_FRAMEWORK_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/model_loader.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/model_loader.cc ) if(MSLITE_ENABLE_CLOUD_FUSION_INFERENCE) @@ -156,21 +156,21 @@ remove_definitions(-DBUILD_LITE_INFERENCE) set(MINDIR_MODEL_SRC ${MINDIR_MODEL_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/mindir_model.cc - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/mindir_model_util.cc - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/mindir_model_convertor.cc - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/mindir_model_loader.cc - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/kernel_mod_util.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/mindir_model.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/mindir_model_util.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/mindir_model_convertor.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/mindir_model_loader.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/kernel_mod_util.cc ) set(MINDIR_KERNEL_SRC ${MINDIR_KERNEL_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/inner_kernel.cc) + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/inner_kernel.cc) set(LITE_SRC ${LITE_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/less_test_kernel_mod.cc - ${CMAKE_CURRENT_SOURCE_DIR}/model_loader/mindir_model/kernel_mod_mock.cc) + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/less_test_kernel_mod.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/mindir_loader/mindir_model/kernel_mod_mock.cc) endif() set(LITE_SRC @@ -200,14 +200,14 @@ endif() if(MSLITE_ENABLE_SHARING_MODEL_WEIGHT) set(LITE_SRC ${LITE_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/pack_weight.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/pack_weight.cc ) endif() if(MSLITE_ENABLE_DYNAMIC_THREAD_DISTRIBUTE) set(LITE_SRC ${LITE_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/thread_cost_model.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/thread_cost_model.cc ) endif() @@ -239,9 +239,9 @@ if(MSLITE_ENABLE_RUNTIME_CONVERT) add_definitions(-DRUNTIME_CONVERT) add_definitions(-DPRIMITIVE_WRITEABLE) file(GLOB RUNTIME_CONVERT_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/ops/ops_def.cc - ${CMAKE_CURRENT_SOURCE_DIR}/ops/ops_utils.cc - ${CMAKE_CURRENT_SOURCE_DIR}/ops/anf_utils.cc + ${CMAKE_CURRENT_SOURCE_DIR}/common/ops/ops_def.cc + ${CMAKE_CURRENT_SOURCE_DIR}/common/ops/ops_utils.cc + ${CMAKE_CURRENT_SOURCE_DIR}/common/ops/anf_utils.cc ${CMAKE_CURRENT_SOURCE_DIR}/runtime/runtime_convert.cc) set(LITE_SRC ${LITE_SRC} ${RUNTIME_CONVERT_SRC}) @@ -268,7 +268,7 @@ endif() if(MSLITE_ENABLE_WEIGHT_DECODE) set(LITE_SRC ${LITE_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/huffman_decode.cc) + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/huffman_decode.cc) if(NOT MSLITE_ENABLE_RUNTIME_CONVERT) set(LITE_SRC ${LITE_SRC} ${TOOLS_DIR}/converter/quantizer/fse_decoder.cc @@ -279,7 +279,7 @@ endif() if(MSLITE_ENABLE_AUTO_PARALLEL) set(LITE_SRC ${LITE_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/sub_graph_split.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/sub_graph_split.cc ) endif() @@ -290,12 +290,12 @@ endif() set(LITE_SRC ${LITE_SRC} ${KERNEL_REG_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/weight_decoder.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/weight_decoder.cc ) if(MSLITE_GPU_BACKEND STREQUAL opencl) file(GLOB_RECURSE OPENCL_RUNTIME_SRC - ${CMAKE_CURRENT_SOURCE_DIR}/runtime/gpu/opencl/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/kernel/gpu/opencl/*.cc ) set(LITE_SRC ${LITE_SRC} @@ -321,7 +321,7 @@ endif() file(GLOB CXX_API_EXPRESSION - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/expression/*.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/expression/*.cc ) file(GLOB EXPRESSION_OPS @@ -347,10 +347,10 @@ set(TRAIN_SRC ${TRAIN_SRC_WITH_MD} ${EXPRESSION_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/common/quant_utils.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/train/model_build.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/train/model_build_impl.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/train/converters.cc - ${CMAKE_CURRENT_SOURCE_DIR}/cxx_api/train/train_support.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/train/model_build.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/train/model_build_impl.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/train/converters.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/cxx_api/train/train_support.cc ${CMAKE_CURRENT_SOURCE_DIR}/train/train_populate_parameter.cc ${CMAKE_CURRENT_SOURCE_DIR}/train/train_session.cc ${CMAKE_CURRENT_SOURCE_DIR}/train/graph_fusion.cc @@ -380,8 +380,8 @@ if(MSLITE_ENABLE_MINDRT) add_subdirectory(${CORE_DIR}/mindrt mindspore_mindrt) endif() set(LITE_SRC ${LITE_SRC} - ${CMAKE_CURRENT_SOURCE_DIR}/lite_mindrt.cc - ${CMAKE_CURRENT_SOURCE_DIR}/mindrt_executor.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/lite_mindrt.cc + ${CMAKE_CURRENT_SOURCE_DIR}/runtime/mindrt_executor.cc ${CMAKE_CURRENT_SOURCE_DIR}/control_flow/control_actor_creator.cc ) if(MSLITE_ENABLE_CONTROLFLOW) @@ -412,7 +412,7 @@ add_dependencies(lite_src_mid fbs_src) if(MSLITE_ENABLE_ACL) include_directories(${TOP_DIR}/graphengine/inc/external) - add_subdirectory(runtime/kernel/ascend) + add_subdirectory(extendrt/kernel/ascend) link_directories(${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH} ${ASCEND_CANN_RUNTIME_PATH}) endif() @@ -479,12 +479,12 @@ if(SUPPORT_TENSORRT) set(CUDA_LIB_PATH ${CUDA_PATH}/lib64) include_directories(${TENSORRT_PATH}/include) include_directories(${CUDA_PATH}/include) - add_subdirectory(delegate/tensorrt) + add_subdirectory(extendrt/delegate/tensorrt) target_link_libraries(mindspore-lite tensorrt_kernel_mid cuda_kernel_mid gpu_distribution_collective) target_link_libraries(mindspore-lite_static tensorrt_kernel_mid cuda_kernel_mid gpu_distribution_collective) else() set(TENSORRT_STUB - ${CMAKE_CURRENT_SOURCE_DIR}/delegate/tensorrt/distribution/distribution_base.cc + ${CMAKE_CURRENT_SOURCE_DIR}/extendrt/delegate/tensorrt/distribution/distribution_base.cc ) add_library(tensorrt_stub OBJECT ${TENSORRT_STUB}) target_link_libraries(mindspore-lite tensorrt_stub) @@ -498,7 +498,7 @@ if(MSLITE_GPU_BACKEND STREQUAL opencl) endif() if(SUPPORT_NPU) - add_subdirectory(delegate/npu) + add_subdirectory(runtime/delegate/npu) target_link_libraries(mindspore-lite npu_kernel_mid) target_link_libraries(mindspore-lite_static npu_kernel_mid) endif() @@ -536,7 +536,7 @@ if(SUPPORT_TRAIN) endif() if(MSLITE_ENABLE_KERNEL_EXECUTOR) - add_subdirectory(cxx_api/kernel_executor) + add_subdirectory(runtime/cxx_api/kernel_executor) endif() ########################## build optimize and float16 library ################################# @@ -554,12 +554,12 @@ endif() if(MSLITE_ENABLE_RUNTIME_CONVERT) target_link_libraries(mindspore-lite quantizer_mid fusion_mid proto_mid graph_pass_mid preprocess_mid - cpu_kernel_mid ccsrc_src_mid converter_src_mid anf_exporter_mid + cpu_kernel_mid ccsrc_src_mid converter_src_mid lite_exporter_mid config_parser_mid mslite_converter_plugin mindspore_core coder_mid mindir_serializer_mid mindspore::protobuf ${SECUREC_LIBRARY}) target_link_libraries(mindspore-lite_static quantizer_mid fusion_mid proto_mid graph_pass_mid preprocess_mid - cpu_kernel_mid ccsrc_src_mid converter_src_mid anf_exporter_mid + cpu_kernel_mid ccsrc_src_mid converter_src_mid lite_exporter_mid config_parser_mid mslite_converter_plugin mindspore_core coder_mid mindir_serializer_mid mindspore::protobuf ${SECUREC_LIBRARY}) if(NOT ENABLE_CLOUD_AND_LITE) diff --git a/mindspore/lite/src/common/context_util.h b/mindspore/lite/src/common/context_util.h index 50650b078e3..cc3140481da 100644 --- a/mindspore/lite/src/common/context_util.h +++ b/mindspore/lite/src/common/context_util.h @@ -21,7 +21,7 @@ #include #include "include/context.h" #include "include/api/context.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/CMakeLists.txt b/mindspore/lite/src/common/ops/CMakeLists.txt similarity index 100% rename from mindspore/lite/src/ops/CMakeLists.txt rename to mindspore/lite/src/common/ops/CMakeLists.txt diff --git a/mindspore/lite/src/ops/anf_utils.cc b/mindspore/lite/src/common/ops/anf_utils.cc similarity index 97% rename from mindspore/lite/src/ops/anf_utils.cc rename to mindspore/lite/src/common/ops/anf_utils.cc index b1e3f3c5357..50a92d12545 100644 --- a/mindspore/lite/src/ops/anf_utils.cc +++ b/mindspore/lite/src/common/ops/anf_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/ops/anf_utils.h" +#include "src/common/ops/anf_utils.h" #ifdef PRIMITIVE_WRITEABLE namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/anf_utils.h b/mindspore/lite/src/common/ops/anf_utils.h similarity index 96% rename from mindspore/lite/src/ops/anf_utils.h rename to mindspore/lite/src/common/ops/anf_utils.h index 2382b151d72..3ce80f7bdba 100644 --- a/mindspore/lite/src/ops/anf_utils.h +++ b/mindspore/lite/src/common/ops/anf_utils.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_OPS_ANF_UTILS_H_ #include -#include "src/ops/ops_utils.h" +#include "src/common/ops/ops_utils.h" #ifdef PRIMITIVE_WRITEABLE #include "abstract/ops/primitive_infer_map.h" namespace mindspore { diff --git a/mindspore/lite/src/ops/ops_def.cc b/mindspore/lite/src/common/ops/ops_def.cc similarity index 99% rename from mindspore/lite/src/ops/ops_def.cc rename to mindspore/lite/src/common/ops/ops_def.cc index b28c2121ea8..f592dc0dee2 100644 --- a/mindspore/lite/src/ops/ops_def.cc +++ b/mindspore/lite/src/common/ops/ops_def.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/ops_def.h" -#include "src/ops/ops_func_declare.h" +#include "src/common/ops/ops_def.h" +#include "src/common/ops/ops_func_declare.h" OP_TYPE_DEF_BEGIN(PrimitiveType) OP_TYPE(Abs) diff --git a/mindspore/lite/src/ops/ops_def.h b/mindspore/lite/src/common/ops/ops_def.h similarity index 98% rename from mindspore/lite/src/ops/ops_def.h rename to mindspore/lite/src/common/ops/ops_def.h index 5d674e93837..db366641eda 100644 --- a/mindspore/lite/src/ops/ops_def.h +++ b/mindspore/lite/src/common/ops/ops_def.h @@ -19,8 +19,8 @@ #include #include #include -#include "src/ops/ops_func_declare.h" -#include "src/ops/schema_register.h" +#include "src/common/ops/ops_func_declare.h" +#include "src/common/ops/schema_register.h" #ifdef PRIMITIVE_WRITEABLE #include "mindspore/core/utils/check_convert_utils.h" diff --git a/mindspore/lite/src/ops/ops_func_declare.h b/mindspore/lite/src/common/ops/ops_func_declare.h similarity index 100% rename from mindspore/lite/src/ops/ops_func_declare.h rename to mindspore/lite/src/common/ops/ops_func_declare.h diff --git a/mindspore/lite/src/ops/ops_utils.cc b/mindspore/lite/src/common/ops/ops_utils.cc similarity index 99% rename from mindspore/lite/src/ops/ops_utils.cc rename to mindspore/lite/src/common/ops/ops_utils.cc index e09c9305811..ab534d33b03 100644 --- a/mindspore/lite/src/ops/ops_utils.cc +++ b/mindspore/lite/src/common/ops/ops_utils.cc @@ -16,7 +16,7 @@ #include #include -#include "src/ops/ops_utils.h" +#include "src/common/ops/ops_utils.h" #include "mindapi/base/shared_ptr.h" #ifdef PRIMITIVE_WRITEABLE #include "ops/primitive_c.h" diff --git a/mindspore/lite/src/ops/ops_utils.h b/mindspore/lite/src/common/ops/ops_utils.h similarity index 98% rename from mindspore/lite/src/ops/ops_utils.h rename to mindspore/lite/src/common/ops/ops_utils.h index 7f5d48bba4a..6447b3fa4a9 100644 --- a/mindspore/lite/src/ops/ops_utils.h +++ b/mindspore/lite/src/common/ops/ops_utils.h @@ -21,7 +21,7 @@ #include #include #include -#include "src/ops/ops_func_declare.h" +#include "src/common/ops/ops_func_declare.h" #ifdef PRIMITIVE_WRITEABLE #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/ops/populate/activation_grad_populate.cc b/mindspore/lite/src/common/ops/populate/activation_grad_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/activation_grad_populate.cc rename to mindspore/lite/src/common/ops/populate/activation_grad_populate.cc index 02ba5dd8b5f..ce75379adc0 100644 --- a/mindspore/lite/src/ops/populate/activation_grad_populate.cc +++ b/mindspore/lite/src/common/ops/populate/activation_grad_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32_grad/activation_grad.h" using mindspore::schema::PrimitiveType_ActivationGrad; diff --git a/mindspore/lite/src/ops/populate/activation_populate.cc b/mindspore/lite/src/common/ops/populate/activation_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/activation_populate.cc rename to mindspore/lite/src/common/ops/populate/activation_populate.cc index ab05151697d..a0b49140146 100644 --- a/mindspore/lite/src/ops/populate/activation_populate.cc +++ b/mindspore/lite/src/common/ops/populate/activation_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/activation_fp32.h" using mindspore::schema::PrimitiveType_Activation; diff --git a/mindspore/lite/src/ops/populate/adam_populate.cc b/mindspore/lite/src/common/ops/populate/adam_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/adam_populate.cc rename to mindspore/lite/src/common/ops/populate/adam_populate.cc index c5f565731e8..6dd94f7b890 100644 --- a/mindspore/lite/src/ops/populate/adam_populate.cc +++ b/mindspore/lite/src/common/ops/populate/adam_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/op_base.h" using mindspore::schema::PrimitiveType_Adam; diff --git a/mindspore/lite/src/ops/populate/add_populate.cc b/mindspore/lite/src/common/ops/populate/add_populate.cc similarity index 92% rename from mindspore/lite/src/ops/populate/add_populate.cc rename to mindspore/lite/src/common/ops/populate/add_populate.cc index 42dc6ee7ad4..03160cc2c2b 100644 --- a/mindspore/lite/src/ops/populate/add_populate.cc +++ b/mindspore/lite/src/common/ops/populate/add_populate.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/arithmetic.h" -#include "src/ops/populate/arithmetic_populate.h" +#include "src/common/ops/populate/arithmetic_populate.h" using mindspore::schema::PrimitiveType_AddFusion; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/adder_populate.cc b/mindspore/lite/src/common/ops/populate/adder_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/adder_populate.cc rename to mindspore/lite/src/common/ops/populate/adder_populate.cc index e278646fde9..a09e00643af 100644 --- a/mindspore/lite/src/ops/populate/adder_populate.cc +++ b/mindspore/lite/src/common/ops/populate/adder_populate.cc @@ -15,7 +15,7 @@ */ #include "src/common/log_adapter.h" #include "nnacl/conv_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_AdderFusion; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/affine_populate.cc b/mindspore/lite/src/common/ops/populate/affine_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/affine_populate.cc rename to mindspore/lite/src/common/ops/populate/affine_populate.cc index d84df44f90f..0c71edf8c6a 100644 --- a/mindspore/lite/src/ops/populate/affine_populate.cc +++ b/mindspore/lite/src/common/ops/populate/affine_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/op_base.h" #include "nnacl/affine_parameter.h" diff --git a/mindspore/lite/src/ops/populate/all_gather.cc b/mindspore/lite/src/common/ops/populate/all_gather.cc similarity index 97% rename from mindspore/lite/src/ops/populate/all_gather.cc rename to mindspore/lite/src/common/ops/populate/all_gather.cc index a01b4f375ef..cbbb37f570c 100644 --- a/mindspore/lite/src/ops/populate/all_gather.cc +++ b/mindspore/lite/src/common/ops/populate/all_gather.cc @@ -17,7 +17,7 @@ #include "schema/ops_generated.h" #include "schema/model_generated.h" #include "nnacl/all_gather_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_AllGather; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/argmax_populate.cc b/mindspore/lite/src/common/ops/populate/argmax_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/argmax_populate.cc rename to mindspore/lite/src/common/ops/populate/argmax_populate.cc index 0a4811678c5..eb1c3725f57 100644 --- a/mindspore/lite/src/ops/populate/argmax_populate.cc +++ b/mindspore/lite/src/common/ops/populate/argmax_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/arg_min_max_parameter.h" using mindspore::schema::PrimitiveType_ArgMaxFusion; diff --git a/mindspore/lite/src/ops/populate/argmin_populate.cc b/mindspore/lite/src/common/ops/populate/argmin_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/argmin_populate.cc rename to mindspore/lite/src/common/ops/populate/argmin_populate.cc index c54a76ee83a..a4531de233c 100644 --- a/mindspore/lite/src/ops/populate/argmin_populate.cc +++ b/mindspore/lite/src/common/ops/populate/argmin_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/arg_min_max_parameter.h" using mindspore::schema::PrimitiveType_ArgMinFusion; diff --git a/mindspore/lite/src/ops/populate/arithmetic_populate.cc b/mindspore/lite/src/common/ops/populate/arithmetic_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/arithmetic_populate.cc rename to mindspore/lite/src/common/ops/populate/arithmetic_populate.cc index f0922c4645e..680a27a5f5c 100644 --- a/mindspore/lite/src/ops/populate/arithmetic_populate.cc +++ b/mindspore/lite/src/common/ops/populate/arithmetic_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/arithmetic_populate.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/arithmetic_populate.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_BiasAddGrad; using mindspore::schema::PrimitiveType_Equal; using mindspore::schema::PrimitiveType_FloorDiv; diff --git a/mindspore/lite/src/ops/populate/arithmetic_populate.h b/mindspore/lite/src/common/ops/populate/arithmetic_populate.h similarity index 100% rename from mindspore/lite/src/ops/populate/arithmetic_populate.h rename to mindspore/lite/src/common/ops/populate/arithmetic_populate.h diff --git a/mindspore/lite/src/ops/populate/arithmetic_self_populate.cc b/mindspore/lite/src/common/ops/populate/arithmetic_self_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/arithmetic_self_populate.cc rename to mindspore/lite/src/common/ops/populate/arithmetic_self_populate.cc index 164e0a806e0..05e0253b9da 100644 --- a/mindspore/lite/src/ops/populate/arithmetic_self_populate.cc +++ b/mindspore/lite/src/common/ops/populate/arithmetic_self_populate.cc @@ -15,7 +15,7 @@ */ #include "src/common/log_adapter.h" #include "nnacl/arithmetic_self_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Abs; using mindspore::schema::PrimitiveType_Ceil; using mindspore::schema::PrimitiveType_Cos; diff --git a/mindspore/lite/src/ops/populate/assert_populate.cc b/mindspore/lite/src/common/ops/populate/assert_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/assert_populate.cc rename to mindspore/lite/src/common/ops/populate/assert_populate.cc index b4bf2e6aa78..afb10ff20a7 100644 --- a/mindspore/lite/src/ops/populate/assert_populate.cc +++ b/mindspore/lite/src/common/ops/populate/assert_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Assert; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/assign_add_populate.cc b/mindspore/lite/src/common/ops/populate/assign_add_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/assign_add_populate.cc rename to mindspore/lite/src/common/ops/populate/assign_add_populate.cc index 23800ad24c5..488fc68d6be 100644 --- a/mindspore/lite/src/ops/populate/assign_add_populate.cc +++ b/mindspore/lite/src/common/ops/populate/assign_add_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_AssignAdd; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/assign_populate.cc b/mindspore/lite/src/common/ops/populate/assign_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/assign_populate.cc rename to mindspore/lite/src/common/ops/populate/assign_populate.cc index afec937347e..3a138ea9fea 100644 --- a/mindspore/lite/src/ops/populate/assign_populate.cc +++ b/mindspore/lite/src/common/ops/populate/assign_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Assign; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/audio_spectrogram_populate.cc b/mindspore/lite/src/common/ops/populate/audio_spectrogram_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/audio_spectrogram_populate.cc rename to mindspore/lite/src/common/ops/populate/audio_spectrogram_populate.cc index 9f27c1d3f8e..b2edc51ec3b 100644 --- a/mindspore/lite/src/ops/populate/audio_spectrogram_populate.cc +++ b/mindspore/lite/src/common/ops/populate/audio_spectrogram_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/infer/audio_spectrogram_infer.h" using mindspore::schema::PrimitiveType_AudioSpectrogram; diff --git a/mindspore/lite/src/ops/populate/batch_norm_populate.cc b/mindspore/lite/src/common/ops/populate/batch_norm_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/batch_norm_populate.cc rename to mindspore/lite/src/common/ops/populate/batch_norm_populate.cc index 8badc7cb796..e0f01b801c0 100644 --- a/mindspore/lite/src/ops/populate/batch_norm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/batch_norm_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/batchnorm_parameter.h" using mindspore::schema::PrimitiveType_BatchNorm; diff --git a/mindspore/lite/src/ops/populate/batch_to_space_populate.cc b/mindspore/lite/src/common/ops/populate/batch_to_space_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/batch_to_space_populate.cc rename to mindspore/lite/src/common/ops/populate/batch_to_space_populate.cc index ac56713eef1..4252ee4d6b5 100644 --- a/mindspore/lite/src/ops/populate/batch_to_space_populate.cc +++ b/mindspore/lite/src/common/ops/populate/batch_to_space_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/batch_to_space.h" using mindspore::schema::PrimitiveType_BatchToSpace; using mindspore::schema::PrimitiveType_BatchToSpaceND; diff --git a/mindspore/lite/src/ops/populate/bias_add_populate.cc b/mindspore/lite/src/common/ops/populate/bias_add_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/bias_add_populate.cc rename to mindspore/lite/src/common/ops/populate/bias_add_populate.cc index 1f63e4054fd..92178f53390 100644 --- a/mindspore/lite/src/ops/populate/bias_add_populate.cc +++ b/mindspore/lite/src/common/ops/populate/bias_add_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/arithmetic.h" using mindspore::schema::PrimitiveType_BiasAdd; diff --git a/mindspore/lite/src/ops/populate/binary_cross_entropy_grad_populate.cc b/mindspore/lite/src/common/ops/populate/binary_cross_entropy_grad_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/binary_cross_entropy_grad_populate.cc rename to mindspore/lite/src/common/ops/populate/binary_cross_entropy_grad_populate.cc index 5c44e12b2fb..5da193bc6e8 100644 --- a/mindspore/lite/src/ops/populate/binary_cross_entropy_grad_populate.cc +++ b/mindspore/lite/src/common/ops/populate/binary_cross_entropy_grad_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32_grad/binary_cross_entropy_grad.h" using mindspore::schema::PrimitiveType_BinaryCrossEntropyGrad; diff --git a/mindspore/lite/src/ops/populate/binary_cross_entropy_populate.cc b/mindspore/lite/src/common/ops/populate/binary_cross_entropy_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/binary_cross_entropy_populate.cc rename to mindspore/lite/src/common/ops/populate/binary_cross_entropy_populate.cc index 772705f9894..10060d3fd7c 100644 --- a/mindspore/lite/src/ops/populate/binary_cross_entropy_populate.cc +++ b/mindspore/lite/src/common/ops/populate/binary_cross_entropy_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32_grad/binary_cross_entropy.h" using mindspore::schema::PrimitiveType_BinaryCrossEntropy; diff --git a/mindspore/lite/src/ops/populate/broadcast_to_populate.cc b/mindspore/lite/src/common/ops/populate/broadcast_to_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/broadcast_to_populate.cc rename to mindspore/lite/src/common/ops/populate/broadcast_to_populate.cc index 781ab137d46..a8c51d1c0a7 100644 --- a/mindspore/lite/src/ops/populate/broadcast_to_populate.cc +++ b/mindspore/lite/src/common/ops/populate/broadcast_to_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/base/broadcast_to.h" using mindspore::schema::PrimitiveType_BroadcastTo; diff --git a/mindspore/lite/src/ops/populate/call_populate.cc b/mindspore/lite/src/common/ops/populate/call_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/call_populate.cc rename to mindspore/lite/src/common/ops/populate/call_populate.cc index 5ca829be655..105ff5eee25 100644 --- a/mindspore/lite/src/ops/populate/call_populate.cc +++ b/mindspore/lite/src/common/ops/populate/call_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/call_parameter.h" using mindspore::schema::PrimitiveType_Call; diff --git a/mindspore/lite/src/ops/populate/cast_populate.cc b/mindspore/lite/src/common/ops/populate/cast_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/cast_populate.cc rename to mindspore/lite/src/common/ops/populate/cast_populate.cc index 8e9a081ab90..14480873d21 100644 --- a/mindspore/lite/src/ops/populate/cast_populate.cc +++ b/mindspore/lite/src/common/ops/populate/cast_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Cast; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/clip_populate.cc b/mindspore/lite/src/common/ops/populate/clip_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/clip_populate.cc rename to mindspore/lite/src/common/ops/populate/clip_populate.cc index d934f7f1552..8e402cc2b03 100644 --- a/mindspore/lite/src/ops/populate/clip_populate.cc +++ b/mindspore/lite/src/common/ops/populate/clip_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Clip; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/common_populate.cc b/mindspore/lite/src/common/ops/populate/common_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/common_populate.cc rename to mindspore/lite/src/common/ops/populate/common_populate.cc index 10cf85f5e02..67e8bbc8e54 100644 --- a/mindspore/lite/src/ops/populate/common_populate.cc +++ b/mindspore/lite/src/common/ops/populate/common_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_AddN; using mindspore::schema::PrimitiveType_Attention; using mindspore::schema::PrimitiveType_Depend; diff --git a/mindspore/lite/src/ops/populate/concat_populate.cc b/mindspore/lite/src/common/ops/populate/concat_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/concat_populate.cc rename to mindspore/lite/src/common/ops/populate/concat_populate.cc index ed0d5111ceb..485f711461d 100644 --- a/mindspore/lite/src/ops/populate/concat_populate.cc +++ b/mindspore/lite/src/common/ops/populate/concat_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/concat_parameter.h" using mindspore::schema::PrimitiveType_Concat; diff --git a/mindspore/lite/src/ops/populate/constant_of_shape_populate.cc b/mindspore/lite/src/common/ops/populate/constant_of_shape_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/constant_of_shape_populate.cc rename to mindspore/lite/src/common/ops/populate/constant_of_shape_populate.cc index b5d0a7c9b16..56263d13120 100644 --- a/mindspore/lite/src/ops/populate/constant_of_shape_populate.cc +++ b/mindspore/lite/src/common/ops/populate/constant_of_shape_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "ir/dtype/type_id.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/constant_of_shape_parameter.h" using mindspore::schema::PrimitiveType_ConstantOfShape; diff --git a/mindspore/lite/src/ops/populate/control/switch_populate.cc b/mindspore/lite/src/common/ops/populate/control/switch_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/control/switch_populate.cc rename to mindspore/lite/src/common/ops/populate/control/switch_populate.cc index db2b0cc4af8..f67d1cf1bb0 100644 --- a/mindspore/lite/src/ops/populate/control/switch_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/switch_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Switch; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/control/tensor_array_populate.cc b/mindspore/lite/src/common/ops/populate/control/tensor_array_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/control/tensor_array_populate.cc rename to mindspore/lite/src/common/ops/populate/control/tensor_array_populate.cc index 034dfde5d00..b91bd9b9fa2 100644 --- a/mindspore/lite/src/ops/populate/control/tensor_array_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/tensor_array_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/op_base.h" #include "nnacl/tensor_array_parameter.h" diff --git a/mindspore/lite/src/ops/populate/control/tensorlistfromtensor_populate.cc b/mindspore/lite/src/common/ops/populate/control/tensorlistfromtensor_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/control/tensorlistfromtensor_populate.cc rename to mindspore/lite/src/common/ops/populate/control/tensorlistfromtensor_populate.cc index 0999c11ad4a..cd72d1f929d 100644 --- a/mindspore/lite/src/ops/populate/control/tensorlistfromtensor_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/tensorlistfromtensor_populate.cc @@ -15,7 +15,7 @@ */ #include "nnacl/tensorlist_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_TensorListFromTensor; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/control/tensorlistgetitem_populate.cc b/mindspore/lite/src/common/ops/populate/control/tensorlistgetitem_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/control/tensorlistgetitem_populate.cc rename to mindspore/lite/src/common/ops/populate/control/tensorlistgetitem_populate.cc index f96fc475936..0374044d333 100644 --- a/mindspore/lite/src/ops/populate/control/tensorlistgetitem_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/tensorlistgetitem_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/tensorlist_parameter.h" using mindspore::schema::PrimitiveType_TensorListGetItem; diff --git a/mindspore/lite/src/ops/populate/control/tensorlistreserve_populate.cc b/mindspore/lite/src/common/ops/populate/control/tensorlistreserve_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/control/tensorlistreserve_populate.cc rename to mindspore/lite/src/common/ops/populate/control/tensorlistreserve_populate.cc index 37d1ea5f787..306f2529867 100644 --- a/mindspore/lite/src/ops/populate/control/tensorlistreserve_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/tensorlistreserve_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/tensorlist_parameter.h" using mindspore::schema::PrimitiveType_TensorListReserve; diff --git a/mindspore/lite/src/ops/populate/control/tensorlistsetlitem_populate.cc b/mindspore/lite/src/common/ops/populate/control/tensorlistsetlitem_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/control/tensorlistsetlitem_populate.cc rename to mindspore/lite/src/common/ops/populate/control/tensorlistsetlitem_populate.cc index 2a03483988f..7cfebab481c 100644 --- a/mindspore/lite/src/ops/populate/control/tensorlistsetlitem_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/tensorlistsetlitem_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/tensorlist_parameter.h" using mindspore::schema::PrimitiveType_TensorListSetItem; diff --git a/mindspore/lite/src/ops/populate/control/tensorliststack_populate.cc b/mindspore/lite/src/common/ops/populate/control/tensorliststack_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/control/tensorliststack_populate.cc rename to mindspore/lite/src/common/ops/populate/control/tensorliststack_populate.cc index 2f22598ab05..b053c2512ae 100644 --- a/mindspore/lite/src/ops/populate/control/tensorliststack_populate.cc +++ b/mindspore/lite/src/common/ops/populate/control/tensorliststack_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/tensorlist_parameter.h" using mindspore::schema::PrimitiveType_TensorListStack; diff --git a/mindspore/lite/src/ops/populate/conv2d_populate.cc b/mindspore/lite/src/common/ops/populate/conv2d_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/conv2d_populate.cc rename to mindspore/lite/src/common/ops/populate/conv2d_populate.cc index c1c350c46f4..64df1b119c7 100644 --- a/mindspore/lite/src/ops/populate/conv2d_populate.cc +++ b/mindspore/lite/src/common/ops/populate/conv2d_populate.cc @@ -15,7 +15,7 @@ */ #include "nnacl/conv_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Conv2DFusion; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/crop_and_resize_populate.cc b/mindspore/lite/src/common/ops/populate/crop_and_resize_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/crop_and_resize_populate.cc rename to mindspore/lite/src/common/ops/populate/crop_and_resize_populate.cc index 2098c5df2d3..096f51a6ab1 100644 --- a/mindspore/lite/src/ops/populate/crop_and_resize_populate.cc +++ b/mindspore/lite/src/common/ops/populate/crop_and_resize_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/resize_parameter.h" using mindspore::schema::PrimitiveType_CropAndResize; diff --git a/mindspore/lite/src/ops/populate/crop_populate.cc b/mindspore/lite/src/common/ops/populate/crop_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/crop_populate.cc rename to mindspore/lite/src/common/ops/populate/crop_populate.cc index 739e1f5ac60..7db5c4b5d63 100644 --- a/mindspore/lite/src/ops/populate/crop_populate.cc +++ b/mindspore/lite/src/common/ops/populate/crop_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/crop_parameter.h" using mindspore::schema::PrimitiveType_Crop; diff --git a/mindspore/lite/src/ops/populate/cumsum_populate.cc b/mindspore/lite/src/common/ops/populate/cumsum_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/cumsum_populate.cc rename to mindspore/lite/src/common/ops/populate/cumsum_populate.cc index 515eceb86b0..76fc45a3658 100644 --- a/mindspore/lite/src/ops/populate/cumsum_populate.cc +++ b/mindspore/lite/src/common/ops/populate/cumsum_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/cumsum_parameter.h" using mindspore::schema::PrimitiveType_CumSum; diff --git a/mindspore/lite/src/ops/populate/custom_populate.cc b/mindspore/lite/src/common/ops/populate/custom_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/custom_populate.cc rename to mindspore/lite/src/common/ops/populate/custom_populate.cc index 375b55aadf1..b0b21047bb9 100644 --- a/mindspore/lite/src/ops/populate/custom_populate.cc +++ b/mindspore/lite/src/common/ops/populate/custom_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/log_adapter.h" #include "src/tensor.h" #include "nnacl/custom_parameter.h" diff --git a/mindspore/lite/src/ops/populate/deconv2d_populate.cc b/mindspore/lite/src/common/ops/populate/deconv2d_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/deconv2d_populate.cc rename to mindspore/lite/src/common/ops/populate/deconv2d_populate.cc index 2e3b37ab7c8..1bcfb144c70 100644 --- a/mindspore/lite/src/ops/populate/deconv2d_populate.cc +++ b/mindspore/lite/src/common/ops/populate/deconv2d_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/common/log_adapter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/conv_parameter.h" using mindspore::schema::PrimitiveType_Conv2dTransposeFusion; diff --git a/mindspore/lite/src/ops/populate/default_populate.cc b/mindspore/lite/src/common/ops/populate/default_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/default_populate.cc rename to mindspore/lite/src/common/ops/populate/default_populate.cc index 36c7aa4e9c6..a5a7cbd3f46 100644 --- a/mindspore/lite/src/ops/populate/default_populate.cc +++ b/mindspore/lite/src/common/ops/populate/default_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/default_populate.h" #include #include #include "schema/model_generated.h" diff --git a/mindspore/lite/src/ops/populate/default_populate.h b/mindspore/lite/src/common/ops/populate/default_populate.h similarity index 100% rename from mindspore/lite/src/ops/populate/default_populate.h rename to mindspore/lite/src/common/ops/populate/default_populate.h diff --git a/mindspore/lite/src/ops/populate/depth_to_space_populate.cc b/mindspore/lite/src/common/ops/populate/depth_to_space_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/depth_to_space_populate.cc rename to mindspore/lite/src/common/ops/populate/depth_to_space_populate.cc index c20d6249264..3d6ade3d338 100644 --- a/mindspore/lite/src/ops/populate/depth_to_space_populate.cc +++ b/mindspore/lite/src/common/ops/populate/depth_to_space_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/depth_to_space_parameter.h" using mindspore::schema::PrimitiveType_DepthToSpace; diff --git a/mindspore/lite/src/ops/populate/detection_post_process_populate.cc b/mindspore/lite/src/common/ops/populate/detection_post_process_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/detection_post_process_populate.cc rename to mindspore/lite/src/common/ops/populate/detection_post_process_populate.cc index 9ff37e4082b..6cfdb35cd56 100644 --- a/mindspore/lite/src/ops/populate/detection_post_process_populate.cc +++ b/mindspore/lite/src/common/ops/populate/detection_post_process_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/detection_post_process_parameter.h" using mindspore::schema::PrimitiveType_DetectionPostProcess; diff --git a/mindspore/lite/src/ops/populate/div_populate.cc b/mindspore/lite/src/common/ops/populate/div_populate.cc similarity index 90% rename from mindspore/lite/src/ops/populate/div_populate.cc rename to mindspore/lite/src/common/ops/populate/div_populate.cc index 8ae152d03ba..67df80313ad 100644 --- a/mindspore/lite/src/ops/populate/div_populate.cc +++ b/mindspore/lite/src/common/ops/populate/div_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/arithmetic_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/arithmetic_populate.h" using mindspore::schema::PrimitiveType_DivFusion; namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/dynamic_quant_populate.cc b/mindspore/lite/src/common/ops/populate/dynamic_quant_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/dynamic_quant_populate.cc rename to mindspore/lite/src/common/ops/populate/dynamic_quant_populate.cc index 44208057199..b7e62e6cdde 100644 --- a/mindspore/lite/src/ops/populate/dynamic_quant_populate.cc +++ b/mindspore/lite/src/common/ops/populate/dynamic_quant_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/dynamic_quant_parameter.h" using mindspore::schema::PrimitiveType_DynamicQuant; diff --git a/mindspore/lite/src/ops/populate/eltwise_populate.cc b/mindspore/lite/src/common/ops/populate/eltwise_populate.cc similarity index 92% rename from mindspore/lite/src/ops/populate/eltwise_populate.cc rename to mindspore/lite/src/common/ops/populate/eltwise_populate.cc index 9536f65e5cc..9136dc2c9c2 100644 --- a/mindspore/lite/src/ops/populate/eltwise_populate.cc +++ b/mindspore/lite/src/common/ops/populate/eltwise_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/arithmetic_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/arithmetic_populate.h" using mindspore::schema::PrimitiveType_Eltwise; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/embedding_lookup_populate.cc b/mindspore/lite/src/common/ops/populate/embedding_lookup_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/embedding_lookup_populate.cc rename to mindspore/lite/src/common/ops/populate/embedding_lookup_populate.cc index cbbbfa6a3c0..87b56c026bc 100644 --- a/mindspore/lite/src/ops/populate/embedding_lookup_populate.cc +++ b/mindspore/lite/src/common/ops/populate/embedding_lookup_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/embedding_lookup_fp32.h" using mindspore::schema::PrimitiveType_EmbeddingLookupFusion; diff --git a/mindspore/lite/src/ops/populate/erf_populate.cc b/mindspore/lite/src/common/ops/populate/erf_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/erf_populate.cc rename to mindspore/lite/src/common/ops/populate/erf_populate.cc index 51593146b0e..fb22606fa58 100644 --- a/mindspore/lite/src/ops/populate/erf_populate.cc +++ b/mindspore/lite/src/common/ops/populate/erf_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_Erf; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/exp_populate.cc b/mindspore/lite/src/common/ops/populate/exp_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/exp_populate.cc rename to mindspore/lite/src/common/ops/populate/exp_populate.cc index d0f5b28bd7f..86c02456145 100644 --- a/mindspore/lite/src/ops/populate/exp_populate.cc +++ b/mindspore/lite/src/common/ops/populate/exp_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/exp_fp32.h" using mindspore::schema::PrimitiveType_ExpFusion; diff --git a/mindspore/lite/src/ops/populate/expand_dims_populate.cc b/mindspore/lite/src/common/ops/populate/expand_dims_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/expand_dims_populate.cc rename to mindspore/lite/src/common/ops/populate/expand_dims_populate.cc index 1d561963e20..e43411a1b62 100644 --- a/mindspore/lite/src/ops/populate/expand_dims_populate.cc +++ b/mindspore/lite/src/common/ops/populate/expand_dims_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_ExpandDims; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/fill_populate.cc b/mindspore/lite/src/common/ops/populate/fill_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/fill_populate.cc rename to mindspore/lite/src/common/ops/populate/fill_populate.cc index a16ed58e439..db13b4574de 100644 --- a/mindspore/lite/src/ops/populate/fill_populate.cc +++ b/mindspore/lite/src/common/ops/populate/fill_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Fill; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/flatten_populate.cc b/mindspore/lite/src/common/ops/populate/flatten_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/flatten_populate.cc rename to mindspore/lite/src/common/ops/populate/flatten_populate.cc index cbe8e238fe1..c5df0cbafd2 100644 --- a/mindspore/lite/src/ops/populate/flatten_populate.cc +++ b/mindspore/lite/src/common/ops/populate/flatten_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Flatten; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/full_connection_populate.cc b/mindspore/lite/src/common/ops/populate/full_connection_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/full_connection_populate.cc rename to mindspore/lite/src/common/ops/populate/full_connection_populate.cc index 7d76ac936e1..30106e64787 100644 --- a/mindspore/lite/src/ops/populate/full_connection_populate.cc +++ b/mindspore/lite/src/common/ops/populate/full_connection_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/matmul_parameter.h" using mindspore::schema::PrimitiveType_FullConnection; diff --git a/mindspore/lite/src/ops/populate/fused_batchnorm_populate.cc b/mindspore/lite/src/common/ops/populate/fused_batchnorm_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/fused_batchnorm_populate.cc rename to mindspore/lite/src/common/ops/populate/fused_batchnorm_populate.cc index 699c31104dc..937a68f5e66 100644 --- a/mindspore/lite/src/ops/populate/fused_batchnorm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/fused_batchnorm_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/batchnorm_parameter.h" using mindspore::schema::PrimitiveType_FusedBatchNorm; diff --git a/mindspore/lite/src/ops/populate/gather_d_populate.cc b/mindspore/lite/src/common/ops/populate/gather_d_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/gather_d_populate.cc rename to mindspore/lite/src/common/ops/populate/gather_d_populate.cc index c08c5983d08..ac76d715c60 100644 --- a/mindspore/lite/src/ops/populate/gather_d_populate.cc +++ b/mindspore/lite/src/common/ops/populate/gather_d_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/gather_parameter.h" using mindspore::schema::PrimitiveType_GatherD; diff --git a/mindspore/lite/src/ops/populate/gather_nd_populate.cc b/mindspore/lite/src/common/ops/populate/gather_nd_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/gather_nd_populate.cc rename to mindspore/lite/src/common/ops/populate/gather_nd_populate.cc index e389f3aabbc..17d01bee65b 100644 --- a/mindspore/lite/src/ops/populate/gather_nd_populate.cc +++ b/mindspore/lite/src/common/ops/populate/gather_nd_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/gatherNd_fp32.h" using mindspore::schema::PrimitiveType_GatherNd; diff --git a/mindspore/lite/src/ops/populate/gather_populate.cc b/mindspore/lite/src/common/ops/populate/gather_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/gather_populate.cc rename to mindspore/lite/src/common/ops/populate/gather_populate.cc index 9c22a44797b..7e19ccd9042 100644 --- a/mindspore/lite/src/ops/populate/gather_populate.cc +++ b/mindspore/lite/src/common/ops/populate/gather_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/gather_parameter.h" using mindspore::schema::PrimitiveType_Gather; diff --git a/mindspore/lite/src/ops/populate/glu_populate.cc b/mindspore/lite/src/common/ops/populate/glu_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/glu_populate.cc rename to mindspore/lite/src/common/ops/populate/glu_populate.cc index db2343241f7..96d232660bb 100644 --- a/mindspore/lite/src/ops/populate/glu_populate.cc +++ b/mindspore/lite/src/common/ops/populate/glu_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/glu_parameter.h" using mindspore::schema::PrimitiveType_GLU; diff --git a/mindspore/lite/src/ops/populate/group_norm_populate.cc b/mindspore/lite/src/common/ops/populate/group_norm_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/group_norm_populate.cc rename to mindspore/lite/src/common/ops/populate/group_norm_populate.cc index 7db5a6faa5f..8d0352ad4a7 100644 --- a/mindspore/lite/src/ops/populate/group_norm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/group_norm_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/group_norm_parameter.h" using mindspore::schema::PrimitiveType_GroupNormFusion; diff --git a/mindspore/lite/src/ops/populate/gru_populate.cc b/mindspore/lite/src/common/ops/populate/gru_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/gru_populate.cc rename to mindspore/lite/src/common/ops/populate/gru_populate.cc index 004bfcdffcd..ed157b6b8d1 100644 --- a/mindspore/lite/src/ops/populate/gru_populate.cc +++ b/mindspore/lite/src/common/ops/populate/gru_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/gru_fp32.h" using mindspore::schema::PrimitiveType_GRU; diff --git a/mindspore/lite/src/ops/populate/instance_norm_populate.cc b/mindspore/lite/src/common/ops/populate/instance_norm_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/instance_norm_populate.cc rename to mindspore/lite/src/common/ops/populate/instance_norm_populate.cc index 346a5cdbf7d..71acd6e378f 100644 --- a/mindspore/lite/src/ops/populate/instance_norm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/instance_norm_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/instance_norm_parameter.h" using mindspore::schema::PrimitiveType_InstanceNorm; diff --git a/mindspore/lite/src/ops/populate/invert_permutation_populate.cc b/mindspore/lite/src/common/ops/populate/invert_permutation_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/invert_permutation_populate.cc rename to mindspore/lite/src/common/ops/populate/invert_permutation_populate.cc index 7fea6e2cdb8..43c05eb75d9 100644 --- a/mindspore/lite/src/ops/populate/invert_permutation_populate.cc +++ b/mindspore/lite/src/common/ops/populate/invert_permutation_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_InvertPermutation; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/isfinite_populate.cc b/mindspore/lite/src/common/ops/populate/isfinite_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/isfinite_populate.cc rename to mindspore/lite/src/common/ops/populate/isfinite_populate.cc index 6d9fc4428bc..2bc7ea70e3b 100644 --- a/mindspore/lite/src/ops/populate/isfinite_populate.cc +++ b/mindspore/lite/src/common/ops/populate/isfinite_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_IsFinite; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/l2_norm_populate.cc b/mindspore/lite/src/common/ops/populate/l2_norm_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/l2_norm_populate.cc rename to mindspore/lite/src/common/ops/populate/l2_norm_populate.cc index 37faa63dcc6..c1dc48da0f4 100644 --- a/mindspore/lite/src/ops/populate/l2_norm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/l2_norm_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/l2_norm_parameter.h" using mindspore::schema::PrimitiveType_L2NormalizeFusion; diff --git a/mindspore/lite/src/ops/populate/layer_norm_grad_populate.cc b/mindspore/lite/src/common/ops/populate/layer_norm_grad_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/layer_norm_grad_populate.cc rename to mindspore/lite/src/common/ops/populate/layer_norm_grad_populate.cc index d01fa283ed0..fc41e4d6515 100644 --- a/mindspore/lite/src/ops/populate/layer_norm_grad_populate.cc +++ b/mindspore/lite/src/common/ops/populate/layer_norm_grad_populate.cc @@ -15,7 +15,7 @@ */ #include "nnacl/fp32_grad/layernormgrad_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_LayerNormGrad; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/layer_norm_populate.cc b/mindspore/lite/src/common/ops/populate/layer_norm_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/layer_norm_populate.cc rename to mindspore/lite/src/common/ops/populate/layer_norm_populate.cc index af7daaedf59..9da07bfc69a 100644 --- a/mindspore/lite/src/ops/populate/layer_norm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/layer_norm_populate.cc @@ -15,7 +15,7 @@ */ #include "nnacl/layer_norm_parameter.h" #include -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_LayerNormFusion; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/lin_space_populate.cc b/mindspore/lite/src/common/ops/populate/lin_space_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/lin_space_populate.cc rename to mindspore/lite/src/common/ops/populate/lin_space_populate.cc index 7c0b7d5f41c..4aed6be95ba 100644 --- a/mindspore/lite/src/ops/populate/lin_space_populate.cc +++ b/mindspore/lite/src/common/ops/populate/lin_space_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_LinSpace; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/local_response_normalization_populate.cc b/mindspore/lite/src/common/ops/populate/local_response_normalization_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/local_response_normalization_populate.cc rename to mindspore/lite/src/common/ops/populate/local_response_normalization_populate.cc index 353fc4de53b..2b372e602ac 100644 --- a/mindspore/lite/src/ops/populate/local_response_normalization_populate.cc +++ b/mindspore/lite/src/common/ops/populate/local_response_normalization_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/local_response_norm_fp32.h" using mindspore::schema::PrimitiveType_LRN; diff --git a/mindspore/lite/src/ops/populate/log_softmax_populate.cc b/mindspore/lite/src/common/ops/populate/log_softmax_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/log_softmax_populate.cc rename to mindspore/lite/src/common/ops/populate/log_softmax_populate.cc index 9705524de29..40ae66b368b 100644 --- a/mindspore/lite/src/ops/populate/log_softmax_populate.cc +++ b/mindspore/lite/src/common/ops/populate/log_softmax_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/softmax_parameter.h" using mindspore::schema::PrimitiveType_LogSoftmax; diff --git a/mindspore/lite/src/ops/populate/lstm_populate.cc b/mindspore/lite/src/common/ops/populate/lstm_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/lstm_populate.cc rename to mindspore/lite/src/common/ops/populate/lstm_populate.cc index f4bfa59dbf9..522da7add64 100644 --- a/mindspore/lite/src/ops/populate/lstm_populate.cc +++ b/mindspore/lite/src/common/ops/populate/lstm_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/lstm_fp32.h" using mindspore::schema::PrimitiveType_LSTM; diff --git a/mindspore/lite/src/ops/populate/matmul_populate.cc b/mindspore/lite/src/common/ops/populate/matmul_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/matmul_populate.cc rename to mindspore/lite/src/common/ops/populate/matmul_populate.cc index 1bbd15d1ad9..8eb182b826d 100644 --- a/mindspore/lite/src/ops/populate/matmul_populate.cc +++ b/mindspore/lite/src/common/ops/populate/matmul_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/matmul_parameter.h" using mindspore::schema::PrimitiveType_MatMulFusion; diff --git a/mindspore/lite/src/ops/populate/mfcc_populate.cc b/mindspore/lite/src/common/ops/populate/mfcc_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/mfcc_populate.cc rename to mindspore/lite/src/common/ops/populate/mfcc_populate.cc index f2c13cc8ab8..3b7fc3d8860 100644 --- a/mindspore/lite/src/ops/populate/mfcc_populate.cc +++ b/mindspore/lite/src/common/ops/populate/mfcc_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/infer/mfcc_infer.h" using mindspore::schema::PrimitiveType_Mfcc; diff --git a/mindspore/lite/src/ops/populate/mul_populate.cc b/mindspore/lite/src/common/ops/populate/mul_populate.cc similarity index 92% rename from mindspore/lite/src/ops/populate/mul_populate.cc rename to mindspore/lite/src/common/ops/populate/mul_populate.cc index 82491f834ea..37bb7218b26 100644 --- a/mindspore/lite/src/ops/populate/mul_populate.cc +++ b/mindspore/lite/src/common/ops/populate/mul_populate.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include "nnacl/arithmetic.h" -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/arithmetic_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/arithmetic_populate.h" using mindspore::schema::PrimitiveType_MulFusion; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/nllloss_populate.cc b/mindspore/lite/src/common/ops/populate/nllloss_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/nllloss_populate.cc rename to mindspore/lite/src/common/ops/populate/nllloss_populate.cc index 23de348f8ec..9a3c9f44e1c 100644 --- a/mindspore/lite/src/ops/populate/nllloss_populate.cc +++ b/mindspore/lite/src/common/ops/populate/nllloss_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/nllloss_parameter.h" diff --git a/mindspore/lite/src/ops/populate/non_max_suppression_populate.cc b/mindspore/lite/src/common/ops/populate/non_max_suppression_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/non_max_suppression_populate.cc rename to mindspore/lite/src/common/ops/populate/non_max_suppression_populate.cc index c329e9d9a71..6cb9fc886bf 100644 --- a/mindspore/lite/src/ops/populate/non_max_suppression_populate.cc +++ b/mindspore/lite/src/common/ops/populate/non_max_suppression_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/non_max_suppression_parameter.h" using mindspore::schema::PrimitiveType_NonMaxSuppression; diff --git a/mindspore/lite/src/ops/populate/nonzero_populate.cc b/mindspore/lite/src/common/ops/populate/nonzero_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/nonzero_populate.cc rename to mindspore/lite/src/common/ops/populate/nonzero_populate.cc index 4650423d598..e43b6e7e26e 100644 --- a/mindspore/lite/src/ops/populate/nonzero_populate.cc +++ b/mindspore/lite/src/common/ops/populate/nonzero_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_NonZero; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/one_hot_populate.cc b/mindspore/lite/src/common/ops/populate/one_hot_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/one_hot_populate.cc rename to mindspore/lite/src/common/ops/populate/one_hot_populate.cc index 56a8c81e832..366cff526bc 100644 --- a/mindspore/lite/src/ops/populate/one_hot_populate.cc +++ b/mindspore/lite/src/common/ops/populate/one_hot_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/one_hot_fp32.h" using mindspore::schema::PrimitiveType_OneHot; diff --git a/mindspore/lite/src/ops/populate/oneslike_populate.cc b/mindspore/lite/src/common/ops/populate/oneslike_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/oneslike_populate.cc rename to mindspore/lite/src/common/ops/populate/oneslike_populate.cc index a18d3c85dd5..15c8ac6278a 100644 --- a/mindspore/lite/src/ops/populate/oneslike_populate.cc +++ b/mindspore/lite/src/common/ops/populate/oneslike_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_OnesLike; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/p_relu_populate.cc b/mindspore/lite/src/common/ops/populate/p_relu_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/p_relu_populate.cc rename to mindspore/lite/src/common/ops/populate/p_relu_populate.cc index c2cfcf41771..367b32a0220 100644 --- a/mindspore/lite/src/ops/populate/p_relu_populate.cc +++ b/mindspore/lite/src/common/ops/populate/p_relu_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/prelu_parameter.h" using mindspore::schema::PrimitiveType_PReLUFusion; diff --git a/mindspore/lite/src/ops/populate/pad_populate.cc b/mindspore/lite/src/common/ops/populate/pad_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/pad_populate.cc rename to mindspore/lite/src/common/ops/populate/pad_populate.cc index 2c5535006aa..ac4171869e7 100644 --- a/mindspore/lite/src/ops/populate/pad_populate.cc +++ b/mindspore/lite/src/common/ops/populate/pad_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/pad_parameter.h" using mindspore::schema::PrimitiveType_PadFusion; diff --git a/mindspore/lite/src/ops/populate/partial_populate.cc b/mindspore/lite/src/common/ops/populate/partial_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/partial_populate.cc rename to mindspore/lite/src/common/ops/populate/partial_populate.cc index a0270ec7f86..b5516686569 100644 --- a/mindspore/lite/src/ops/populate/partial_populate.cc +++ b/mindspore/lite/src/common/ops/populate/partial_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/partial_fusion_parameter.h" using mindspore::schema::PrimitiveType_PartialFusion; diff --git a/mindspore/lite/src/ops/populate/pooling_populate.cc b/mindspore/lite/src/common/ops/populate/pooling_populate.cc similarity index 99% rename from mindspore/lite/src/ops/populate/pooling_populate.cc rename to mindspore/lite/src/common/ops/populate/pooling_populate.cc index cc597c0120c..eb296abb86e 100644 --- a/mindspore/lite/src/ops/populate/pooling_populate.cc +++ b/mindspore/lite/src/common/ops/populate/pooling_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/pooling_parameter.h" using mindspore::schema::PrimitiveType_AvgPoolFusion; using mindspore::schema::PrimitiveType_MaxPoolFusion; diff --git a/mindspore/lite/src/ops/populate/populate_register.cc b/mindspore/lite/src/common/ops/populate/populate_register.cc similarity index 93% rename from mindspore/lite/src/ops/populate/populate_register.cc rename to mindspore/lite/src/common/ops/populate/populate_register.cc index 34d9db675ea..36cffb71d22 100644 --- a/mindspore/lite/src/ops/populate/populate_register.cc +++ b/mindspore/lite/src/common/ops/populate/populate_register.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/ops/populate/populate_register.h b/mindspore/lite/src/common/ops/populate/populate_register.h similarity index 100% rename from mindspore/lite/src/ops/populate/populate_register.h rename to mindspore/lite/src/common/ops/populate/populate_register.h diff --git a/mindspore/lite/src/ops/populate/power_populate.cc b/mindspore/lite/src/common/ops/populate/power_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/power_populate.cc rename to mindspore/lite/src/common/ops/populate/power_populate.cc index 4375e2bcc4c..03b83f22b73 100644 --- a/mindspore/lite/src/ops/populate/power_populate.cc +++ b/mindspore/lite/src/common/ops/populate/power_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/power_parameter.h" using mindspore::schema::PrimitiveType_PowFusion; diff --git a/mindspore/lite/src/ops/populate/prior_box_populate.cc b/mindspore/lite/src/common/ops/populate/prior_box_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/prior_box_populate.cc rename to mindspore/lite/src/common/ops/populate/prior_box_populate.cc index f63219fa66e..60e66233582 100644 --- a/mindspore/lite/src/ops/populate/prior_box_populate.cc +++ b/mindspore/lite/src/common/ops/populate/prior_box_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/prior_box_parameter.h" using mindspore::schema::PrimitiveType_PriorBox; diff --git a/mindspore/lite/src/ops/populate/quant_dtype_cast_populate.cc b/mindspore/lite/src/common/ops/populate/quant_dtype_cast_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/quant_dtype_cast_populate.cc rename to mindspore/lite/src/common/ops/populate/quant_dtype_cast_populate.cc index ff5acbf0d1a..cc5029ff65a 100644 --- a/mindspore/lite/src/ops/populate/quant_dtype_cast_populate.cc +++ b/mindspore/lite/src/common/ops/populate/quant_dtype_cast_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/int8/quant_dtype_cast_int8.h" using mindspore::schema::PrimitiveType_QuantDTypeCast; diff --git a/mindspore/lite/src/ops/populate/ragged_range_populate.cc b/mindspore/lite/src/common/ops/populate/ragged_range_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/ragged_range_populate.cc rename to mindspore/lite/src/common/ops/populate/ragged_range_populate.cc index ad8848f4c2f..1272ef2ae93 100644 --- a/mindspore/lite/src/ops/populate/ragged_range_populate.cc +++ b/mindspore/lite/src/common/ops/populate/ragged_range_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/ragged_range_fp32.h" using mindspore::schema::PrimitiveType_RaggedRange; diff --git a/mindspore/lite/src/ops/populate/random_normal_populate.cc b/mindspore/lite/src/common/ops/populate/random_normal_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/random_normal_populate.cc rename to mindspore/lite/src/common/ops/populate/random_normal_populate.cc index cf8c8a69a52..7956640654d 100644 --- a/mindspore/lite/src/ops/populate/random_normal_populate.cc +++ b/mindspore/lite/src/common/ops/populate/random_normal_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/random_parameter.h" using mindspore::schema::PrimitiveType_RandomNormal; diff --git a/mindspore/lite/src/ops/populate/random_standard_normal_populate.cc b/mindspore/lite/src/common/ops/populate/random_standard_normal_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/random_standard_normal_populate.cc rename to mindspore/lite/src/common/ops/populate/random_standard_normal_populate.cc index 4ab99aa6f76..8d5b8fef699 100644 --- a/mindspore/lite/src/ops/populate/random_standard_normal_populate.cc +++ b/mindspore/lite/src/common/ops/populate/random_standard_normal_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/random_parameter.h" using mindspore::schema::PrimitiveType_RandomStandardNormal; diff --git a/mindspore/lite/src/ops/populate/range_populate.cc b/mindspore/lite/src/common/ops/populate/range_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/range_populate.cc rename to mindspore/lite/src/common/ops/populate/range_populate.cc index 8f056850971..57deb51d2b1 100644 --- a/mindspore/lite/src/ops/populate/range_populate.cc +++ b/mindspore/lite/src/common/ops/populate/range_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/range_fp32.h" using mindspore::schema::PrimitiveType_Range; diff --git a/mindspore/lite/src/ops/populate/rank_populate.cc b/mindspore/lite/src/common/ops/populate/rank_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/rank_populate.cc rename to mindspore/lite/src/common/ops/populate/rank_populate.cc index 30b9fa05d67..b41967ce8ef 100644 --- a/mindspore/lite/src/ops/populate/rank_populate.cc +++ b/mindspore/lite/src/common/ops/populate/rank_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_Rank; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/reduce_populate.cc b/mindspore/lite/src/common/ops/populate/reduce_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/reduce_populate.cc rename to mindspore/lite/src/common/ops/populate/reduce_populate.cc index 014a18724c2..da4d39175f4 100644 --- a/mindspore/lite/src/ops/populate/reduce_populate.cc +++ b/mindspore/lite/src/common/ops/populate/reduce_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/reduce_parameter.h" using mindspore::schema::PrimitiveType_ReduceFusion; diff --git a/mindspore/lite/src/ops/populate/reduce_scatter.cc b/mindspore/lite/src/common/ops/populate/reduce_scatter.cc similarity index 97% rename from mindspore/lite/src/ops/populate/reduce_scatter.cc rename to mindspore/lite/src/common/ops/populate/reduce_scatter.cc index 8c63f1db47b..5e666f1c302 100644 --- a/mindspore/lite/src/ops/populate/reduce_scatter.cc +++ b/mindspore/lite/src/common/ops/populate/reduce_scatter.cc @@ -17,7 +17,7 @@ #include "schema/ops_generated.h" #include "schema/model_generated.h" #include "nnacl/reduce_scatter_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_ReduceScatter; diff --git a/mindspore/lite/src/ops/populate/reshape_populate.cc b/mindspore/lite/src/common/ops/populate/reshape_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/reshape_populate.cc rename to mindspore/lite/src/common/ops/populate/reshape_populate.cc index c2026c99296..d34bcb8a302 100644 --- a/mindspore/lite/src/ops/populate/reshape_populate.cc +++ b/mindspore/lite/src/common/ops/populate/reshape_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/reshape_parameter.h" using mindspore::schema::PrimitiveType_Reshape; diff --git a/mindspore/lite/src/ops/populate/resize_populate.cc b/mindspore/lite/src/common/ops/populate/resize_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/resize_populate.cc rename to mindspore/lite/src/common/ops/populate/resize_populate.cc index ee05a207313..0d8ae5daf71 100644 --- a/mindspore/lite/src/ops/populate/resize_populate.cc +++ b/mindspore/lite/src/common/ops/populate/resize_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/resize_parameter.h" using mindspore::schema::PrimitiveType_Resize; diff --git a/mindspore/lite/src/ops/populate/reverse_populate.cc b/mindspore/lite/src/common/ops/populate/reverse_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/reverse_populate.cc rename to mindspore/lite/src/common/ops/populate/reverse_populate.cc index 3fc31acd874..14343d22837 100644 --- a/mindspore/lite/src/ops/populate/reverse_populate.cc +++ b/mindspore/lite/src/common/ops/populate/reverse_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/reverse_fp32.h" using mindspore::schema::PrimitiveType_ReverseV2; diff --git a/mindspore/lite/src/ops/populate/reverse_sequence_populate.cc b/mindspore/lite/src/common/ops/populate/reverse_sequence_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/reverse_sequence_populate.cc rename to mindspore/lite/src/common/ops/populate/reverse_sequence_populate.cc index 5c3bb80434d..761457d6dd8 100644 --- a/mindspore/lite/src/ops/populate/reverse_sequence_populate.cc +++ b/mindspore/lite/src/common/ops/populate/reverse_sequence_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/reverse_sequence_parameter.h" using mindspore::schema::PrimitiveType_ReverseSequence; diff --git a/mindspore/lite/src/ops/populate/roi_pooling_populate.cc b/mindspore/lite/src/common/ops/populate/roi_pooling_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/roi_pooling_populate.cc rename to mindspore/lite/src/common/ops/populate/roi_pooling_populate.cc index faf8e654f56..cf1f9d6fcf9 100644 --- a/mindspore/lite/src/ops/populate/roi_pooling_populate.cc +++ b/mindspore/lite/src/common/ops/populate/roi_pooling_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/roi_pooling_fp32.h" using mindspore::schema::PrimitiveType_ROIPooling; diff --git a/mindspore/lite/src/ops/populate/scale_populate.cc b/mindspore/lite/src/common/ops/populate/scale_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/scale_populate.cc rename to mindspore/lite/src/common/ops/populate/scale_populate.cc index b1e4b937349..3cee741a84f 100644 --- a/mindspore/lite/src/ops/populate/scale_populate.cc +++ b/mindspore/lite/src/common/ops/populate/scale_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/scale.h" using mindspore::schema::PrimitiveType_ScaleFusion; diff --git a/mindspore/lite/src/ops/populate/scatter_nd_populate.cc b/mindspore/lite/src/common/ops/populate/scatter_nd_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/scatter_nd_populate.cc rename to mindspore/lite/src/common/ops/populate/scatter_nd_populate.cc index 2ffdad03640..47c41e01e21 100644 --- a/mindspore/lite/src/ops/populate/scatter_nd_populate.cc +++ b/mindspore/lite/src/common/ops/populate/scatter_nd_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/base/scatter_nd_base.h" using mindspore::schema::PrimitiveType_ScatterNd; diff --git a/mindspore/lite/src/ops/populate/scatter_nd_update_populate.cc b/mindspore/lite/src/common/ops/populate/scatter_nd_update_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/scatter_nd_update_populate.cc rename to mindspore/lite/src/common/ops/populate/scatter_nd_update_populate.cc index 0ef1d032e02..af11a254c9c 100644 --- a/mindspore/lite/src/ops/populate/scatter_nd_update_populate.cc +++ b/mindspore/lite/src/common/ops/populate/scatter_nd_update_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/base/scatter_nd_base.h" using mindspore::schema::PrimitiveType_ScatterNdUpdate; diff --git a/mindspore/lite/src/ops/populate/select_populate.cc b/mindspore/lite/src/common/ops/populate/select_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/select_populate.cc rename to mindspore/lite/src/common/ops/populate/select_populate.cc index eb3e79812a5..6d833927a10 100644 --- a/mindspore/lite/src/ops/populate/select_populate.cc +++ b/mindspore/lite/src/common/ops/populate/select_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_Select; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/shape_populate.cc b/mindspore/lite/src/common/ops/populate/shape_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/shape_populate.cc rename to mindspore/lite/src/common/ops/populate/shape_populate.cc index 3e9c69b87dd..3f6c5730879 100644 --- a/mindspore/lite/src/ops/populate/shape_populate.cc +++ b/mindspore/lite/src/common/ops/populate/shape_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/log_adapter.h" #include "src/tensor.h" using mindspore::schema::PrimitiveType_Shape; diff --git a/mindspore/lite/src/ops/populate/size_populate.cc b/mindspore/lite/src/common/ops/populate/size_populate.cc similarity index 88% rename from mindspore/lite/src/ops/populate/size_populate.cc rename to mindspore/lite/src/common/ops/populate/size_populate.cc index 3b3516b3b4c..8b31ee4793b 100644 --- a/mindspore/lite/src/ops/populate/size_populate.cc +++ b/mindspore/lite/src/common/ops/populate/size_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" using mindspore::schema::PrimitiveType_Size; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/slice_populate.cc b/mindspore/lite/src/common/ops/populate/slice_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/slice_populate.cc rename to mindspore/lite/src/common/ops/populate/slice_populate.cc index d4ad8d95b25..db024664cb5 100644 --- a/mindspore/lite/src/ops/populate/slice_populate.cc +++ b/mindspore/lite/src/common/ops/populate/slice_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/slice_parameter.h" using mindspore::schema::PrimitiveType_SliceFusion; diff --git a/mindspore/lite/src/ops/populate/softmax_populate.cc b/mindspore/lite/src/common/ops/populate/softmax_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/softmax_populate.cc rename to mindspore/lite/src/common/ops/populate/softmax_populate.cc index 4e518d8b807..66ccdc3bf70 100644 --- a/mindspore/lite/src/ops/populate/softmax_populate.cc +++ b/mindspore/lite/src/common/ops/populate/softmax_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/softmax_parameter.h" using mindspore::schema::PrimitiveType_Softmax; diff --git a/mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc b/mindspore/lite/src/common/ops/populate/space_to_batch_nd_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc rename to mindspore/lite/src/common/ops/populate/space_to_batch_nd_populate.cc index 937bd3d8b74..bc7b279984a 100644 --- a/mindspore/lite/src/ops/populate/space_to_batch_nd_populate.cc +++ b/mindspore/lite/src/common/ops/populate/space_to_batch_nd_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/space_to_batch_fp32.h" using mindspore::schema::PrimitiveType_SpaceToBatchND; diff --git a/mindspore/lite/src/ops/populate/space_to_batch_populate.cc b/mindspore/lite/src/common/ops/populate/space_to_batch_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/space_to_batch_populate.cc rename to mindspore/lite/src/common/ops/populate/space_to_batch_populate.cc index 021666e24fb..4aa9f368223 100644 --- a/mindspore/lite/src/ops/populate/space_to_batch_populate.cc +++ b/mindspore/lite/src/common/ops/populate/space_to_batch_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/space_to_batch_fp32.h" using mindspore::schema::PrimitiveType_SpaceToBatch; diff --git a/mindspore/lite/src/ops/populate/space_to_depth_populate.cc b/mindspore/lite/src/common/ops/populate/space_to_depth_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/space_to_depth_populate.cc rename to mindspore/lite/src/common/ops/populate/space_to_depth_populate.cc index 788ec9b5137..85c4a68b283 100644 --- a/mindspore/lite/src/ops/populate/space_to_depth_populate.cc +++ b/mindspore/lite/src/common/ops/populate/space_to_depth_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/space_to_depth_parameter.h" using mindspore::schema::PrimitiveType_SpaceToDepth; diff --git a/mindspore/lite/src/ops/populate/sparse_softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/common/ops/populate/sparse_softmax_cross_entropy_with_logits.cc similarity index 96% rename from mindspore/lite/src/ops/populate/sparse_softmax_cross_entropy_with_logits.cc rename to mindspore/lite/src/common/ops/populate/sparse_softmax_cross_entropy_with_logits.cc index 8308b1e48f5..305d2e21070 100644 --- a/mindspore/lite/src/ops/populate/sparse_softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/common/ops/populate/sparse_softmax_cross_entropy_with_logits.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32_grad/softmax_grad.h" using mindspore::schema::PrimitiveType_SparseSoftmaxCrossEntropyWithLogits; diff --git a/mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc b/mindspore/lite/src/common/ops/populate/sparse_to_dense_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc rename to mindspore/lite/src/common/ops/populate/sparse_to_dense_populate.cc index 121387d6fe7..d4ac7f8e919 100644 --- a/mindspore/lite/src/ops/populate/sparse_to_dense_populate.cc +++ b/mindspore/lite/src/common/ops/populate/sparse_to_dense_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/sparse_to_dense_parameter.h" using mindspore::schema::PrimitiveType_SparseToDense; diff --git a/mindspore/lite/src/ops/populate/splice_populate.cc b/mindspore/lite/src/common/ops/populate/splice_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/splice_populate.cc rename to mindspore/lite/src/common/ops/populate/splice_populate.cc index 635fb1fdb16..1a19c359b0e 100644 --- a/mindspore/lite/src/ops/populate/splice_populate.cc +++ b/mindspore/lite/src/common/ops/populate/splice_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/op_base.h" #include "nnacl/splice_parameter.h" using mindspore::schema::PrimitiveType_Splice; diff --git a/mindspore/lite/src/ops/populate/split_populate.cc b/mindspore/lite/src/common/ops/populate/split_populate.cc similarity index 98% rename from mindspore/lite/src/ops/populate/split_populate.cc rename to mindspore/lite/src/common/ops/populate/split_populate.cc index a7e632acf6f..83e3e67f92f 100644 --- a/mindspore/lite/src/ops/populate/split_populate.cc +++ b/mindspore/lite/src/common/ops/populate/split_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/split_parameter.h" #include "nnacl/op_base.h" using mindspore::schema::PrimitiveType_Split; diff --git a/mindspore/lite/src/ops/populate/split_with_overlap_populate.cc b/mindspore/lite/src/common/ops/populate/split_with_overlap_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/split_with_overlap_populate.cc rename to mindspore/lite/src/common/ops/populate/split_with_overlap_populate.cc index 4973a3cfa29..c44027628c2 100644 --- a/mindspore/lite/src/ops/populate/split_with_overlap_populate.cc +++ b/mindspore/lite/src/common/ops/populate/split_with_overlap_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/split_parameter.h" using mindspore::schema::PrimitiveType_SplitWithOverlap; diff --git a/mindspore/lite/src/ops/populate/squeeze_populate.cc b/mindspore/lite/src/common/ops/populate/squeeze_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/squeeze_populate.cc rename to mindspore/lite/src/common/ops/populate/squeeze_populate.cc index cc9cb278f12..8767f130f58 100644 --- a/mindspore/lite/src/ops/populate/squeeze_populate.cc +++ b/mindspore/lite/src/common/ops/populate/squeeze_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/squeeze_parameter.h" using mindspore::schema::PrimitiveType_Squeeze; diff --git a/mindspore/lite/src/ops/populate/stack_populate.cc b/mindspore/lite/src/common/ops/populate/stack_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/stack_populate.cc rename to mindspore/lite/src/common/ops/populate/stack_populate.cc index ff8f30b8f17..57bb5652bf7 100644 --- a/mindspore/lite/src/ops/populate/stack_populate.cc +++ b/mindspore/lite/src/common/ops/populate/stack_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/stack_parameter.h" using mindspore::schema::PrimitiveType_Stack; diff --git a/mindspore/lite/src/ops/populate/strided_slice_grad_populate.cc b/mindspore/lite/src/common/ops/populate/strided_slice_grad_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/strided_slice_grad_populate.cc rename to mindspore/lite/src/common/ops/populate/strided_slice_grad_populate.cc index 003b0c2a386..d207f7e949d 100644 --- a/mindspore/lite/src/ops/populate/strided_slice_grad_populate.cc +++ b/mindspore/lite/src/common/ops/populate/strided_slice_grad_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/strided_slice_parameter.h" using mindspore::schema::PrimitiveType_StridedSliceGrad; diff --git a/mindspore/lite/src/ops/populate/strided_slice_populate.cc b/mindspore/lite/src/common/ops/populate/strided_slice_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/strided_slice_populate.cc rename to mindspore/lite/src/common/ops/populate/strided_slice_populate.cc index e5892c47eba..6632d15993e 100644 --- a/mindspore/lite/src/ops/populate/strided_slice_populate.cc +++ b/mindspore/lite/src/common/ops/populate/strided_slice_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/strided_slice_populate.h" +#include "src/common/ops/populate/strided_slice_populate.h" using mindspore::schema::PrimitiveType_StridedSlice; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/strided_slice_populate.h b/mindspore/lite/src/common/ops/populate/strided_slice_populate.h similarity index 94% rename from mindspore/lite/src/ops/populate/strided_slice_populate.h rename to mindspore/lite/src/common/ops/populate/strided_slice_populate.h index bebc3ad647f..200e49dde77 100644 --- a/mindspore/lite/src/ops/populate/strided_slice_populate.h +++ b/mindspore/lite/src/common/ops/populate/strided_slice_populate.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_OPS_POPULATE_STRIDED_SLICE_POPULATE_H_ #define MINDSPORE_LITE_SRC_OPS_POPULATE_STRIDED_SLICE_POPULATE_H_ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/strided_slice_parameter.h" namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/string/custom_extract_features_populate.cc b/mindspore/lite/src/common/ops/populate/string/custom_extract_features_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/string/custom_extract_features_populate.cc rename to mindspore/lite/src/common/ops/populate/string/custom_extract_features_populate.cc index b6ac687730a..4bac13d93b5 100644 --- a/mindspore/lite/src/ops/populate/string/custom_extract_features_populate.cc +++ b/mindspore/lite/src/common/ops/populate/string/custom_extract_features_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_CustomExtractFeatures; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/string/custom_normalize_populate.cc b/mindspore/lite/src/common/ops/populate/string/custom_normalize_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/string/custom_normalize_populate.cc rename to mindspore/lite/src/common/ops/populate/string/custom_normalize_populate.cc index 4e24d8a6dfe..2f2aeb9cc22 100644 --- a/mindspore/lite/src/ops/populate/string/custom_normalize_populate.cc +++ b/mindspore/lite/src/common/ops/populate/string/custom_normalize_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_CustomNormalize; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/string/custom_predict_populate.cc b/mindspore/lite/src/common/ops/populate/string/custom_predict_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/string/custom_predict_populate.cc rename to mindspore/lite/src/common/ops/populate/string/custom_predict_populate.cc index 5065dbabe57..536b2cc2c48 100644 --- a/mindspore/lite/src/ops/populate/string/custom_predict_populate.cc +++ b/mindspore/lite/src/common/ops/populate/string/custom_predict_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/predict_parameter.h" using mindspore::schema::PrimitiveType_CustomPredict; diff --git a/mindspore/lite/src/ops/populate/string/hashtable_lookup_populate.cc b/mindspore/lite/src/common/ops/populate/string/hashtable_lookup_populate.cc similarity index 95% rename from mindspore/lite/src/ops/populate/string/hashtable_lookup_populate.cc rename to mindspore/lite/src/common/ops/populate/string/hashtable_lookup_populate.cc index 006a0825091..5a17e5c79dc 100644 --- a/mindspore/lite/src/ops/populate/string/hashtable_lookup_populate.cc +++ b/mindspore/lite/src/common/ops/populate/string/hashtable_lookup_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_HashtableLookup; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/string/lsh_projection_populate.cc b/mindspore/lite/src/common/ops/populate/string/lsh_projection_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/string/lsh_projection_populate.cc rename to mindspore/lite/src/common/ops/populate/string/lsh_projection_populate.cc index 4b465a4e695..05a1517ea38 100644 --- a/mindspore/lite/src/ops/populate/string/lsh_projection_populate.cc +++ b/mindspore/lite/src/common/ops/populate/string/lsh_projection_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "nnacl/lsh_projection_parameter.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_LshProjection; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/string/skip_gram_populate.cc b/mindspore/lite/src/common/ops/populate/string/skip_gram_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/string/skip_gram_populate.cc rename to mindspore/lite/src/common/ops/populate/string/skip_gram_populate.cc index f911592cf63..3baf95370fa 100644 --- a/mindspore/lite/src/ops/populate/string/skip_gram_populate.cc +++ b/mindspore/lite/src/common/ops/populate/string/skip_gram_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/skip_gram_parameter.h" using mindspore::schema::PrimitiveType_SkipGram; diff --git a/mindspore/lite/src/ops/populate/sub_populate.cc b/mindspore/lite/src/common/ops/populate/sub_populate.cc similarity index 92% rename from mindspore/lite/src/ops/populate/sub_populate.cc rename to mindspore/lite/src/common/ops/populate/sub_populate.cc index a898cb7ae0e..2f8f4cb3ec8 100644 --- a/mindspore/lite/src/ops/populate/sub_populate.cc +++ b/mindspore/lite/src/common/ops/populate/sub_populate.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/arithmetic.h" -#include "src/ops/populate/arithmetic_populate.h" +#include "src/common/ops/populate/arithmetic_populate.h" using mindspore::schema::PrimitiveType_SubFusion; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/tile_populate.cc b/mindspore/lite/src/common/ops/populate/tile_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/tile_populate.cc rename to mindspore/lite/src/common/ops/populate/tile_populate.cc index 2940cb1600b..68d792cf56e 100644 --- a/mindspore/lite/src/ops/populate/tile_populate.cc +++ b/mindspore/lite/src/common/ops/populate/tile_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/base/tile_base.h" using mindspore::schema::PrimitiveType_TileFusion; diff --git a/mindspore/lite/src/ops/populate/topk_populate.cc b/mindspore/lite/src/common/ops/populate/topk_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/topk_populate.cc rename to mindspore/lite/src/common/ops/populate/topk_populate.cc index a4331391f0f..9c700af5a97 100644 --- a/mindspore/lite/src/ops/populate/topk_populate.cc +++ b/mindspore/lite/src/common/ops/populate/topk_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/topk_fp32.h" using mindspore::schema::PrimitiveType_TopKFusion; diff --git a/mindspore/lite/src/ops/populate/transpose_populate.cc b/mindspore/lite/src/common/ops/populate/transpose_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/transpose_populate.cc rename to mindspore/lite/src/common/ops/populate/transpose_populate.cc index 9be6143c6f5..4017b2b1782 100644 --- a/mindspore/lite/src/ops/populate/transpose_populate.cc +++ b/mindspore/lite/src/common/ops/populate/transpose_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/transpose.h" using mindspore::schema::PrimitiveType_Transpose; diff --git a/mindspore/lite/src/ops/populate/uniform_real_populate.cc b/mindspore/lite/src/common/ops/populate/uniform_real_populate.cc similarity index 93% rename from mindspore/lite/src/ops/populate/uniform_real_populate.cc rename to mindspore/lite/src/common/ops/populate/uniform_real_populate.cc index 229163f15b9..d901852aedb 100644 --- a/mindspore/lite/src/ops/populate/uniform_real_populate.cc +++ b/mindspore/lite/src/common/ops/populate/uniform_real_populate.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" #include "nnacl/random_parameter.h" using mindspore::schema::PrimitiveType_UniformReal; diff --git a/mindspore/lite/src/ops/populate/unique_populate.cc b/mindspore/lite/src/common/ops/populate/unique_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/unique_populate.cc rename to mindspore/lite/src/common/ops/populate/unique_populate.cc index df0861e53e6..456f1c7910f 100644 --- a/mindspore/lite/src/ops/populate/unique_populate.cc +++ b/mindspore/lite/src/common/ops/populate/unique_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/unique_fp32.h" using mindspore::schema::PrimitiveType_Unique; diff --git a/mindspore/lite/src/ops/populate/unsorted_segment_sum_populate.cc b/mindspore/lite/src/common/ops/populate/unsorted_segment_sum_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/unsorted_segment_sum_populate.cc rename to mindspore/lite/src/common/ops/populate/unsorted_segment_sum_populate.cc index f39fc1c7b10..486ad516efc 100644 --- a/mindspore/lite/src/ops/populate/unsorted_segment_sum_populate.cc +++ b/mindspore/lite/src/common/ops/populate/unsorted_segment_sum_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" using mindspore::schema::PrimitiveType_UnsortedSegmentSum; namespace mindspore { diff --git a/mindspore/lite/src/ops/populate/unsqueeze_populate.cc b/mindspore/lite/src/common/ops/populate/unsqueeze_populate.cc similarity index 97% rename from mindspore/lite/src/ops/populate/unsqueeze_populate.cc rename to mindspore/lite/src/common/ops/populate/unsqueeze_populate.cc index a92036a0d2c..5feafc4cfb5 100644 --- a/mindspore/lite/src/ops/populate/unsqueeze_populate.cc +++ b/mindspore/lite/src/common/ops/populate/unsqueeze_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/unsqueeze_parameter.h" using mindspore::schema::PrimitiveType_Unsqueeze; diff --git a/mindspore/lite/src/ops/populate/unstack_populate.cc b/mindspore/lite/src/common/ops/populate/unstack_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/unstack_populate.cc rename to mindspore/lite/src/common/ops/populate/unstack_populate.cc index 851197a0839..834f4f8007e 100644 --- a/mindspore/lite/src/ops/populate/unstack_populate.cc +++ b/mindspore/lite/src/common/ops/populate/unstack_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/unstack_parameter.h" using mindspore::schema::PrimitiveType_Unstack; diff --git a/mindspore/lite/src/ops/populate/where_populate.cc b/mindspore/lite/src/common/ops/populate/where_populate.cc similarity index 96% rename from mindspore/lite/src/ops/populate/where_populate.cc rename to mindspore/lite/src/common/ops/populate/where_populate.cc index acfa0fa7890..48952038408 100644 --- a/mindspore/lite/src/ops/populate/where_populate.cc +++ b/mindspore/lite/src/common/ops/populate/where_populate.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/where_parameter.h" using mindspore::schema::PrimitiveType_Where; diff --git a/mindspore/lite/src/ops/schema_register.h b/mindspore/lite/src/common/ops/schema_register.h similarity index 100% rename from mindspore/lite/src/ops/schema_register.h rename to mindspore/lite/src/common/ops/schema_register.h diff --git a/mindspore/lite/src/common/primitive_t_utils.cc b/mindspore/lite/src/common/primitive_t_utils.cc index a5bec542f79..ad4065620db 100644 --- a/mindspore/lite/src/common/primitive_t_utils.cc +++ b/mindspore/lite/src/common/primitive_t_utils.cc @@ -16,7 +16,7 @@ #include "src/common/primitive_t_utils.h" #ifdef PRIMITIVE_WRITEABLE -#include "src/ops/ops_utils.h" +#include "src/common/ops/ops_utils.h" #include "ops/primitive_c.h" namespace mindspore { diff --git a/mindspore/lite/src/common/primitive_t_utils.h b/mindspore/lite/src/common/primitive_t_utils.h index e62a89a996c..7fe3e781882 100644 --- a/mindspore/lite/src/common/primitive_t_utils.h +++ b/mindspore/lite/src/common/primitive_t_utils.h @@ -19,7 +19,7 @@ #ifdef PRIMITIVE_WRITEABLE #include #include "schema/inner/model_generated.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "ops/base_operator.h" namespace mindspore { diff --git a/mindspore/lite/src/common/tensor_util.h b/mindspore/lite/src/common/tensor_util.h index c4637e46dc5..2e775f40f93 100644 --- a/mindspore/lite/src/common/tensor_util.h +++ b/mindspore/lite/src/common/tensor_util.h @@ -25,7 +25,7 @@ #include "src/tensorlist.h" #include "nnacl/infer/common_infer.h" #include "nnacl/tensorlist_c_utils.h" -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/control_flow/actor/entrance_actor.h b/mindspore/lite/src/control_flow/actor/entrance_actor.h index f41eddc813d..8c49c73ab20 100644 --- a/mindspore/lite/src/control_flow/actor/entrance_actor.h +++ b/mindspore/lite/src/control_flow/actor/entrance_actor.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_mindrt.h" +#include "src/runtime/lite_mindrt.h" namespace mindspore::lite { class LiteEntranceOpActor : public LiteOpActor { diff --git a/mindspore/lite/src/control_flow/actor/exit_actor.cc b/mindspore/lite/src/control_flow/actor/exit_actor.cc index 1e2d8641ab0..98dc321c044 100644 --- a/mindspore/lite/src/control_flow/actor/exit_actor.cc +++ b/mindspore/lite/src/control_flow/actor/exit_actor.cc @@ -17,7 +17,7 @@ #include "src/control_flow/actor/exit_actor.h" #include #include "src/control_flow/kernel/exit_subgraph_kernel.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include "src/common/tensor_util.h" namespace { diff --git a/mindspore/lite/src/control_flow/actor/exit_actor.h b/mindspore/lite/src/control_flow/actor/exit_actor.h index 265e119485f..7560a49126d 100644 --- a/mindspore/lite/src/control_flow/actor/exit_actor.h +++ b/mindspore/lite/src/control_flow/actor/exit_actor.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_mindrt.h" +#include "src/runtime/lite_mindrt.h" namespace mindspore::lite { class LiteExitOpActor : public LiteOpActor { diff --git a/mindspore/lite/src/control_flow/actor/switch_actor.cc b/mindspore/lite/src/control_flow/actor/switch_actor.cc index 2f75555b1b8..f331d343537 100644 --- a/mindspore/lite/src/control_flow/actor/switch_actor.cc +++ b/mindspore/lite/src/control_flow/actor/switch_actor.cc @@ -18,7 +18,7 @@ #include #include #include "mindrt/include/mindrt.hpp" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include "src/common/tensor_util.h" #include "src/runtime/inner_allocator.h" #ifdef ENABLE_FP16 diff --git a/mindspore/lite/src/control_flow/actor/switch_actor.h b/mindspore/lite/src/control_flow/actor/switch_actor.h index 36a98cdb713..d12bffebbc4 100644 --- a/mindspore/lite/src/control_flow/actor/switch_actor.h +++ b/mindspore/lite/src/control_flow/actor/switch_actor.h @@ -22,7 +22,7 @@ #include #include #include -#include "src/lite_mindrt.h" +#include "src/runtime/lite_mindrt.h" namespace mindspore::lite { class LiteSwitchOpActor : public LiteOpActor { diff --git a/mindspore/lite/src/control_flow/control_actor_creator.cc b/mindspore/lite/src/control_flow/control_actor_creator.cc index 5d4464c375c..08e14f20f96 100644 --- a/mindspore/lite/src/control_flow/control_actor_creator.cc +++ b/mindspore/lite/src/control_flow/control_actor_creator.cc @@ -15,7 +15,7 @@ */ #include "src/control_flow/control_actor_creator.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #ifndef CONTROLFLOW_TENSORLIST_CLIP #include "src/control_flow/actor/switch_actor.h" #include "src/control_flow/actor/entrance_actor.h" diff --git a/mindspore/lite/src/control_flow/control_actor_creator.h b/mindspore/lite/src/control_flow/control_actor_creator.h index cc3f6a29c91..1de91d64666 100644 --- a/mindspore/lite/src/control_flow/control_actor_creator.h +++ b/mindspore/lite/src/control_flow/control_actor_creator.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_SRC_CONTROLFLOW_CONTROL_ACTOR_CREATOR_H_ #include -#include "src/lite_kernel.h" -#include "src/lite_mindrt.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/lite_mindrt.h" namespace mindspore::lite { std::shared_ptr CreateActor(kernel::KernelExec *kernel, lite::InnerContext *ctx); diff --git a/mindspore/lite/src/control_flow/control_flow_scheduler.cc b/mindspore/lite/src/control_flow/control_flow_scheduler.cc index cf8c9089765..61212322097 100644 --- a/mindspore/lite/src/control_flow/control_flow_scheduler.cc +++ b/mindspore/lite/src/control_flow/control_flow_scheduler.cc @@ -18,7 +18,7 @@ #ifndef CONTROLFLOW_TENSORLIST_CLIP #include #include -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include "src/runtime/kernel/cpu/base/partial_fusion.h" #include "nnacl/call_parameter.h" #include "src/control_flow/kernel/exit_subgraph_kernel.h" diff --git a/mindspore/lite/src/control_flow/control_flow_scheduler.h b/mindspore/lite/src/control_flow/control_flow_scheduler.h index d2ae72acde1..45e36799a72 100644 --- a/mindspore/lite/src/control_flow/control_flow_scheduler.h +++ b/mindspore/lite/src/control_flow/control_flow_scheduler.h @@ -27,9 +27,9 @@ #include "src/common/utils.h" #include "src/common/log_util.h" #include "nnacl/op_base.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" #include "src/tensor.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/sub_graph_kernel.h" #include "include/model.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/control_flow/control_subgraph_creator.h b/mindspore/lite/src/control_flow/control_subgraph_creator.h index c933f1da903..02a086943fe 100644 --- a/mindspore/lite/src/control_flow/control_subgraph_creator.h +++ b/mindspore/lite/src/control_flow/control_subgraph_creator.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_LITE_SRC_CONTROLFLOW_CONTROL_SUBGRAPH_CREATOR_H_ #define MINDSPORE_LITE_SRC_CONTROLFLOW_CONTROL_SUBGRAPH_CREATOR_H_ -#include "src/lite_kernel.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::lite { kernel::SubGraphKernel *CreateControlSubgraph(const kernel::SubGraphType &type, kernel::LiteKernel *kernel); diff --git a/mindspore/lite/src/control_flow/kernel/entrance_subgraph_kernel.h b/mindspore/lite/src/control_flow/kernel/entrance_subgraph_kernel.h index ec3f28a5775..666934c69bc 100644 --- a/mindspore/lite/src/control_flow/kernel/entrance_subgraph_kernel.h +++ b/mindspore/lite/src/control_flow/kernel/entrance_subgraph_kernel.h @@ -22,12 +22,12 @@ #include #include #include -#include "src/kernel_exec.h" -#include "src/executor.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/executor.h" #include "src/common/log_adapter.h" #include "src/common/version_manager.h" -#include "src/cpu_info.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/cpu_info.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::kernel { class EntranceSubGraphKernel : public SubGraphKernel { diff --git a/mindspore/lite/src/control_flow/kernel/exit_subgraph_kernel.h b/mindspore/lite/src/control_flow/kernel/exit_subgraph_kernel.h index 571eb99e64b..a2ef43d6446 100644 --- a/mindspore/lite/src/control_flow/kernel/exit_subgraph_kernel.h +++ b/mindspore/lite/src/control_flow/kernel/exit_subgraph_kernel.h @@ -23,12 +23,12 @@ #include #include #include -#include "src/kernel_exec.h" -#include "src/executor.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/executor.h" #include "src/common/log_adapter.h" #include "src/common/version_manager.h" -#include "src/cpu_info.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/cpu_info.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::kernel { class ExitSubGraphKernel : public SubGraphKernel { diff --git a/mindspore/lite/src/control_flow/kernel/identity_kernel.cc b/mindspore/lite/src/control_flow/kernel/identity_kernel.cc index 07257efefe3..e75fafea1a5 100644 --- a/mindspore/lite/src/control_flow/kernel/identity_kernel.cc +++ b/mindspore/lite/src/control_flow/kernel/identity_kernel.cc @@ -16,7 +16,7 @@ #include "src/control_flow/kernel/identity_kernel.h" #include "src/tensor.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/common/tensor_util.h" #include "src/common/prim_inner.h" diff --git a/mindspore/lite/src/control_flow/kernel/identity_kernel.h b/mindspore/lite/src/control_flow/kernel/identity_kernel.h index d43a87428a9..fdcd1b2fd8a 100644 --- a/mindspore/lite/src/control_flow/kernel/identity_kernel.h +++ b/mindspore/lite/src/control_flow/kernel/identity_kernel.h @@ -23,12 +23,12 @@ #include #include #include -#include "src/lite_kernel.h" -#include "src/executor.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/executor.h" #include "src/common/log_adapter.h" #include "src/common/version_manager.h" -#include "src/cpu_info.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/cpu_info.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::kernel { // Identity kernel is used to update a reference to a tensor. This is useful in control flow model. diff --git a/mindspore/lite/src/expression/import.cc b/mindspore/lite/src/expression/import.cc index 8b2bbf9c8c5..b3c20839e9d 100644 --- a/mindspore/lite/src/expression/import.cc +++ b/mindspore/lite/src/expression/import.cc @@ -16,7 +16,7 @@ #include #include "src/expression/import.h" -#include "ops/populate/populate_register.h" +#include "common/ops/populate/populate_register.h" #include "src/expression/ops.h" #include "src/expression/ops/activation.h" #include "src/expression/ops/batchnorm.h" diff --git a/mindspore/lite/src/expression/net.cc b/mindspore/lite/src/expression/net.cc index e54acddcb22..4ca3c31a50c 100644 --- a/mindspore/lite/src/expression/net.cc +++ b/mindspore/lite/src/expression/net.cc @@ -16,7 +16,7 @@ #include "src/expression/net.h" #include -#include "src/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" #include "src/expression/ops.h" #include "src/expression/export.h" #include "src/expression/ops/addn.h" diff --git a/mindspore/lite/src/expression/node.cc b/mindspore/lite/src/expression/node.cc index 9c6a68511dd..e78d08eea70 100644 --- a/mindspore/lite/src/expression/node.cc +++ b/mindspore/lite/src/expression/node.cc @@ -22,7 +22,7 @@ #include "src/expression/export.h" #include "src/runtime/infer_manager.h" #include "src/common/utils.h" -#include "src/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/activation.cc b/mindspore/lite/src/expression/ops/activation.cc index b272a3b0512..c0d59864fc0 100644 --- a/mindspore/lite/src/expression/ops/activation.cc +++ b/mindspore/lite/src/expression/ops/activation.cc @@ -17,7 +17,7 @@ #include "nnacl/fp32/activation_fp32.h" #include "src/expression/import.h" #include "src/expression/ops.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/adam.cc b/mindspore/lite/src/expression/ops/adam.cc index 330f9071a06..2d28f07954b 100644 --- a/mindspore/lite/src/expression/ops/adam.cc +++ b/mindspore/lite/src/expression/ops/adam.cc @@ -23,7 +23,7 @@ #include "src/expression/ops/arithmetic.h" #include "nnacl/fp32_grad/optimizer.h" #include "include/api/net.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace NN { diff --git a/mindspore/lite/src/expression/ops/arithmetic.cc b/mindspore/lite/src/expression/ops/arithmetic.cc index 988c151b038..41f9a21f74b 100644 --- a/mindspore/lite/src/expression/ops/arithmetic.cc +++ b/mindspore/lite/src/expression/ops/arithmetic.cc @@ -23,7 +23,7 @@ #include "src/expression/ops.h" #include "nnacl/arithmetic.h" #include "src/expression/import.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/batchnorm.cc b/mindspore/lite/src/expression/ops/batchnorm.cc index 6d6dfb0521a..b0684b07bb2 100644 --- a/mindspore/lite/src/expression/ops/batchnorm.cc +++ b/mindspore/lite/src/expression/ops/batchnorm.cc @@ -20,7 +20,7 @@ #include "nnacl/fp32_grad/batch_norm.h" #include "src/expression/import.h" #include "src/expression/ops.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/conv.cc b/mindspore/lite/src/expression/ops/conv.cc index aedbc34cf77..ff1d47756f7 100644 --- a/mindspore/lite/src/expression/ops/conv.cc +++ b/mindspore/lite/src/expression/ops/conv.cc @@ -23,7 +23,7 @@ #include "inner/model_generated.h" #include "src/expression/import.h" #include "src/expression/ops.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/dense.cc b/mindspore/lite/src/expression/ops/dense.cc index 02624a708e3..0b338768373 100644 --- a/mindspore/lite/src/expression/ops/dense.cc +++ b/mindspore/lite/src/expression/ops/dense.cc @@ -23,7 +23,7 @@ #include "nnacl/matmul_parameter.h" #include "src/expression/import.h" #include "inner/model_generated.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/dropout.cc b/mindspore/lite/src/expression/ops/dropout.cc index e1c33638072..7aaf9c80d33 100644 --- a/mindspore/lite/src/expression/ops/dropout.cc +++ b/mindspore/lite/src/expression/ops/dropout.cc @@ -20,7 +20,7 @@ #include "inner/model_generated.h" #include "src/expression/import.h" #include "src/expression/ops.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/flatten.cc b/mindspore/lite/src/expression/ops/flatten.cc index 846a350f95b..4e6e6430b8d 100644 --- a/mindspore/lite/src/expression/ops/flatten.cc +++ b/mindspore/lite/src/expression/ops/flatten.cc @@ -20,7 +20,7 @@ #include "src/expression/import.h" #include "src/expression/ops.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" #include "nnacl/op_base.h" namespace mindspore { diff --git a/mindspore/lite/src/expression/ops/pooling.cc b/mindspore/lite/src/expression/ops/pooling.cc index ad23ee9d918..3278ae018da 100644 --- a/mindspore/lite/src/expression/ops/pooling.cc +++ b/mindspore/lite/src/expression/ops/pooling.cc @@ -17,7 +17,7 @@ #include "src/expression/ops/pooling.h" #include "src/expression/ops.h" #include "src/expression/import.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" #include "src/expression/ops/transpose.h" namespace mindspore { diff --git a/mindspore/lite/src/expression/ops/reduce.cc b/mindspore/lite/src/expression/ops/reduce.cc index d7527b3bdbc..ad433ac8242 100644 --- a/mindspore/lite/src/expression/ops/reduce.cc +++ b/mindspore/lite/src/expression/ops/reduce.cc @@ -23,7 +23,7 @@ #include "src/expression/ops_utils.h" #include "src/expression/import.h" #include "nnacl/reduce_parameter.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/expression/ops/softmax.cc b/mindspore/lite/src/expression/ops/softmax.cc index 7cbaebca57d..e90302a90b2 100644 --- a/mindspore/lite/src/expression/ops/softmax.cc +++ b/mindspore/lite/src/expression/ops/softmax.cc @@ -22,7 +22,7 @@ #include "src/expression/ops/reduce.h" #include "src/expression/ops/arithmetic.h" #include "src/expression/ops/transpose.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" #include "src/expression/ops.h" namespace mindspore { diff --git a/mindspore/lite/src/expression/ops/softmaxCE.cc b/mindspore/lite/src/expression/ops/softmaxCE.cc index facee1c15e4..dfb6bc4751f 100644 --- a/mindspore/lite/src/expression/ops/softmaxCE.cc +++ b/mindspore/lite/src/expression/ops/softmaxCE.cc @@ -16,7 +16,7 @@ #include "src/expression/ops/softmaxCE.h" #include "include/api/net.h" -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" #include "src/expression/ops/reduce.h" namespace mindspore { namespace NN { diff --git a/mindspore/lite/src/delegate/parameter_cache/cache_algorithm.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/cache_algorithm.h similarity index 100% rename from mindspore/lite/src/delegate/parameter_cache/cache_algorithm.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/cache_algorithm.h diff --git a/mindspore/lite/src/delegate/parameter_cache/cache_mem_base.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/cache_mem_base.h similarity index 100% rename from mindspore/lite/src/delegate/parameter_cache/cache_mem_base.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/cache_mem_base.h diff --git a/mindspore/lite/src/delegate/parameter_cache/embedding_cache.cc b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache.cc similarity index 97% rename from mindspore/lite/src/delegate/parameter_cache/embedding_cache.cc rename to mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache.cc index 2bbd20071b0..942a4524c6f 100644 --- a/mindspore/lite/src/delegate/parameter_cache/embedding_cache.cc +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/delegate/parameter_cache/embedding_cache.h" +#include "src/extendrt/delegate/parameter_cache/embedding_cache.h" #include #include #include @@ -22,9 +22,9 @@ #include #include "src/common/log_adapter.h" #include "include/errorcode.h" -#include "src/delegate/parameter_cache/gpu/gpu_cache_mem.h" -#include "src/delegate/parameter_cache/lfu_cache.h" -#include "src/delegate/parameter_cache/factory_mgr_base.h" +#include "src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.h" +#include "src/extendrt/delegate/parameter_cache/lfu_cache.h" +#include "src/extendrt/delegate/parameter_cache/factory_mgr_base.h" namespace { constexpr size_t kEmbeddingTensorShapeSize = 2; diff --git a/mindspore/lite/src/delegate/parameter_cache/embedding_cache.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache.h similarity index 96% rename from mindspore/lite/src/delegate/parameter_cache/embedding_cache.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache.h index 52f30fce339..1b2a83fbe3a 100644 --- a/mindspore/lite/src/delegate/parameter_cache/embedding_cache.h +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache.h @@ -22,8 +22,8 @@ #include "include/api/status.h" #include "include/api/data_type.h" #include "src/common/log_adapter.h" -#include "src/delegate/parameter_cache/cache_algorithm.h" -#include "src/delegate/parameter_cache/cache_mem_base.h" +#include "src/extendrt/delegate/parameter_cache/cache_algorithm.h" +#include "src/extendrt/delegate/parameter_cache/cache_mem_base.h" namespace mindspore { namespace cache { diff --git a/mindspore/lite/src/delegate/parameter_cache/embedding_cache_manager.cc b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache_manager.cc similarity index 98% rename from mindspore/lite/src/delegate/parameter_cache/embedding_cache_manager.cc rename to mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache_manager.cc index 82217e217c5..f4915244082 100644 --- a/mindspore/lite/src/delegate/parameter_cache/embedding_cache_manager.cc +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/delegate/parameter_cache/embedding_cache_manager.h" +#include "src/extendrt/delegate/parameter_cache/embedding_cache_manager.h" #include #include #include diff --git a/mindspore/lite/src/delegate/parameter_cache/embedding_cache_manager.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache_manager.h similarity index 90% rename from mindspore/lite/src/delegate/parameter_cache/embedding_cache_manager.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache_manager.h index c57d82ab6d4..ebf2259d4d5 100644 --- a/mindspore/lite/src/delegate/parameter_cache/embedding_cache_manager.h +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/embedding_cache_manager.h @@ -23,9 +23,9 @@ #include "include/api/kernel.h" #include "include/api/status.h" #include "include/api/data_type.h" -#include "src/delegate/parameter_cache/embedding_cache.h" -#include "src/delegate/parameter_cache/load_host_cache_model.h" -#include "src/delegate/tensorrt/distribution/distribution_base.h" +#include "src/extendrt/delegate/parameter_cache/embedding_cache.h" +#include "src/extendrt/delegate/parameter_cache/load_host_cache_model.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_base.h" namespace mindspore { namespace cache { diff --git a/mindspore/lite/src/delegate/parameter_cache/factory_mgr_base.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/factory_mgr_base.h similarity index 100% rename from mindspore/lite/src/delegate/parameter_cache/factory_mgr_base.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/factory_mgr_base.h diff --git a/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc b/mindspore/lite/src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.cc similarity index 96% rename from mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc rename to mindspore/lite/src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.cc index 4a4c57170bc..3e29ae4322b 100644 --- a/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/delegate/parameter_cache/gpu/gpu_cache_mem.h" +#include "src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.h" #include #include -#include "src/delegate/tensorrt/cuda_impl/hash.cuh" +#include "src/extendrt/delegate/tensorrt/cuda_impl/hash.cuh" #include "plugin/device/gpu/hal/device/cuda_driver.h" #include "src/common/log_adapter.h" -#include "src/delegate/parameter_cache/factory_mgr_base.h" +#include "src/extendrt/delegate/parameter_cache/factory_mgr_base.h" namespace mindspore { namespace cache { namespace gpu { diff --git a/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.h similarity index 96% rename from mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.h index 6c3dddf9de4..5a7f945da3e 100644 --- a/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.h +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/gpu/gpu_cache_mem.h @@ -19,7 +19,7 @@ #include #include -#include "src/delegate/parameter_cache/cache_mem_base.h" +#include "src/extendrt/delegate/parameter_cache/cache_mem_base.h" namespace mindspore { namespace cache { diff --git a/mindspore/lite/src/delegate/parameter_cache/lfu_cache.cc b/mindspore/lite/src/extendrt/delegate/parameter_cache/lfu_cache.cc similarity index 98% rename from mindspore/lite/src/delegate/parameter_cache/lfu_cache.cc rename to mindspore/lite/src/extendrt/delegate/parameter_cache/lfu_cache.cc index f0dd98d73d2..0b6e185b870 100644 --- a/mindspore/lite/src/delegate/parameter_cache/lfu_cache.cc +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/lfu_cache.cc @@ -16,8 +16,8 @@ #include #include #include "src/common/log_adapter.h" -#include "src/delegate/parameter_cache/lfu_cache.h" -#include "src/delegate/parameter_cache/factory_mgr_base.h" +#include "src/extendrt/delegate/parameter_cache/lfu_cache.h" +#include "src/extendrt/delegate/parameter_cache/factory_mgr_base.h" namespace mindspore { namespace cache { RET_COMMON_PRODUCT_REGISTRAR(std::string, cache::CacheAlgorithm, cache::LFUCacheAlgorithm, "lfu", LFUCacheAlgorithm); diff --git a/mindspore/lite/src/delegate/parameter_cache/lfu_cache.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/lfu_cache.h similarity index 96% rename from mindspore/lite/src/delegate/parameter_cache/lfu_cache.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/lfu_cache.h index 2ab8d33889b..b14cc6692e0 100644 --- a/mindspore/lite/src/delegate/parameter_cache/lfu_cache.h +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/lfu_cache.h @@ -22,7 +22,7 @@ #include #include #include "include/api/status.h" -#include "src/delegate/parameter_cache/cache_algorithm.h" +#include "src/extendrt/delegate/parameter_cache/cache_algorithm.h" namespace mindspore { namespace cache { class LFUCacheAlgorithm : public CacheAlgorithm { diff --git a/mindspore/lite/src/delegate/parameter_cache/load_host_cache_model.cc b/mindspore/lite/src/extendrt/delegate/parameter_cache/load_host_cache_model.cc similarity index 98% rename from mindspore/lite/src/delegate/parameter_cache/load_host_cache_model.cc rename to mindspore/lite/src/extendrt/delegate/parameter_cache/load_host_cache_model.cc index 228988bf583..35b3bdc9f8f 100644 --- a/mindspore/lite/src/delegate/parameter_cache/load_host_cache_model.cc +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/load_host_cache_model.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/delegate/parameter_cache/load_host_cache_model.h" +#include "src/extendrt/delegate/parameter_cache/load_host_cache_model.h" #include "src/common/log_adapter.h" #include "src/common/common.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/delegate/parameter_cache/load_host_cache_model.h b/mindspore/lite/src/extendrt/delegate/parameter_cache/load_host_cache_model.h similarity index 97% rename from mindspore/lite/src/delegate/parameter_cache/load_host_cache_model.h rename to mindspore/lite/src/extendrt/delegate/parameter_cache/load_host_cache_model.h index cb414bcb702..772caef17f1 100644 --- a/mindspore/lite/src/delegate/parameter_cache/load_host_cache_model.h +++ b/mindspore/lite/src/extendrt/delegate/parameter_cache/load_host_cache_model.h @@ -24,7 +24,7 @@ #include "include/api/types.h" #include "include/api/kernel.h" #include "include/api/delegate.h" -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" namespace mindspore { namespace cache { diff --git a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt b/mindspore/lite/src/extendrt/delegate/tensorrt/CMakeLists.txt similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/CMakeLists.txt rename to mindspore/lite/src/extendrt/delegate/tensorrt/CMakeLists.txt index 7769c213503..6662c176833 100644 --- a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/CMakeLists.txt @@ -41,7 +41,7 @@ file(GLOB TENSORRT_RUNTIME_SRC LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/op/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/cuda_impl/*.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../delegate_utils.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../../../runtime/delegate/delegate_utils.cc ) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../parameter_cache) diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/activation.cu b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/activation.cu similarity index 93% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/activation.cu rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/activation.cu index a2de71b7cc7..29c4424dea0 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/activation.cu +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/activation.cu @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/activation.cuh" +#include "src/extendrt/delegate/tensorrt/cuda_impl/activation.cuh" #include #include -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" template __global__ void SigmoidKernel(const T *input1, T *output, int element_cnt) { diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/activation.cuh b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/activation.cuh similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/activation.cuh rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/activation.cuh diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cast.cu b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cast.cu similarity index 94% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cast.cu rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cast.cu index 6c11e73f031..090236a211a 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cast.cu +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cast.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/cast.cuh" -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cast.cuh" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" // Generic cast template diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cast.cuh b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cast.cuh similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cast.cuh rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cast.cuh diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cublas_utils.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cublas_utils.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.cc index 20fc84c7119..bedd97a4d52 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cublas_utils.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/cublas_utils.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.h" namespace mindspore::lite { void Cublas2DTranspose(const float *in_addr, float *out_addr, const int *params, cublasHandle_t cublas_handle) { diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cublas_utils.h b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cublas_utils.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.h index ded81668130..0a2855ac428 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cublas_utils.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_CDUA_IMPL_CUBLAS_UTILS_H_ #include -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" #include "src/common/log_util.h" // cublas API error checking diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cuda_helper.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.cc similarity index 94% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cuda_helper.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.cc index ad9aeffd3eb..ecab6cec6dd 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cuda_helper.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" #include "src/common/log_util.h" CudaHelper &CudaHelper::GetInstance() { diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cuda_helper.h b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cuda_helper.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cudnn_utils.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.cc similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cudnn_utils.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.cc index e394c42d76e..87c2f880fe3 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cudnn_utils.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/cudnn_utils.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.h" #include namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cudnn_utils.h b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/cudnn_utils.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.h index 2e71363fe0d..74138fe2f8d 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/cudnn_utils.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.h @@ -19,7 +19,7 @@ #include #include -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" #include "src/common/log_util.h" #define CUDNN_CHECK_VOID(err) \ diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/equal.cu b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/equal.cu similarity index 91% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/equal.cu rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/equal.cu index 890b375b37a..d65c2129a20 100644 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/equal.cu +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/equal.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/equal.cuh" +#include "src/extendrt/delegate/tensorrt/cuda_impl/equal.cuh" #include -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" template __global__ void EqualKernel(const T *input1, const T *input2, T *output, int element_cnt) { diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/equal.cuh b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/equal.cuh similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/equal.cuh rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/equal.cuh diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/hash.cu b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/hash.cu similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/hash.cu rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/hash.cu index bb1b571f691..a2f19576abf 100755 --- a/mindspore/lite/src/delegate/tensorrt/cuda_impl/hash.cu +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/hash.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/cuda_impl/hash.cuh" -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/hash.cuh" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" template __global__ void HashSwapOut(const T *hash_table, T *swap_out_value, const int *swap_out_index, const int index_size, diff --git a/mindspore/lite/src/delegate/tensorrt/cuda_impl/hash.cuh b/mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/hash.cuh similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/cuda_impl/hash.cuh rename to mindspore/lite/src/extendrt/delegate/tensorrt/cuda_impl/hash.cuh diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base.cc similarity index 90% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_base.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base.cc index bb9e46e04d7..3fc43580f61 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/distribution/distribution_base.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_base.h" namespace mindspore::lite { int GetGPUGroupSize() { return 1; } diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base.h b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base.h similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_base.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base.h diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base_impl.cc similarity index 87% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base_impl.cc index 35a24c047e2..2a668207b8b 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_base_impl.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/distribution/distribution_base.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_base.h" #include #include #include #include "plugin/device/gpu/hal/device/distribution/collective_wrapper.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { int GetGPUGroupSize() { return GetGroupSize(NCCL_WORLD_GROUP); } diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective.cc similarity index 94% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective.cc index cc991643648..d664bf02ef9 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/distribution/distribution_collective.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_collective.h" namespace mindspore::lite { DistributionCollective::DistributionCollective() {} diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective.h b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective.h similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective.h index b3486b42a8d..ba67fd24613 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective.h @@ -19,7 +19,7 @@ #include #include "NvInfer.h" #include "schema/ops_types_generated.h" -#include "src/delegate/tensorrt/distribution/distribution_base.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_base.h" namespace mindspore::lite { class DistributionCollective { diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective_impl.cc similarity index 92% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective_impl.cc index 8b0736980f6..043a56d533a 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_collective_impl.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/distribution/distribution_collective.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_collective.h" #include #include #include #include "plugin/device/gpu/hal/device/distribution/collective_wrapper.h" -#include "src/delegate/tensorrt/distribution/distribution_utils.h" -#include "src/delegate/tensorrt/distribution/distribution_base.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_utils.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_base.h" namespace mindspore::lite { DistributionCollective::DistributionCollective() { diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_utils.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_utils.cc similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_utils.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_utils.cc index 83f5cdb2bea..73ee2430b76 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_utils.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/distribution/distribution_utils.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_utils.h" #include #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_utils.h b/mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_utils.h similarity index 100% rename from mindspore/lite/src/delegate/tensorrt/distribution/distribution_utils.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/distribution/distribution_utils.h diff --git a/mindspore/lite/src/delegate/tensorrt/op/activation_opt_plugin.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_opt_plugin.cc similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/op/activation_opt_plugin.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_opt_plugin.cc index 760dfb890ac..286d079d88c 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/activation_opt_plugin.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_opt_plugin.cc @@ -21,10 +21,10 @@ #include #include #include -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" #include "NvInferRuntimeCommon.h" -#include "src/delegate/tensorrt/op/activation_opt_plugin.h" -#include "src/delegate/tensorrt/cuda_impl/activation.cuh" +#include "src/extendrt/delegate/tensorrt/op/activation_opt_plugin.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/activation.cuh" namespace mindspore::lite { REGISTER_TENSORRT_PLUGIN(ActivationOptPluginCreater); diff --git a/mindspore/lite/src/delegate/tensorrt/op/activation_opt_plugin.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_opt_plugin.h similarity index 94% rename from mindspore/lite/src/delegate/tensorrt/op/activation_opt_plugin.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_opt_plugin.h index dd7b26846dc..138577280e0 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/activation_opt_plugin.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_opt_plugin.h @@ -18,9 +18,9 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_ACTIVATION_OPT_PLUGIN_H_ #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" -#include "src/delegate/tensorrt/cuda_impl/cudnn_utils.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cudnn_utils.h" namespace mindspore::lite { constexpr char *ACTIVATION_OPT_PLUGIN_NAME{"ActivationOptPlugin"}; diff --git a/mindspore/lite/src/delegate/tensorrt/op/activation_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/activation_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_tensorrt.cc index abb8e6185b3..7e1036f04f3 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/activation_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_tensorrt.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" #include #include #include -#include "src/delegate/tensorrt/op/cast_tensorrt.h" -#include "src/delegate/tensorrt/op/activation_opt_plugin.h" +#include "src/extendrt/delegate/tensorrt/op/cast_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/activation_opt_plugin.h" namespace mindspore::lite { int ActivationTensorRT::IsSupport(const schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/activation_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/activation_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_tensorrt.h index 297493dcc8e..ad364f48be6 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/activation_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/activation_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_ACTIVATION_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ActivationTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/allgather_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/allgather_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/allgather_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/allgather_tensorrt.cc index 4fbc3d46759..f686ae167a6 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/allgather_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/allgather_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/allgather_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/allgather_tensorrt.h" #include #include "NvInferRuntimeCommon.h" diff --git a/mindspore/lite/src/delegate/tensorrt/op/allgather_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/allgather_tensorrt.h similarity index 93% rename from mindspore/lite/src/delegate/tensorrt/op/allgather_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/allgather_tensorrt.h index 78c09a9db7a..4c567e5ff3c 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/allgather_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/allgather_tensorrt.h @@ -19,9 +19,9 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" -#include "src/delegate/tensorrt/distribution/distribution_collective.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_collective.h" namespace mindspore::lite { constexpr char *ALLGATHER_PLUGIN_NAME{"AllGatherPlugin"}; diff --git a/mindspore/lite/src/delegate/tensorrt/op/cast_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/cast_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/cast_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/cast_tensorrt.cc index 540b1ce18ff..14a4702f5cc 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/cast_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/cast_tensorrt.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/cast_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/cast_tensorrt.h" #include #include #include #include -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { REGISTER_TENSORRT_PLUGIN(CastPluginCreater); diff --git a/mindspore/lite/src/delegate/tensorrt/op/cast_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/cast_tensorrt.h similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/op/cast_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/cast_tensorrt.h index c85e0952634..1df731fae8a 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/cast_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/cast_tensorrt.h @@ -17,9 +17,9 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_CAST_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" -#include "src/delegate/tensorrt/cuda_impl/cast.cuh" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cast.cuh" namespace mindspore::lite { constexpr char *CAST_PLUGIN_NAME{"CastPluginCreater"}; diff --git a/mindspore/lite/src/delegate/tensorrt/op/concate_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/concate_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/concate_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/concate_tensorrt.cc index 1c0a416c16d..b1b8e2ced7a 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/concate_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/concate_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/concate_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/concate_tensorrt.h" #include namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/concate_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/concate_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/concate_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/concate_tensorrt.h index 058a56c8ec4..fdd26926a56 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/concate_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/concate_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_CONCATE_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ConcateTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/convolution_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/convolution_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/convolution_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/convolution_tensorrt.cc index 8d89bc6783a..3042afed34a 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/convolution_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/convolution_tensorrt.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/convolution_tensorrt.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/convolution_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" namespace mindspore::lite { constexpr int BIAS_INDEX = 2; diff --git a/mindspore/lite/src/delegate/tensorrt/op/convolution_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/convolution_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/convolution_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/convolution_tensorrt.h index 660f3303475..f87e2315a2e 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/convolution_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/convolution_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_TENSORRT_OP_CONVOLUTION_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ConvolutionTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/deconvolution_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/deconvolution_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.cc index 368ae4f79d5..d5f8becb52b 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/deconvolution_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/deconvolution_tensorrt.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" #include "nnacl/pack.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/deconvolution_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/deconvolution_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.h index dd4ec04beb9..24b32a437db 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/deconvolution_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/deconvolution_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_TENSORRT_OP_DECONVOLUTION_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class DeconvolutionTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/elementwise_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/elementwise_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.cc index 8e3ec148443..2694103ec36 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/elementwise_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/elementwise_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" namespace mindspore::lite { int ElementWiseTensorRT::IsSupport(const schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/elementwise_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/elementwise_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.h index 2e197689016..7337bfb92e4 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/elementwise_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/elementwise_tensorrt.h @@ -18,7 +18,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ElementWiseTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/equal_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/equal_tensorrt.cc similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/equal_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/equal_tensorrt.cc index 4e7982b62c2..5d1add4a24f 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/equal_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/equal_tensorrt.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/equal_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/equal_tensorrt.h" #include #include #include -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" #include "NvInferRuntimeCommon.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/equal_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/equal_tensorrt.h similarity index 93% rename from mindspore/lite/src/delegate/tensorrt/op/equal_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/equal_tensorrt.h index 0c554b49c14..a20a375f1ed 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/equal_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/equal_tensorrt.h @@ -17,9 +17,9 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_EQUAL_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" -#include "src/delegate/tensorrt/cuda_impl/equal.cuh" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/equal.cuh" namespace mindspore::lite { constexpr char *EQUAL_PLUGIN_NAME{"EqualPlugin"}; diff --git a/mindspore/lite/src/delegate/tensorrt/op/fullyconnected_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.cc similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/op/fullyconnected_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.cc index 53741944c28..3d562c0af8e 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/fullyconnected_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/fullyconnected_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" namespace mindspore::lite { constexpr int BIAS_INDEX = 2; int FullyConnectedTensorRT::IsSupport(const mindspore::schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/fullyconnected_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/fullyconnected_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.h index b9c0ed12c33..b326cf8867b 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/fullyconnected_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/fullyconnected_tensorrt.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class FullyConnectedTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/gather_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/gather_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/gather_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/gather_tensorrt.cc index a318cee579c..3169373ae81 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/gather_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/gather_tensorrt.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/gather_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/gather_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { constexpr int AXIS_INDEX = 2; diff --git a/mindspore/lite/src/delegate/tensorrt/op/gather_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/gather_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/gather_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/gather_tensorrt.h index 7a154298313..1343f639c7b 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/gather_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/gather_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_GATHER_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class GatherTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/lstm_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/lstm_tensorrt.cc similarity index 99% rename from mindspore/lite/src/delegate/tensorrt/op/lstm_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/lstm_tensorrt.cc index 9866f698254..ab731c35b13 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/lstm_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/lstm_tensorrt.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/lstm_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/op/lstm_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" namespace mindspore::lite { int LSTMTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/lstm_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/lstm_tensorrt.h similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/lstm_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/lstm_tensorrt.h index dbb3dd043ca..20fe9f96b7d 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/lstm_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/lstm_tensorrt.h @@ -18,7 +18,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { constexpr int INPUT_TENSOR_SIZE = 6; diff --git a/mindspore/lite/src/delegate/tensorrt/op/matmul_opt_plugin.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/matmul_opt_plugin.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.cc index aeaed85b860..8023243ad74 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/matmul_opt_plugin.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/matmul_opt_plugin.h" +#include "src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.h" #include #include #include #include -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/cuda_impl/cuda_helper.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cuda_helper.h" #include "NvInferRuntimeCommon.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/matmul_opt_plugin.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.h similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/op/matmul_opt_plugin.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.h index f840e9077d0..e79c9806843 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/matmul_opt_plugin.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.h @@ -17,9 +17,9 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_MATMUL_OPT_PLUGIN_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" -#include "src/delegate/tensorrt/cuda_impl/cublas_utils.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.h" namespace mindspore::lite { constexpr char *MATMUL_OPT_PLUGIN_NAME{"MatmulOptPlugin"}; diff --git a/mindspore/lite/src/delegate/tensorrt/op/matmul_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/matmul_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_tensorrt.cc index d067a4da0f7..7e86a2b5f43 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/matmul_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_tensorrt.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/matmul_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/matmul_tensorrt.h" #include -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" -#include "src/delegate/tensorrt/op/matmul_opt_plugin.h" -#include "src/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/matmul_opt_plugin.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" namespace mindspore::lite { MatMulTensorRT::~MatMulTensorRT() { diff --git a/mindspore/lite/src/delegate/tensorrt/op/matmul_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/matmul_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_tensorrt.h index 403c52d0f20..b91705fb97f 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/matmul_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/matmul_tensorrt.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class MatMulTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/normalize_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/normalize_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/normalize_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/normalize_tensorrt.cc index 0b85397529d..5f9e6713148 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/normalize_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/normalize_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/normalize_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/normalize_tensorrt.h" namespace mindspore::lite { int NormalizeTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/normalize_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/normalize_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/normalize_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/normalize_tensorrt.h index 701895ce0eb..525d16ba4c5 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/normalize_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/normalize_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_NORMALIZE_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { constexpr int BETA_INDEX = 2; diff --git a/mindspore/lite/src/delegate/tensorrt/op/pad_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pad_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/pad_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/pad_tensorrt.cc index 8105503dbec..ede54d25207 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/pad_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pad_tensorrt.cc @@ -16,8 +16,8 @@ #include #include -#include "src/delegate/tensorrt/op/pad_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/pad_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { int PadTensorRT::IsSupport(const mindspore::schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/pad_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pad_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/pad_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/pad_tensorrt.h index 651fab9f911..6626bd3d73d 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/pad_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pad_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_PAD_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class PadTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/pool_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pool_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/pool_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/pool_tensorrt.cc index a7038949823..ace2744647d 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/pool_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pool_tensorrt.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/pool_tensorrt.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/pool_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { int PoolTensorRT::IsSupport(const mindspore::schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/pool_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pool_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/pool_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/pool_tensorrt.h index 5661786f713..146c116ae47 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/pool_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/pool_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_POOL_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class PoolTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/reduce_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reduce_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/reduce_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/reduce_tensorrt.cc index 5d6b6e0071d..8d37c771db8 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/reduce_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reduce_tensorrt.cc @@ -15,7 +15,7 @@ */ #include -#include "src/delegate/tensorrt/op/reduce_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/reduce_tensorrt.h" namespace mindspore::lite { int ReduceTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/reduce_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reduce_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/reduce_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/reduce_tensorrt.h index e25b7ebe87f..a0425dad4d1 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/reduce_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reduce_tensorrt.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ReduceTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/reducescatter_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/reducescatter_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.cc index 297a5f0ffaf..7575988305c 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/reducescatter_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/reducescatter_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.h" #include #include #include "NvInferRuntimeCommon.h" diff --git a/mindspore/lite/src/delegate/tensorrt/op/reducescatter_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.h similarity index 93% rename from mindspore/lite/src/delegate/tensorrt/op/reducescatter_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.h index 614d6115f18..bea488a8c9b 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/reducescatter_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/reducescatter_tensorrt.h @@ -19,10 +19,10 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/distribution/distribution_collective.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_collective.h" namespace mindspore::lite { constexpr char *REDUCESCATTER_PLUGIN_NAME{"ReduceScatterPlugin"}; diff --git a/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/resize_tensorrt.cc similarity index 99% rename from mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/resize_tensorrt.cc index 61ce84d5949..fd026219cf5 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/resize_tensorrt.cc @@ -15,7 +15,7 @@ */ #include -#include "src/delegate/tensorrt/op/resize_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/resize_tensorrt.h" #include "nnacl/nnacl_common.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/resize_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/resize_tensorrt.h index c44555ef461..3aa43927d91 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/resize_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/resize_tensorrt.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ResizeTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/scale_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/scale_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/scale_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/scale_tensorrt.cc index 110e6f5c6cb..0b53c06c186 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/scale_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/scale_tensorrt.cc @@ -16,9 +16,9 @@ #include #include -#include "src/delegate/tensorrt/op/scale_tensorrt.h" -#include "src/delegate/tensorrt/op/activation_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/scale_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/activation_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { constexpr int SCALE_INDEX = 1; diff --git a/mindspore/lite/src/delegate/tensorrt/op/scale_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/scale_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/scale_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/scale_tensorrt.h index b3c04808fc2..e9817021dbb 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/scale_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/scale_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_SCALE_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/delegate/tensorrt/op/shape_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shape_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/shape_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/shape_tensorrt.cc index 4e6b5bd9885..748b375db8e 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/shape_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shape_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/shape_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/shape_tensorrt.h" namespace mindspore::lite { int ShapeTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/shape_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shape_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/shape_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/shape_tensorrt.h index cb4e7029104..2b47072e399 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/shape_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shape_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_SHAPE_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class ShapeTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/shuffle_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.cc similarity index 99% rename from mindspore/lite/src/delegate/tensorrt/op/shuffle_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.cc index 66126b3c6f3..6ef2cc1bf68 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/shuffle_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/shuffle_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.h" #include #include #include diff --git a/mindspore/lite/src/delegate/tensorrt/op/shuffle_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.h similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/op/shuffle_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.h index d2b874d4641..380cde961b1 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/shuffle_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/shuffle_tensorrt.h @@ -17,8 +17,8 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_SHUFFLE_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { class ShuffleTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/slice_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/slice_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/slice_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/slice_tensorrt.cc index 7bbb9db86cb..784d5f1a2db 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/slice_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/slice_tensorrt.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/slice_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/slice_tensorrt.h" #include -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { int SliceTensorRT::IsSupport(const mindspore::schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/slice_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/slice_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/slice_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/slice_tensorrt.h index 87ce9bbaea2..a1332230c15 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/slice_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/slice_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_SLICE_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { constexpr int BEGINS_INDEX = 1; diff --git a/mindspore/lite/src/delegate/tensorrt/op/softmax_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/softmax_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/softmax_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/softmax_tensorrt.cc index 5c3fbed5be5..7ee9e905294 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/softmax_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/softmax_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/softmax_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/softmax_tensorrt.h" namespace mindspore::lite { int SoftMaxTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/softmax_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/softmax_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/softmax_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/softmax_tensorrt.h index 7942b50aacc..d69db63630d 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/softmax_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/softmax_tensorrt.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_OP_SOFTMAX_TENSORRT_H_ #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class SoftMaxTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/split_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/split_tensorrt.cc similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/split_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/split_tensorrt.cc index 7b82a01d4e3..74f9c295302 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/split_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/split_tensorrt.cc @@ -15,8 +15,8 @@ */ #include -#include "src/delegate/tensorrt/op/split_tensorrt.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/op/split_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { int SplitTensorRT::IsSupport(const mindspore::schema::Primitive *primitive, diff --git a/mindspore/lite/src/delegate/tensorrt/op/split_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/split_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/split_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/split_tensorrt.h index e38efd290db..d06ab800d7a 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/split_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/split_tensorrt.h @@ -18,7 +18,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class SplitTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_op.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_op.cc index 4c240c286b9..d81057fe252 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_op.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" #include namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_op.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_op.h index b1a99097033..adc3f4d4223 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_op.h @@ -23,8 +23,8 @@ #include "include/api/kernel.h" #include "src/common/log_adapter.h" #include "include/errorcode.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/auto_registration_factory.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/runtime/delegate/auto_registration_factory.h" #include "src/common/log_util.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_plugin.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_plugin.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/tensorrt_plugin.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_plugin.cc index 468165fdeac..34013c9987a 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_plugin.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_plugin.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/tensorrt_plugin.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h" namespace mindspore::lite { nvinfer1::DimsExprs TensorRTPlugin::getOutputDimensions(int outputIndex, const nvinfer1::DimsExprs *inputs, diff --git a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_plugin.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/tensorrt_plugin.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h index f2ab98b2434..7a86d9f5018 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_plugin.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/tensorrt_plugin.h @@ -18,7 +18,7 @@ #include #include #include "NvInferRuntimeCommon.h" -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class TensorRTPlugin : public nvinfer1::IPluginV2DynamicExt { diff --git a/mindspore/lite/src/delegate/tensorrt/op/topk_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/topk_tensorrt.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/op/topk_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/topk_tensorrt.cc index bbee109d908..db532153a05 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/topk_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/topk_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/topk_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/topk_tensorrt.h" namespace mindspore::lite { int TopKTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/topk_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/topk_tensorrt.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/op/topk_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/topk_tensorrt.h index d85c8cfde2d..47b8a6fbd1e 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/topk_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/topk_tensorrt.h @@ -18,7 +18,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class TopKTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/op/unary_tensorrt.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/op/unary_tensorrt.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/unary_tensorrt.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/unary_tensorrt.cc index 8dcde019de8..a175354ff27 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/unary_tensorrt.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/unary_tensorrt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/op/unary_tensorrt.h" +#include "src/extendrt/delegate/tensorrt/op/unary_tensorrt.h" namespace mindspore::lite { int UnaryTensorRT::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/tensorrt/op/unary_tensorrt.h b/mindspore/lite/src/extendrt/delegate/tensorrt/op/unary_tensorrt.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/op/unary_tensorrt.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/op/unary_tensorrt.h index bf92dade401..1acda242eaf 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/unary_tensorrt.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/op/unary_tensorrt.h @@ -18,7 +18,7 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" namespace mindspore::lite { class UnaryTensorRT : public TensorRTOp { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_allocator.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_allocator.cc similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_allocator.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_allocator.cc index 0c74be79a05..f0aa5d46ad7 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_allocator.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_allocator.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/tensorrt_allocator.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_allocator.h" #include #include #include "src/common/log_adapter.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { void *TensorRTAllocator::MallocDeviceMem(const mindspore::MSTensor &host_tensor, size_t size) { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_allocator.h b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_allocator.h similarity index 96% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_allocator.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_allocator.h index e458cc9c183..ae58165c793 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_allocator.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_allocator.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_TENSORRT_ALLOCATOR_H_ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_TENSORRT_ALLOCATOR_H_ -#include "src/delegate/tensorrt/tensorrt_allocator.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_allocator.h" #include #include #include diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_delegate.cc similarity index 98% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_delegate.cc index 56598604879..d74d89bce3a 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_delegate.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/tensorrt_delegate.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_delegate.h" #include #include #include #include -#include "src/delegate/delegate_utils.h" -#include "src/delegate/auto_registration_factory.h" +#include "src/runtime/delegate/delegate_utils.h" +#include "src/runtime/delegate/auto_registration_factory.h" namespace mindspore::lite { TensorRTDelegate::~TensorRTDelegate() { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_delegate.h similarity index 94% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_delegate.h index b4dddad125d..e041b9f9eea 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_delegate.h @@ -21,8 +21,8 @@ #include #include #include "include/api/delegate.h" -#include "src/delegate/tensorrt/tensorrt_subgraph.h" -#include "src/delegate/parameter_cache/embedding_cache_manager.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_subgraph.h" +#include "src/extendrt/delegate/parameter_cache/embedding_cache_manager.h" #include "include/api/kernel.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_runtime.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_runtime.cc similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_runtime.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_runtime.cc index 38d8ee77fcb..0e3069ffdd9 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_runtime.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_runtime.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" #include #include diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_runtime.h b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_runtime.h similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_runtime.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_runtime.h index 462cc28c3d7..cb8de315165 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_runtime.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_runtime.h @@ -17,8 +17,8 @@ #define MINDSPORE_LITE_SRC_DELEGATE_TENSORRT_TENSORRT_RUNTIME_H_ #include #include "include/errorcode.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/tensorrt_allocator.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_allocator.h" #define MAX_BATCH_SIZE 64 using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_serializer.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_serializer.cc similarity index 94% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_serializer.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_serializer.cc index 49efdec2813..9b73eeb0f6c 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_serializer.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_serializer.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/tensorrt_serializer.h" -#include "src/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_serializer.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" #include "src/common/file_utils.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_serializer.h b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_serializer.h similarity index 92% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_serializer.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_serializer.h index 70fa3948629..4e282baa2c6 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_serializer.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_serializer.h @@ -19,8 +19,8 @@ #include #include #include "include/errorcode.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_subgraph.cc similarity index 99% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_subgraph.cc index b9dec1a3878..dd89bf8dabf 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_subgraph.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/tensorrt_subgraph.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_subgraph.h" #include #include #include #include #include -#include "src/delegate/delegate_utils.h" +#include "src/runtime/delegate/delegate_utils.h" namespace mindspore::lite { TensorRTSubGraph::~TensorRTSubGraph() { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_subgraph.h similarity index 95% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_subgraph.h index 939059e98f3..29a66f72605 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_subgraph.h @@ -22,10 +22,10 @@ #include #include #include "include/api/kernel.h" -#include "src/delegate/tensorrt/tensorrt_runtime.h" -#include "src/delegate/tensorrt/tensorrt_utils.h" -#include "src/delegate/tensorrt/tensorrt_serializer.h" -#include "src/delegate/parameter_cache/embedding_cache_manager.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_runtime.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_serializer.h" +#include "src/extendrt/delegate/parameter_cache/embedding_cache_manager.h" #include "include/api/context.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_utils.cc similarity index 99% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_utils.cc index 0639cebe271..95257689847 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.cc +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_utils.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/delegate/tensorrt/tensorrt_utils.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_utils.h" #include #include #include #include -#include "src/delegate/tensorrt/distribution/distribution_collective.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_collective.h" namespace mindspore::lite { nvinfer1::Dims ConvertCudaDims(int data, size_t size) { diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_utils.h similarity index 97% rename from mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h rename to mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_utils.h index aa09c518d6d..49b5ac5a669 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_utils.h +++ b/mindspore/lite/src/extendrt/delegate/tensorrt/tensorrt_utils.h @@ -20,8 +20,8 @@ #include #include #include -#include "src/delegate/tensorrt/op/tensorrt_op.h" -#include "src/delegate/tensorrt/cuda_impl/cublas_utils.h" +#include "src/extendrt/delegate/tensorrt/op/tensorrt_op.h" +#include "src/extendrt/delegate/tensorrt/cuda_impl/cublas_utils.h" #include "mindspore/core/ir/dtype/type_id.h" #include "schema/ops_generated.h" #include "nnacl/pack.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/CMakeLists.txt b/mindspore/lite/src/extendrt/kernel/ascend/CMakeLists.txt similarity index 100% rename from mindspore/lite/src/runtime/kernel/ascend/CMakeLists.txt rename to mindspore/lite/src/extendrt/kernel/ascend/CMakeLists.txt diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/acl_env_guard.cc b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_env_guard.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/ascend/src/acl_env_guard.cc rename to mindspore/lite/src/extendrt/kernel/ascend/src/acl_env_guard.cc index a021c254f87..c6e2a215c5d 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/acl_env_guard.cc +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_env_guard.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/ascend/src/acl_env_guard.h" +#include "src/extendrt/kernel/ascend/src/acl_env_guard.h" #include "common/log_adapter.h" #include "acl/acl.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/acl_env_guard.h b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_env_guard.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/ascend/src/acl_env_guard.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/acl_env_guard.h diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/acl_model_options.h b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_model_options.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/ascend/src/acl_model_options.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/acl_model_options.h diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/acl_options_parser.cc b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_options_parser.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/ascend/src/acl_options_parser.cc rename to mindspore/lite/src/extendrt/kernel/ascend/src/acl_options_parser.cc index 98fe142d370..05a16673707 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/acl_options_parser.cc +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_options_parser.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/ascend/src/acl_options_parser.h" +#include "src/extendrt/kernel/ascend/src/acl_options_parser.h" #include #include #include "common/log_adapter.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/acl_options_parser.h b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_options_parser.h similarity index 95% rename from mindspore/lite/src/runtime/kernel/ascend/src/acl_options_parser.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/acl_options_parser.h index f278cdb5dce..7fa125ecd5b 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/acl_options_parser.h +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/acl_options_parser.h @@ -21,7 +21,7 @@ #include #include "include/api/context.h" #include "include/errorcode.h" -#include "src/runtime/kernel/ascend/src/acl_model_options.h" +#include "src/extendrt/kernel/ascend/src/acl_model_options.h" namespace mindspore::kernel { namespace acl { diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_interface.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc rename to mindspore/lite/src/extendrt/kernel/ascend/src/custom_interface.cc index 29bfb6ad856..7821d996d7d 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_interface.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/ascend/src/custom_interface.h" +#include "src/extendrt/kernel/ascend/src/custom_interface.h" #include #include "include/errorcode.h" #include "include/registry/register_kernel_interface.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.h b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_interface.h similarity index 100% rename from mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/custom_interface.h diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/custom_kernel.cc b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_kernel.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/ascend/src/custom_kernel.cc rename to mindspore/lite/src/extendrt/kernel/ascend/src/custom_kernel.cc index c6bf422eebb..3e844de1064 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/custom_kernel.cc +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/runtime/kernel/ascend/src/custom_kernel.h" +#include "src/extendrt/kernel/ascend/src/custom_kernel.h" #include #include "include/registry/register_kernel.h" #include "include/api/types.h" #include "include/api/data_type.h" -#include "src/runtime/kernel/ascend/src/model_infer.h" -#include "src/runtime/kernel/ascend/src/acl_options_parser.h" +#include "src/extendrt/kernel/ascend/src/model_infer.h" +#include "src/extendrt/kernel/ascend/src/acl_options_parser.h" #include "src/common/log_util.h" #include "common/log_adapter.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/custom_kernel.h b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_kernel.h similarity index 94% rename from mindspore/lite/src/runtime/kernel/ascend/src/custom_kernel.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/custom_kernel.h index 0889e9cb182..79f59ff1635 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/custom_kernel.h +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/custom_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "src/runtime/kernel/ascend/src/acl_model_options.h" -#include "src/runtime/kernel/ascend/src/model_infer.h" +#include "src/extendrt/kernel/ascend/src/acl_model_options.h" +#include "src/extendrt/kernel/ascend/src/model_infer.h" #include "include/api/types.h" #include "include/api/context.h" #include "include/api/kernel.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/model_infer.cc b/mindspore/lite/src/extendrt/kernel/ascend/src/model_infer.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/ascend/src/model_infer.cc rename to mindspore/lite/src/extendrt/kernel/ascend/src/model_infer.cc index 07027fc7f8f..12da84ec950 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/model_infer.cc +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/model_infer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/ascend/src/model_infer.h" +#include "src/extendrt/kernel/ascend/src/model_infer.h" #include "common/log_adapter.h" #include "acl/acl.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/model_infer.h b/mindspore/lite/src/extendrt/kernel/ascend/src/model_infer.h similarity index 91% rename from mindspore/lite/src/runtime/kernel/ascend/src/model_infer.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/model_infer.h index 5dd5d04964b..b4ecf7d23ad 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/model_infer.h +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/model_infer.h @@ -22,9 +22,9 @@ #include #include #include -#include "src/runtime/kernel/ascend/src/model_process.h" -#include "src/runtime/kernel/ascend/src/acl_env_guard.h" -#include "src/runtime/kernel/ascend/src/acl_model_options.h" +#include "src/extendrt/kernel/ascend/src/model_process.h" +#include "src/extendrt/kernel/ascend/src/acl_env_guard.h" +#include "src/extendrt/kernel/ascend/src/acl_model_options.h" #include "include/api/types.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/model_process.cc b/mindspore/lite/src/extendrt/kernel/ascend/src/model_process.cc similarity index 99% rename from mindspore/lite/src/runtime/kernel/ascend/src/model_process.cc rename to mindspore/lite/src/extendrt/kernel/ascend/src/model_process.cc index 6fab80e0891..d2982c49cfc 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/model_process.cc +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/model_process.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/ascend/src/model_process.h" +#include "src/extendrt/kernel/ascend/src/model_process.h" #include #include #include diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/model_process.h b/mindspore/lite/src/extendrt/kernel/ascend/src/model_process.h similarity index 98% rename from mindspore/lite/src/runtime/kernel/ascend/src/model_process.h rename to mindspore/lite/src/extendrt/kernel/ascend/src/model_process.h index 4ffdb3240fc..be04b180332 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/model_process.h +++ b/mindspore/lite/src/extendrt/kernel/ascend/src/model_process.h @@ -27,7 +27,7 @@ #include "acl/acl_rt.h" #include "include/api/types.h" #include "include/errorcode.h" -#include "src/runtime/kernel/ascend/src/acl_model_options.h" +#include "src/extendrt/kernel/ascend/src/acl_model_options.h" namespace mindspore::kernel { namespace acl { diff --git a/mindspore/lite/src/runtime/kernel/cuda/CMakeLists.txt b/mindspore/lite/src/extendrt/kernel/cuda/CMakeLists.txt similarity index 100% rename from mindspore/lite/src/runtime/kernel/cuda/CMakeLists.txt rename to mindspore/lite/src/extendrt/kernel/cuda/CMakeLists.txt diff --git a/mindspore/lite/src/runtime/kernel/cuda/batchtospace.cc b/mindspore/lite/src/extendrt/kernel/cuda/batchtospace.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/cuda/batchtospace.cc rename to mindspore/lite/src/extendrt/kernel/cuda/batchtospace.cc index bd22f50ce0c..86eb36b6e5a 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/batchtospace.cc +++ b/mindspore/lite/src/extendrt/kernel/cuda/batchtospace.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/cuda/batchtospace.h" +#include "src/extendrt/kernel/cuda/batchtospace.h" #include #include "nnacl/batch_to_space.h" diff --git a/mindspore/lite/src/runtime/kernel/cuda/batchtospace.h b/mindspore/lite/src/extendrt/kernel/cuda/batchtospace.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/cuda/batchtospace.h rename to mindspore/lite/src/extendrt/kernel/cuda/batchtospace.h index 8e30e92fcb5..eb5f91ffd5b 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/batchtospace.h +++ b/mindspore/lite/src/extendrt/kernel/cuda/batchtospace.h @@ -19,7 +19,7 @@ #include #include -#include "src/runtime/kernel/cuda/cuda_kernel.h" +#include "src/extendrt/kernel/cuda/cuda_kernel.h" #include "cuda_impl/cuda_class/batchtospace_helper.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cuda/cuda_kernel.cc b/mindspore/lite/src/extendrt/kernel/cuda/cuda_kernel.cc similarity index 98% rename from mindspore/lite/src/runtime/kernel/cuda/cuda_kernel.cc rename to mindspore/lite/src/extendrt/kernel/cuda/cuda_kernel.cc index 75178b9a082..f123219bb2f 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/cuda_kernel.cc +++ b/mindspore/lite/src/extendrt/kernel/cuda/cuda_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/cuda/cuda_kernel.h" +#include "src/extendrt/kernel/cuda/cuda_kernel.h" namespace mindspore::kernel { int CudaKernel::PreProcess() { diff --git a/mindspore/lite/src/runtime/kernel/cuda/cuda_kernel.h b/mindspore/lite/src/extendrt/kernel/cuda/cuda_kernel.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/cuda/cuda_kernel.h rename to mindspore/lite/src/extendrt/kernel/cuda/cuda_kernel.h index d87562560d5..ffee045e15e 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/cuda_kernel.h +++ b/mindspore/lite/src/extendrt/kernel/cuda/cuda_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "src/inner_kernel.h" -#include "src/lite_kernel.h" +#include "src/runtime/inner_kernel.h" +#include "src/runtime/lite_kernel.h" #include "cuda_impl/cuda_class/helper_base.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cuda/unary.cc b/mindspore/lite/src/extendrt/kernel/cuda/unary.cc similarity index 96% rename from mindspore/lite/src/runtime/kernel/cuda/unary.cc rename to mindspore/lite/src/extendrt/kernel/cuda/unary.cc index 3ee741d1f7e..b4e9779b96d 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/unary.cc +++ b/mindspore/lite/src/extendrt/kernel/cuda/unary.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/cuda/unary.h" +#include "src/extendrt/kernel/cuda/unary.h" #include namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cuda/unary.h b/mindspore/lite/src/extendrt/kernel/cuda/unary.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/cuda/unary.h rename to mindspore/lite/src/extendrt/kernel/cuda/unary.h index 42080fd9ee6..509a46f3d4f 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/unary.h +++ b/mindspore/lite/src/extendrt/kernel/cuda/unary.h @@ -19,7 +19,7 @@ #include #include -#include "src/runtime/kernel/cuda/cuda_kernel.h" +#include "src/extendrt/kernel/cuda/cuda_kernel.h" #include "cuda_impl/cuda_class/unary_helper.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cuda/unique.cc b/mindspore/lite/src/extendrt/kernel/cuda/unique.cc similarity index 97% rename from mindspore/lite/src/runtime/kernel/cuda/unique.cc rename to mindspore/lite/src/extendrt/kernel/cuda/unique.cc index 981643eaf66..742c7490b09 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/unique.cc +++ b/mindspore/lite/src/extendrt/kernel/cuda/unique.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/kernel/cuda/unique.h" +#include "src/extendrt/kernel/cuda/unique.h" #include #include diff --git a/mindspore/lite/src/runtime/kernel/cuda/unique.h b/mindspore/lite/src/extendrt/kernel/cuda/unique.h similarity index 96% rename from mindspore/lite/src/runtime/kernel/cuda/unique.h rename to mindspore/lite/src/extendrt/kernel/cuda/unique.h index f34b5634948..bfb2e6a2d0e 100644 --- a/mindspore/lite/src/runtime/kernel/cuda/unique.h +++ b/mindspore/lite/src/extendrt/kernel/cuda/unique.h @@ -19,7 +19,7 @@ #include #include -#include "src/runtime/kernel/cuda/cuda_kernel.h" +#include "src/extendrt/kernel/cuda/cuda_kernel.h" #include "cuda_impl/cuda_class/unique_helper.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/model_loader/abstract_base_model.h b/mindspore/lite/src/extendrt/mindir_loader/abstract_base_model.h similarity index 97% rename from mindspore/lite/src/model_loader/abstract_base_model.h rename to mindspore/lite/src/extendrt/mindir_loader/abstract_base_model.h index 0f30d9e3913..0d361ae4a50 100644 --- a/mindspore/lite/src/model_loader/abstract_base_model.h +++ b/mindspore/lite/src/extendrt/mindir_loader/abstract_base_model.h @@ -22,7 +22,7 @@ #include "include/model.h" #include "src/tensor.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" using Model = mindspore::lite::Model; diff --git a/mindspore/lite/src/model_loader/abstract_kernel.h b/mindspore/lite/src/extendrt/mindir_loader/abstract_kernel.h similarity index 100% rename from mindspore/lite/src/model_loader/abstract_kernel.h rename to mindspore/lite/src/extendrt/mindir_loader/abstract_kernel.h diff --git a/mindspore/lite/src/model_loader/abstract_tensor.h b/mindspore/lite/src/extendrt/mindir_loader/abstract_tensor.h similarity index 100% rename from mindspore/lite/src/model_loader/abstract_tensor.h rename to mindspore/lite/src/extendrt/mindir_loader/abstract_tensor.h diff --git a/mindspore/lite/src/model_loader/mindir_model/inner_kernel.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.cc similarity index 98% rename from mindspore/lite/src/model_loader/mindir_model/inner_kernel.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.cc index 3e4d372d34b..d8cc947fc49 100644 --- a/mindspore/lite/src/model_loader/mindir_model/inner_kernel.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.cc @@ -17,7 +17,7 @@ #include #include -#include "model_loader/mindir_model/inner_kernel.h" +#include "extendrt/mindir_loader/mindir_model/inner_kernel.h" #include "abstract/abstract_value.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/model_loader/mindir_model/inner_kernel.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h similarity index 97% rename from mindspore/lite/src/model_loader/mindir_model/inner_kernel.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h index 19c6d17decd..bfe3bae9c73 100644 --- a/mindspore/lite/src/model_loader/mindir_model/inner_kernel.h +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/inner_kernel.h @@ -24,10 +24,10 @@ #include "src/tensor.h" #include "include/errorcode.h" #include "include/api/kernel.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" // #include "include/api/context.h" #include "kernel/kernel.h" -#include "model_loader/abstract_kernel.h" +#include "extendrt/mindir_loader/abstract_kernel.h" using mindspore::infer::Abstractkernel; diff --git a/mindspore/lite/src/model_loader/mindir_model/kernel_mod_util.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/kernel_mod_util.cc similarity index 96% rename from mindspore/lite/src/model_loader/mindir_model/kernel_mod_util.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/kernel_mod_util.cc index 293f93dbe85..ba3934a0d49 100644 --- a/mindspore/lite/src/model_loader/mindir_model/kernel_mod_util.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/kernel_mod_util.cc @@ -17,7 +17,7 @@ #include #include -#include "model_loader/mindir_model/kernel_mod_util.h" +#include "extendrt/mindir_loader/mindir_model/kernel_mod_util.h" #include "kernel/kernel.h" #include "plugin/factory/ms_factory.h" diff --git a/mindspore/lite/src/model_loader/mindir_model/kernel_mod_util.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/kernel_mod_util.h similarity index 95% rename from mindspore/lite/src/model_loader/mindir_model/kernel_mod_util.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/kernel_mod_util.h index 1d4a7676489..d0e4c27e31d 100644 --- a/mindspore/lite/src/model_loader/mindir_model/kernel_mod_util.h +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/kernel_mod_util.h @@ -20,7 +20,7 @@ #include #include -#include "model_loader/mindir_model/inner_kernel.h" +#include "extendrt/mindir_loader/mindir_model/inner_kernel.h" #include "src/tensor.h" #include "include/model.h" #include "include/context.h" diff --git a/mindspore/lite/src/model_loader/mindir_model/less_test_kernel_mod.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/less_test_kernel_mod.cc similarity index 95% rename from mindspore/lite/src/model_loader/mindir_model/less_test_kernel_mod.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/less_test_kernel_mod.cc index d50639bfae9..81bef65e9fa 100644 --- a/mindspore/lite/src/model_loader/mindir_model/less_test_kernel_mod.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/less_test_kernel_mod.cc @@ -17,7 +17,7 @@ #include #include -#include "model_loader/mindir_model/less_test_kernel_mod.h" +#include "extendrt/mindir_loader/mindir_model/less_test_kernel_mod.h" #include "plugin/factory/ms_factory.h" diff --git a/mindspore/lite/src/model_loader/mindir_model/less_test_kernel_mod.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/less_test_kernel_mod.h similarity index 100% rename from mindspore/lite/src/model_loader/mindir_model/less_test_kernel_mod.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/less_test_kernel_mod.h diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model.cc similarity index 96% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model.cc index e4604d6f10b..e7167383151 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model.cc @@ -19,12 +19,12 @@ #include #include -#include "model_loader/mindir_model/mindir_model.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model.h" #include "utils/ms_utils_secure.h" -#include "model_loader/mindir_model/mindir_model_util.h" -#include "model_loader/mindir_model/kernel_mod_util.h" -#include "src/kernel_exec.h" -#include "model_loader/mindir_model/inner_kernel.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model_util.h" +#include "extendrt/mindir_loader/mindir_model/kernel_mod_util.h" +#include "src/runtime/kernel_exec.h" +#include "extendrt/mindir_loader/mindir_model/inner_kernel.h" namespace mindspore::infer::mindir { #define IS_LITTLE_ENDIAN (uint8_t)1U diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model.h similarity index 96% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model.h index 174431f2d47..5f18ca6de92 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model.h +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model.h @@ -20,8 +20,8 @@ #include #include -#include "model_loader/abstract_base_model.h" -#include "src/schema_tensor_wrapper.h" +#include "extendrt/mindir_loader/abstract_base_model.h" +#include "src/runtime/schema_tensor_wrapper.h" #include "proto/mind_ir.pb.h" namespace mindspore::infer::mindir { diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model_convertor.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_convertor.cc similarity index 85% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model_convertor.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_convertor.cc index bfc9bcdc0f7..fbe3931df5d 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model_convertor.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_convertor.cc @@ -16,8 +16,8 @@ #include -#include "model_loader/mindir_model/mindir_model_convertor.h" -#include "model_loader/mindir_model/mindir_model_util.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model_convertor.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model_util.h" namespace mindspore::infer::mindir { mindspore::lite::LiteModel *MindirModelConvertor::ConvertLiteModel(const std::shared_ptr &mindir_model) { diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model_convertor.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_convertor.h similarity index 91% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model_convertor.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_convertor.h index aca562a50bb..0160f0a7908 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model_convertor.h +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_convertor.h @@ -19,8 +19,8 @@ #include -#include "src/lite_model.h" -#include "model_loader/mindir_model/mindir_model.h" +#include "src/runtime/lite_model.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model.h" namespace mindspore::infer::mindir { class MindirModelConvertor { diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model_loader.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_loader.cc similarity index 98% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model_loader.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_loader.cc index 46fe81e9d88..3528a537752 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model_loader.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_loader.cc @@ -17,9 +17,9 @@ #include #include -#include "model_loader/mindir_model/mindir_model_loader.h" -#include "model_loader/mindir_model/mindir_model_util.h" -#include "src/kernel_registry.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model_loader.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model_util.h" +#include "src/runtime/kernel_registry.h" #include "ops/primitive_c.h" namespace mindspore::infer::mindir { diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model_loader.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_loader.h similarity index 95% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model_loader.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_loader.h index f44d107e587..368ba9158de 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model_loader.h +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_loader.h @@ -20,8 +20,8 @@ #include #include -#include "model_loader/mindir_model/mindir_model.h" -#include "model_loader/model_loader.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model.h" +#include "extendrt/mindir_loader/model_loader.h" #include "proto/mind_ir.pb.h" #include "ops/base_operator.h" diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model_util.cc b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.cc similarity index 99% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model_util.cc rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.cc index eae1945d3ca..b8668295db3 100644 --- a/mindspore/lite/src/model_loader/mindir_model/mindir_model_util.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.cc @@ -18,7 +18,7 @@ #include #include -#include "model_loader/mindir_model/mindir_model_util.h" +#include "extendrt/mindir_loader/mindir_model/mindir_model_util.h" #include "ir/tensor.h" #include "ir/value.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/model_loader/mindir_model/mindir_model_util.h b/mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.h similarity index 100% rename from mindspore/lite/src/model_loader/mindir_model/mindir_model_util.h rename to mindspore/lite/src/extendrt/mindir_loader/mindir_model/mindir_model_util.h diff --git a/mindspore/lite/src/model_loader/model_loader.cc b/mindspore/lite/src/extendrt/mindir_loader/model_loader.cc similarity index 97% rename from mindspore/lite/src/model_loader/model_loader.cc rename to mindspore/lite/src/extendrt/mindir_loader/model_loader.cc index f40de014c39..0c68e11d50b 100644 --- a/mindspore/lite/src/model_loader/model_loader.cc +++ b/mindspore/lite/src/extendrt/mindir_loader/model_loader.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "model_loader/model_loader.h" +#include "extendrt/mindir_loader/model_loader.h" namespace mindspore::infer { constexpr size_t kMaxModelBufferSize = static_cast(1024) * 1024 * 1024 * 2; diff --git a/mindspore/lite/src/model_loader/model_loader.h b/mindspore/lite/src/extendrt/mindir_loader/model_loader.h similarity index 97% rename from mindspore/lite/src/model_loader/model_loader.h rename to mindspore/lite/src/extendrt/mindir_loader/model_loader.h index 5c285c902e3..42bcc10079d 100644 --- a/mindspore/lite/src/model_loader/model_loader.h +++ b/mindspore/lite/src/extendrt/mindir_loader/model_loader.h @@ -19,7 +19,7 @@ #include -#include "model_loader/abstract_base_model.h" +#include "extendrt/mindir_loader/abstract_base_model.h" namespace mindspore::infer { class ModelLoader { diff --git a/mindspore/lite/src/c_api/context_c.cc b/mindspore/lite/src/runtime/c_api/context_c.cc similarity index 99% rename from mindspore/lite/src/c_api/context_c.cc rename to mindspore/lite/src/runtime/c_api/context_c.cc index cb2595addfb..e0dad492c93 100644 --- a/mindspore/lite/src/c_api/context_c.cc +++ b/mindspore/lite/src/runtime/c_api/context_c.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "include/c_api/context_c.h" -#include "src/c_api/context_c.h" +#include "src/runtime/c_api/context_c.h" #include "src/common/log_adapter.h" // ================ Context ================ diff --git a/mindspore/lite/src/c_api/context_c.h b/mindspore/lite/src/runtime/c_api/context_c.h similarity index 100% rename from mindspore/lite/src/c_api/context_c.h rename to mindspore/lite/src/runtime/c_api/context_c.h diff --git a/mindspore/lite/src/c_api/model_c.cc b/mindspore/lite/src/runtime/c_api/model_c.cc similarity index 99% rename from mindspore/lite/src/c_api/model_c.cc rename to mindspore/lite/src/runtime/c_api/model_c.cc index 82fefacc067..d0f133a4881 100644 --- a/mindspore/lite/src/c_api/model_c.cc +++ b/mindspore/lite/src/runtime/c_api/model_c.cc @@ -18,10 +18,10 @@ #include #include "include/api/context.h" #include "include/api/types.h" -#include "src/cxx_api/tensor/tensor_impl.h" -#include "src/cxx_api/converters.h" -#include "src/lite_session.h" -#include "src/cpu_info.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/converters.h" +#include "src/runtime/lite_session.h" +#include "src/runtime/cpu_info.h" namespace mindspore { class ModelC { diff --git a/mindspore/lite/src/c_api/tensor_c.cc b/mindspore/lite/src/runtime/c_api/tensor_c.cc similarity index 99% rename from mindspore/lite/src/c_api/tensor_c.cc rename to mindspore/lite/src/runtime/c_api/tensor_c.cc index bf32243fd35..f17b1935718 100644 --- a/mindspore/lite/src/c_api/tensor_c.cc +++ b/mindspore/lite/src/runtime/c_api/tensor_c.cc @@ -16,7 +16,7 @@ #include "include/c_api/tensor_c.h" #include "include/api/status.h" #include "include/ms_tensor.h" -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" #include "src/runtime/inner_allocator.h" MSTensorHandle MSTensorCreate(const char *name, MSDataType type, const int64_t *shape, size_t shape_num, diff --git a/mindspore/lite/src/cpu_info.cc b/mindspore/lite/src/runtime/cpu_info.cc similarity index 99% rename from mindspore/lite/src/cpu_info.cc rename to mindspore/lite/src/runtime/cpu_info.cc index 5349636498a..e1a043e2af1 100644 --- a/mindspore/lite/src/cpu_info.cc +++ b/mindspore/lite/src/runtime/cpu_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #ifdef ENABLE_ARM -#include "src/cpu_info.h" +#include "src/runtime/cpu_info.h" #include #include #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/cpu_info.h b/mindspore/lite/src/runtime/cpu_info.h similarity index 100% rename from mindspore/lite/src/cpu_info.h rename to mindspore/lite/src/runtime/cpu_info.h diff --git a/mindspore/lite/src/cxx_api/callback/callback_adapter.h b/mindspore/lite/src/runtime/cxx_api/callback/callback_adapter.h similarity index 100% rename from mindspore/lite/src/cxx_api/callback/callback_adapter.h rename to mindspore/lite/src/runtime/cxx_api/callback/callback_adapter.h diff --git a/mindspore/lite/src/cxx_api/callback/callback_impl.h b/mindspore/lite/src/runtime/cxx_api/callback/callback_impl.h similarity index 100% rename from mindspore/lite/src/cxx_api/callback/callback_impl.h rename to mindspore/lite/src/runtime/cxx_api/callback/callback_impl.h diff --git a/mindspore/lite/src/cxx_api/callback/ckpt_saver.cc b/mindspore/lite/src/runtime/cxx_api/callback/ckpt_saver.cc similarity index 96% rename from mindspore/lite/src/cxx_api/callback/ckpt_saver.cc rename to mindspore/lite/src/runtime/cxx_api/callback/ckpt_saver.cc index 9a850299717..b0c0cb787ff 100644 --- a/mindspore/lite/src/cxx_api/callback/ckpt_saver.cc +++ b/mindspore/lite/src/runtime/cxx_api/callback/ckpt_saver.cc @@ -19,7 +19,7 @@ #include #include "include/train/ckpt_saver.h" #include "include/api/callback/ckpt_saver.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/callback/loss_monitor.cc b/mindspore/lite/src/runtime/cxx_api/callback/loss_monitor.cc similarity index 97% rename from mindspore/lite/src/cxx_api/callback/loss_monitor.cc rename to mindspore/lite/src/runtime/cxx_api/callback/loss_monitor.cc index a2abdf7bee2..8aab77fb0c5 100644 --- a/mindspore/lite/src/cxx_api/callback/loss_monitor.cc +++ b/mindspore/lite/src/runtime/cxx_api/callback/loss_monitor.cc @@ -19,7 +19,7 @@ #include #include "include/train/loss_monitor.h" #include "include/api/callback/loss_monitor.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/callback/lr_scheduler.cc b/mindspore/lite/src/runtime/cxx_api/callback/lr_scheduler.cc similarity index 97% rename from mindspore/lite/src/cxx_api/callback/lr_scheduler.cc rename to mindspore/lite/src/runtime/cxx_api/callback/lr_scheduler.cc index 798c7e6502b..dc0bfbd5c58 100644 --- a/mindspore/lite/src/cxx_api/callback/lr_scheduler.cc +++ b/mindspore/lite/src/runtime/cxx_api/callback/lr_scheduler.cc @@ -19,7 +19,7 @@ #include #include "include/train/lr_scheduler.h" #include "include/api/callback/lr_scheduler.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/callback/train_accuracy.cc b/mindspore/lite/src/runtime/cxx_api/callback/train_accuracy.cc similarity index 97% rename from mindspore/lite/src/cxx_api/callback/train_accuracy.cc rename to mindspore/lite/src/runtime/cxx_api/callback/train_accuracy.cc index 4e5d4c02417..0dc0c72203c 100644 --- a/mindspore/lite/src/cxx_api/callback/train_accuracy.cc +++ b/mindspore/lite/src/runtime/cxx_api/callback/train_accuracy.cc @@ -19,7 +19,7 @@ #include #include "include/train/classification_train_accuracy_monitor.h" #include "include/api/callback/train_accuracy.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/cell.cc b/mindspore/lite/src/runtime/cxx_api/cell.cc similarity index 100% rename from mindspore/lite/src/cxx_api/cell.cc rename to mindspore/lite/src/runtime/cxx_api/cell.cc diff --git a/mindspore/lite/src/cxx_api/context.cc b/mindspore/lite/src/runtime/cxx_api/context.cc similarity index 99% rename from mindspore/lite/src/cxx_api/context.cc rename to mindspore/lite/src/runtime/cxx_api/context.cc index 247ecae2c8a..d550975b848 100644 --- a/mindspore/lite/src/cxx_api/context.cc +++ b/mindspore/lite/src/runtime/cxx_api/context.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/cxx_api/context.h" +#include "src/runtime/cxx_api/context.h" #include #include #include "include/api/types.h" @@ -21,7 +21,7 @@ #include "include/lite_types.h" #include "src/runtime/inner_allocator.h" #include "src/common/log_adapter.h" -#include "src/delegate/tensorrt/distribution/distribution_base.h" +#include "src/extendrt/delegate/tensorrt/distribution/distribution_base.h" namespace mindspore { constexpr auto kModelOptionCpuEnableFP16 = "mindspore.option.cpu.enable_fp16"; diff --git a/mindspore/lite/src/cxx_api/context.h b/mindspore/lite/src/runtime/cxx_api/context.h similarity index 100% rename from mindspore/lite/src/cxx_api/context.h rename to mindspore/lite/src/runtime/cxx_api/context.h diff --git a/mindspore/lite/src/cxx_api/converters.cc b/mindspore/lite/src/runtime/cxx_api/converters.cc similarity index 99% rename from mindspore/lite/src/cxx_api/converters.cc rename to mindspore/lite/src/runtime/cxx_api/converters.cc index ac92d39ff81..4d872076c84 100644 --- a/mindspore/lite/src/cxx_api/converters.cc +++ b/mindspore/lite/src/runtime/cxx_api/converters.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/cxx_api/converters.h" +#include "src/runtime/cxx_api/converters.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/converters.h b/mindspore/lite/src/runtime/cxx_api/converters.h similarity index 97% rename from mindspore/lite/src/cxx_api/converters.h rename to mindspore/lite/src/runtime/cxx_api/converters.h index 024edf89742..54c0c63a497 100644 --- a/mindspore/lite/src/cxx_api/converters.h +++ b/mindspore/lite/src/runtime/cxx_api/converters.h @@ -23,8 +23,8 @@ #include "include/api/status.h" #include "include/api/cfg.h" #include "include/train/train_cfg.h" -#include "src/inner_context.h" -#include "src/c_api/context_c.h" +#include "src/runtime/inner_context.h" +#include "src/runtime/c_api/context_c.h" namespace mindspore { class ContextUtils { diff --git a/mindspore/lite/src/cxx_api/expression/net.cc b/mindspore/lite/src/runtime/cxx_api/expression/net.cc similarity index 97% rename from mindspore/lite/src/cxx_api/expression/net.cc rename to mindspore/lite/src/runtime/cxx_api/expression/net.cc index 9ff4a53d37e..982f53f64d1 100644 --- a/mindspore/lite/src/cxx_api/expression/net.cc +++ b/mindspore/lite/src/runtime/cxx_api/expression/net.cc @@ -16,8 +16,8 @@ #include "include/api/net.h" #include "include/api/status.h" -#include "src/cxx_api/expression/node_impl.h" -#include "src/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" #include "src/expression/ops.h" #include "src/expression/cfg.h" diff --git a/mindspore/lite/src/cxx_api/expression/net_impl.cc b/mindspore/lite/src/runtime/cxx_api/expression/net_impl.cc similarity index 98% rename from mindspore/lite/src/cxx_api/expression/net_impl.cc rename to mindspore/lite/src/runtime/cxx_api/expression/net_impl.cc index d2b503bcfba..212380a789a 100644 --- a/mindspore/lite/src/cxx_api/expression/net_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/expression/net_impl.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "src/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" #include #include #include "include/api/serialization.h" #include "src/expression/import.h" #include "src/expression/ops.h" -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" namespace { constexpr size_t kFlatbuffersBuilderInitSize = 1024; diff --git a/mindspore/lite/src/cxx_api/expression/net_impl.h b/mindspore/lite/src/runtime/cxx_api/expression/net_impl.h similarity index 96% rename from mindspore/lite/src/cxx_api/expression/net_impl.h rename to mindspore/lite/src/runtime/cxx_api/expression/net_impl.h index d920d5b5555..d5bb5cdf778 100644 --- a/mindspore/lite/src/cxx_api/expression/net_impl.h +++ b/mindspore/lite/src/runtime/cxx_api/expression/net_impl.h @@ -27,8 +27,8 @@ #include "include/api/graph.h" #include "include/api/status.h" #include "include/api/net.h" -#include "src/cxx_api/expression/node_impl.h" -#include "src/cxx_api/graph/net_data.h" +#include "src/runtime/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/graph/net_data.h" #include "src/expression/net.h" #include "src/expression/ops.h" diff --git a/mindspore/lite/src/cxx_api/expression/node_impl.cc b/mindspore/lite/src/runtime/cxx_api/expression/node_impl.cc similarity index 96% rename from mindspore/lite/src/cxx_api/expression/node_impl.cc rename to mindspore/lite/src/runtime/cxx_api/expression/node_impl.cc index 044f7a5a4aa..76094a3b8ba 100644 --- a/mindspore/lite/src/cxx_api/expression/node_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/expression/node_impl.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" #include #include "include/api/net.h" #include "src/expression/ops.h" diff --git a/mindspore/lite/src/cxx_api/expression/node_impl.h b/mindspore/lite/src/runtime/cxx_api/expression/node_impl.h similarity index 100% rename from mindspore/lite/src/cxx_api/expression/node_impl.h rename to mindspore/lite/src/runtime/cxx_api/expression/node_impl.h diff --git a/mindspore/lite/src/cxx_api/graph/graph.cc b/mindspore/lite/src/runtime/cxx_api/graph/graph.cc similarity index 93% rename from mindspore/lite/src/cxx_api/graph/graph.cc rename to mindspore/lite/src/runtime/cxx_api/graph/graph.cc index b1f3a3ddc47..b00643f8209 100644 --- a/mindspore/lite/src/cxx_api/graph/graph.cc +++ b/mindspore/lite/src/runtime/cxx_api/graph/graph.cc @@ -17,8 +17,8 @@ #include "include/api/graph.h" #include "include/api/cell.h" #include "include/api/net.h" -#include "src/cxx_api/graph/graph_data.h" -#include "src/cxx_api/graph/net_data.h" +#include "src/runtime/cxx_api/graph/graph_data.h" +#include "src/runtime/cxx_api/graph/net_data.h" namespace mindspore { Graph::Graph() : graph_data_(nullptr) {} diff --git a/mindspore/lite/src/cxx_api/graph/graph_data.h b/mindspore/lite/src/runtime/cxx_api/graph/graph_data.h similarity index 97% rename from mindspore/lite/src/cxx_api/graph/graph_data.h rename to mindspore/lite/src/runtime/cxx_api/graph/graph_data.h index d83d0cfd0dc..0fe53f56b17 100644 --- a/mindspore/lite/src/cxx_api/graph/graph_data.h +++ b/mindspore/lite/src/runtime/cxx_api/graph/graph_data.h @@ -23,7 +23,7 @@ #include #include "include/api/graph.h" #include "include/api/types.h" -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" namespace mindspore { class Graph::GraphData { diff --git a/mindspore/lite/src/cxx_api/graph/net_data.cc b/mindspore/lite/src/runtime/cxx_api/graph/net_data.cc similarity index 87% rename from mindspore/lite/src/cxx_api/graph/net_data.cc rename to mindspore/lite/src/runtime/cxx_api/graph/net_data.cc index 8b4fd026267..827f43c8efc 100644 --- a/mindspore/lite/src/cxx_api/graph/net_data.cc +++ b/mindspore/lite/src/runtime/cxx_api/graph/net_data.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/cxx_api/graph/net_data.h" -#include "src/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/graph/net_data.h" +#include "src/runtime/cxx_api/expression/net_impl.h" namespace mindspore { NetData::~NetData() { net_->impl_->Release(); } diff --git a/mindspore/lite/src/cxx_api/graph/net_data.h b/mindspore/lite/src/runtime/cxx_api/graph/net_data.h similarity index 100% rename from mindspore/lite/src/cxx_api/graph/net_data.h rename to mindspore/lite/src/runtime/cxx_api/graph/net_data.h diff --git a/mindspore/lite/src/cxx_api/kernel.cc b/mindspore/lite/src/runtime/cxx_api/kernel.cc similarity index 100% rename from mindspore/lite/src/cxx_api/kernel.cc rename to mindspore/lite/src/runtime/cxx_api/kernel.cc diff --git a/mindspore/lite/src/cxx_api/kernel_executor/CMakeLists.txt b/mindspore/lite/src/runtime/cxx_api/kernel_executor/CMakeLists.txt similarity index 100% rename from mindspore/lite/src/cxx_api/kernel_executor/CMakeLists.txt rename to mindspore/lite/src/runtime/cxx_api/kernel_executor/CMakeLists.txt diff --git a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor.cc b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor.cc similarity index 93% rename from mindspore/lite/src/cxx_api/kernel_executor/kernel_executor.cc rename to mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor.cc index 13ff57d4109..975b91f5670 100644 --- a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor.cc +++ b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/cxx_api/kernel_executor/kernel_executor.h" -#include "src/cxx_api/kernel_executor/kernel_executor_impl.h" +#include "src/runtime/cxx_api/kernel_executor/kernel_executor.h" +#include "src/runtime/cxx_api/kernel_executor/kernel_executor_impl.h" namespace mindspore { Status KernelExecutor::Build(const std::shared_ptr &op, const std::vector &inputs, diff --git a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor.h b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor.h similarity index 100% rename from mindspore/lite/src/cxx_api/kernel_executor/kernel_executor.h rename to mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor.h diff --git a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor_impl.cc b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor_impl.cc similarity index 97% rename from mindspore/lite/src/cxx_api/kernel_executor/kernel_executor_impl.cc rename to mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor_impl.cc index 4077a7a563b..54751d78f37 100644 --- a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor_impl.cc @@ -15,15 +15,15 @@ */ #include -#include "src/ops/ops_utils.h" -#include "src/cxx_api/converters.h" +#include "src/common/ops/ops_utils.h" +#include "src/runtime/cxx_api/converters.h" #include "src/common/prim_util.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/primitive_t_utils.h" #include "schema/inner/model_generated.h" #include "src/runtime/infer_manager.h" -#include "src/kernel_registry.h" -#include "src/cxx_api/kernel_executor/kernel_executor_impl.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/cxx_api/kernel_executor/kernel_executor_impl.h" namespace mindspore { constexpr size_t INITIAL_SIZE = 1024; diff --git a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor_impl.h b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor_impl.h similarity index 95% rename from mindspore/lite/src/cxx_api/kernel_executor/kernel_executor_impl.h rename to mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor_impl.h index 28cd1cb038d..10f0b098360 100644 --- a/mindspore/lite/src/cxx_api/kernel_executor/kernel_executor_impl.h +++ b/mindspore/lite/src/runtime/cxx_api/kernel_executor/kernel_executor_impl.h @@ -19,8 +19,8 @@ #include #include -#include "src/cxx_api/kernel_executor/kernel_executor.h" -#include "src/kernel_exec.h" +#include "src/runtime/cxx_api/kernel_executor/kernel_executor.h" +#include "src/runtime/kernel_exec.h" #include "common/version_manager.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/metrics/accuracy.cc b/mindspore/lite/src/runtime/cxx_api/metrics/accuracy.cc similarity index 97% rename from mindspore/lite/src/cxx_api/metrics/accuracy.cc rename to mindspore/lite/src/runtime/cxx_api/metrics/accuracy.cc index 9f28409ae68..3445e6870cb 100644 --- a/mindspore/lite/src/cxx_api/metrics/accuracy.cc +++ b/mindspore/lite/src/runtime/cxx_api/metrics/accuracy.cc @@ -19,7 +19,7 @@ #include #include "include/train/accuracy_metrics.h" #include "include/api/metrics/accuracy.h" -#include "src/cxx_api/metrics/metrics_impl.h" +#include "src/runtime/cxx_api/metrics/metrics_impl.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/cxx_api/metrics/metrics_adapter.h b/mindspore/lite/src/runtime/cxx_api/metrics/metrics_adapter.h similarity index 100% rename from mindspore/lite/src/cxx_api/metrics/metrics_adapter.h rename to mindspore/lite/src/runtime/cxx_api/metrics/metrics_adapter.h diff --git a/mindspore/lite/src/cxx_api/metrics/metrics_impl.h b/mindspore/lite/src/runtime/cxx_api/metrics/metrics_impl.h similarity index 100% rename from mindspore/lite/src/cxx_api/metrics/metrics_impl.h rename to mindspore/lite/src/runtime/cxx_api/metrics/metrics_impl.h diff --git a/mindspore/lite/src/cxx_api/model/model.cc b/mindspore/lite/src/runtime/cxx_api/model/model.cc similarity index 98% rename from mindspore/lite/src/cxx_api/model/model.cc rename to mindspore/lite/src/runtime/cxx_api/model/model.cc index 52411c09993..2caa288a81c 100644 --- a/mindspore/lite/src/cxx_api/model/model.cc +++ b/mindspore/lite/src/runtime/cxx_api/model/model.cc @@ -30,10 +30,10 @@ #include "include/api/serialization.h" #include "include/api/graph.h" #include "src/common/log_adapter.h" -#include "src/cxx_api/expression/net_impl.h" -#include "src/cxx_api/callback/callback_adapter.h" -#include "src/cxx_api/callback/callback_impl.h" -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/callback/callback_adapter.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" #ifdef ENABLE_OPENSSL #include "src/common/decrypt.h" #include "src/common/file_utils.h" diff --git a/mindspore/lite/src/cxx_api/model/model_impl.cc b/mindspore/lite/src/runtime/cxx_api/model/model_impl.cc similarity index 98% rename from mindspore/lite/src/cxx_api/model/model_impl.cc rename to mindspore/lite/src/runtime/cxx_api/model/model_impl.cc index a61f139a865..c6bd772dcce 100644 --- a/mindspore/lite/src/cxx_api/model/model_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/model/model_impl.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" #include #include #include @@ -26,15 +26,15 @@ #include "include/lite_session.h" #include "include/context.h" #include "src/runtime/inner_allocator.h" -#include "src/cxx_api/converters.h" -#include "src/cxx_api/graph/graph_data.h" -#include "src/cxx_api/tensor/tensor_impl.h" -#include "src/cxx_api/tensor_utils.h" +#include "src/runtime/cxx_api/converters.h" +#include "src/runtime/cxx_api/graph/graph_data.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor_utils.h" #include "src/common/log_adapter.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "src/common/file_utils.h" #include "src/common/config_file.h" -#include "src/cpu_info.h" +#include "src/runtime/cpu_info.h" #ifdef SERVER_INFERENCE #include "src/common/common.h" #endif diff --git a/mindspore/lite/src/cxx_api/model/model_impl.h b/mindspore/lite/src/runtime/cxx_api/model/model_impl.h similarity index 97% rename from mindspore/lite/src/cxx_api/model/model_impl.h rename to mindspore/lite/src/runtime/cxx_api/model/model_impl.h index 2a4677ec819..bbbc4fe2683 100644 --- a/mindspore/lite/src/cxx_api/model/model_impl.h +++ b/mindspore/lite/src/runtime/cxx_api/model/model_impl.h @@ -28,9 +28,9 @@ #include "include/api/context.h" #include "include/api/cell.h" #include "include/lite_session.h" -#include "src/cxx_api/graph/graph_data.h" -#include "src/inner_context.h" -#include "src/lite_session.h" +#include "src/runtime/cxx_api/graph/graph_data.h" +#include "src/runtime/inner_context.h" +#include "src/runtime/lite_session.h" template void clearVectorOfPointers(std::vector *v) { diff --git a/mindspore/lite/src/cxx_api/model_pool/model_parallel_runner.cc b/mindspore/lite/src/runtime/cxx_api/model_pool/model_parallel_runner.cc similarity index 95% rename from mindspore/lite/src/cxx_api/model_pool/model_parallel_runner.cc rename to mindspore/lite/src/runtime/cxx_api/model_pool/model_parallel_runner.cc index 34f0ab12b76..fce25386242 100644 --- a/mindspore/lite/src/cxx_api/model_pool/model_parallel_runner.cc +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/model_parallel_runner.cc @@ -14,10 +14,10 @@ * limitations under the License. */ #include "include/api/model_parallel_runner.h" -#include "src/cxx_api/model_pool/model_pool.h" -#include "src/cxx_api/model_pool/runner_config.h" +#include "src/runtime/cxx_api/model_pool/model_pool.h" +#include "src/runtime/cxx_api/model_pool/runner_config.h" #include "src/common/log_adapter.h" -#include "src/cpu_info.h" +#include "src/runtime/cpu_info.h" namespace mindspore { namespace { constexpr size_t kMaxSectionNum = 100; diff --git a/mindspore/lite/src/cxx_api/model_pool/model_pool.cc b/mindspore/lite/src/runtime/cxx_api/model_pool/model_pool.cc similarity index 99% rename from mindspore/lite/src/cxx_api/model_pool/model_pool.cc rename to mindspore/lite/src/runtime/cxx_api/model_pool/model_pool.cc index aace32d0aa7..a1fc4f22370 100644 --- a/mindspore/lite/src/cxx_api/model_pool/model_pool.cc +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/model_pool.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/cxx_api/model_pool/model_pool.h" +#include "src/runtime/cxx_api/model_pool/model_pool.h" #include #include #include "src/common/log_adapter.h" @@ -21,7 +21,7 @@ #include "src/common/config_file.h" #include "src/runtime/inner_allocator.h" #include "src/common/file_utils.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" #include "src/runtime/numa_adapter.h" #include "src/common/common.h" diff --git a/mindspore/lite/src/cxx_api/model_pool/model_pool.h b/mindspore/lite/src/runtime/cxx_api/model_pool/model_pool.h similarity index 97% rename from mindspore/lite/src/cxx_api/model_pool/model_pool.h rename to mindspore/lite/src/runtime/cxx_api/model_pool/model_pool.h index c0653417fc8..f1b245f51ff 100644 --- a/mindspore/lite/src/cxx_api/model_pool/model_pool.h +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/model_pool.h @@ -26,8 +26,8 @@ #include "include/api/status.h" #include "include/api/context.h" #include "include/api/model_parallel_runner.h" -#include "src/cxx_api/model_pool/model_worker.h" -#include "src/cxx_api/model_pool/predict_task_queue.h" +#include "src/runtime/cxx_api/model_pool/model_worker.h" +#include "src/runtime/cxx_api/model_pool/predict_task_queue.h" namespace mindspore { using ModelPoolConfig = std::vector>; diff --git a/mindspore/lite/src/cxx_api/model_pool/model_worker.cc b/mindspore/lite/src/runtime/cxx_api/model_pool/model_worker.cc similarity index 99% rename from mindspore/lite/src/cxx_api/model_pool/model_worker.cc rename to mindspore/lite/src/runtime/cxx_api/model_pool/model_worker.cc index b7214c75c22..c83976580e0 100644 --- a/mindspore/lite/src/cxx_api/model_pool/model_worker.cc +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/model_worker.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/cxx_api/model_pool/model_worker.h" +#include "src/runtime/cxx_api/model_pool/model_worker.h" #include "src/common/log_adapter.h" #include "src/runtime/numa_adapter.h" #include "src/common/common.h" diff --git a/mindspore/lite/src/cxx_api/model_pool/model_worker.h b/mindspore/lite/src/runtime/cxx_api/model_pool/model_worker.h similarity index 97% rename from mindspore/lite/src/cxx_api/model_pool/model_worker.h rename to mindspore/lite/src/runtime/cxx_api/model_pool/model_worker.h index d7274a25d78..238e0b5e3fb 100644 --- a/mindspore/lite/src/cxx_api/model_pool/model_worker.h +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/model_worker.h @@ -25,7 +25,7 @@ #include #include #include "include/api/model.h" -#include "src/cxx_api/model_pool/predict_task_queue.h" +#include "src/runtime/cxx_api/model_pool/predict_task_queue.h" namespace mindspore { class PredictTaskQueue; diff --git a/mindspore/lite/src/cxx_api/model_pool/predict_task_queue.cc b/mindspore/lite/src/runtime/cxx_api/model_pool/predict_task_queue.cc similarity index 97% rename from mindspore/lite/src/cxx_api/model_pool/predict_task_queue.cc rename to mindspore/lite/src/runtime/cxx_api/model_pool/predict_task_queue.cc index fc9a125b274..93a6f50244b 100644 --- a/mindspore/lite/src/cxx_api/model_pool/predict_task_queue.cc +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/predict_task_queue.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/cxx_api/model_pool/predict_task_queue.h" +#include "src/runtime/cxx_api/model_pool/predict_task_queue.h" namespace mindspore { void PredictTaskQueue::SetPredictTaskDone() { predict_task_done_ = true; diff --git a/mindspore/lite/src/cxx_api/model_pool/predict_task_queue.h b/mindspore/lite/src/runtime/cxx_api/model_pool/predict_task_queue.h similarity index 97% rename from mindspore/lite/src/cxx_api/model_pool/predict_task_queue.h rename to mindspore/lite/src/runtime/cxx_api/model_pool/predict_task_queue.h index a19ef1f364e..ca89327b620 100644 --- a/mindspore/lite/src/cxx_api/model_pool/predict_task_queue.h +++ b/mindspore/lite/src/runtime/cxx_api/model_pool/predict_task_queue.h @@ -23,7 +23,7 @@ #include #include "include/api/types.h" #include "include/api/status.h" -#include "src/cxx_api/model_pool/model_worker.h" +#include "src/runtime/cxx_api/model_pool/model_worker.h" namespace mindspore { class ModelWorker; struct PredictTask { diff --git a/mindspore/lite/src/cxx_api/model_pool/runner_config.h b/mindspore/lite/src/runtime/cxx_api/model_pool/runner_config.h similarity index 100% rename from mindspore/lite/src/cxx_api/model_pool/runner_config.h rename to mindspore/lite/src/runtime/cxx_api/model_pool/runner_config.h diff --git a/mindspore/lite/src/cxx_api/serialization.cc b/mindspore/lite/src/runtime/cxx_api/serialization.cc similarity index 96% rename from mindspore/lite/src/cxx_api/serialization.cc rename to mindspore/lite/src/runtime/cxx_api/serialization.cc index f0d28ca8034..3db328262a9 100644 --- a/mindspore/lite/src/cxx_api/serialization.cc +++ b/mindspore/lite/src/runtime/cxx_api/serialization.cc @@ -20,12 +20,12 @@ #include "include/api/graph.h" #include "include/api/types.h" #include "include/model.h" -#include "src/cxx_api/expression/net_impl.h" -#include "src/cxx_api/graph/graph_data.h" -#include "src/cxx_api/model/model_impl.h" -#include "src/cxx_api/converters.h" +#include "src/runtime/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/graph/graph_data.h" +#include "src/runtime/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/converters.h" #include "src/common/log_adapter.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" namespace mindspore { std::function ExpressionCallback; diff --git a/mindspore/lite/src/cxx_api/tensor/tensor_impl.cc b/mindspore/lite/src/runtime/cxx_api/tensor/tensor_impl.cc similarity index 97% rename from mindspore/lite/src/cxx_api/tensor/tensor_impl.cc rename to mindspore/lite/src/runtime/cxx_api/tensor/tensor_impl.cc index 94993c7a34a..673bb6fcc77 100644 --- a/mindspore/lite/src/cxx_api/tensor/tensor_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/tensor/tensor_impl.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" #include #include #include @@ -22,7 +22,7 @@ #include #include #include -#include "src/cxx_api/tensor_utils.h" +#include "src/runtime/cxx_api/tensor_utils.h" #include "src/tensor.h" #include "include/lite_utils.h" diff --git a/mindspore/lite/src/cxx_api/tensor/tensor_impl.h b/mindspore/lite/src/runtime/cxx_api/tensor/tensor_impl.h similarity index 100% rename from mindspore/lite/src/cxx_api/tensor/tensor_impl.h rename to mindspore/lite/src/runtime/cxx_api/tensor/tensor_impl.h diff --git a/mindspore/lite/src/cxx_api/tensor_utils.cc b/mindspore/lite/src/runtime/cxx_api/tensor_utils.cc similarity index 98% rename from mindspore/lite/src/cxx_api/tensor_utils.cc rename to mindspore/lite/src/runtime/cxx_api/tensor_utils.cc index c927bcd6161..5277afbb1f1 100644 --- a/mindspore/lite/src/cxx_api/tensor_utils.cc +++ b/mindspore/lite/src/runtime/cxx_api/tensor_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/cxx_api/tensor_utils.h" +#include "src/runtime/cxx_api/tensor_utils.h" #include "src/common/log_adapter.h" #include "src/tensor.h" diff --git a/mindspore/lite/src/cxx_api/tensor_utils.h b/mindspore/lite/src/runtime/cxx_api/tensor_utils.h similarity index 96% rename from mindspore/lite/src/cxx_api/tensor_utils.h rename to mindspore/lite/src/runtime/cxx_api/tensor_utils.h index e8e4944043f..2cff2136c0c 100644 --- a/mindspore/lite/src/cxx_api/tensor_utils.h +++ b/mindspore/lite/src/runtime/cxx_api/tensor_utils.h @@ -23,7 +23,7 @@ #include "ir/dtype/type_id.h" #include "include/ms_tensor.h" #include "include/api/types.h" -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" namespace mindspore { std::vector MS_API TruncateShape(const std::vector &shape, enum TypeId type, size_t data_len, diff --git a/mindspore/lite/src/cxx_api/train/converters.cc b/mindspore/lite/src/runtime/cxx_api/train/converters.cc similarity index 97% rename from mindspore/lite/src/cxx_api/train/converters.cc rename to mindspore/lite/src/runtime/cxx_api/train/converters.cc index a8af96c777e..694259b3582 100644 --- a/mindspore/lite/src/cxx_api/train/converters.cc +++ b/mindspore/lite/src/runtime/cxx_api/train/converters.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/cxx_api/converters.h" +#include "src/runtime/cxx_api/converters.h" #include "include/train/train_cfg.h" #include "include/api/cfg.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/cxx_api/train/model.cc b/mindspore/lite/src/runtime/cxx_api/train/model.cc similarity index 97% rename from mindspore/lite/src/cxx_api/train/model.cc rename to mindspore/lite/src/runtime/cxx_api/train/model.cc index 5e18f60f2f7..59af8bff8c5 100644 --- a/mindspore/lite/src/cxx_api/train/model.cc +++ b/mindspore/lite/src/runtime/cxx_api/train/model.cc @@ -18,8 +18,8 @@ #include "include/api/net.h" #include "include/api/callback/callback.h" #include "include/api/dual_abi_helper.h" -#include "src/cxx_api/model/model_impl.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" #include "include/train/train_loop.h" #include "include/train/train_loop_callback.h" diff --git a/mindspore/lite/src/cxx_api/train/model_build.cc b/mindspore/lite/src/runtime/cxx_api/train/model_build.cc similarity index 98% rename from mindspore/lite/src/cxx_api/train/model_build.cc rename to mindspore/lite/src/runtime/cxx_api/train/model_build.cc index 7d39e913ce3..b59159780b3 100644 --- a/mindspore/lite/src/cxx_api/train/model_build.cc +++ b/mindspore/lite/src/runtime/cxx_api/train/model_build.cc @@ -16,7 +16,7 @@ #include "include/api/model.h" #include "src/common/log_adapter.h" -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" namespace mindspore { Status Model::Build(GraphCell lossGraphCell, Node *optimizer, std::vector inputs, const std::shared_ptr &model_context, const std::shared_ptr &train_cfg) { diff --git a/mindspore/lite/src/cxx_api/train/model_build_impl.cc b/mindspore/lite/src/runtime/cxx_api/train/model_build_impl.cc similarity index 93% rename from mindspore/lite/src/cxx_api/train/model_build_impl.cc rename to mindspore/lite/src/runtime/cxx_api/train/model_build_impl.cc index a992d8d7e32..98de3c1a3df 100644 --- a/mindspore/lite/src/cxx_api/train/model_build_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/train/model_build_impl.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" #include "include/train/train_cfg.h" -#include "src/cxx_api/converters.h" +#include "src/runtime/cxx_api/converters.h" #include "src/train/transfer_session.h" -#include "src/cxx_api/expression/node_impl.h" -#include "src/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/expression/node_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" namespace mindspore { std::unique_ptr ModelImpl::BuildTrain(Node *optimizer, std::vector inputs) { auto opt_impl = NodeImpl::GetImpl(optimizer); diff --git a/mindspore/lite/src/cxx_api/train/model_impl.cc b/mindspore/lite/src/runtime/cxx_api/train/model_impl.cc similarity index 90% rename from mindspore/lite/src/cxx_api/train/model_impl.cc rename to mindspore/lite/src/runtime/cxx_api/train/model_impl.cc index 12f5c4c3926..7091d111645 100644 --- a/mindspore/lite/src/cxx_api/train/model_impl.cc +++ b/mindspore/lite/src/runtime/cxx_api/train/model_impl.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" #include #include #include "include/api/serialization.h" #include "include/api/callback/callback.h" #include "include/api/metrics/metrics.h" -#include "src/cxx_api/expression/net_impl.h" -#include "src/cxx_api/converters.h" -#include "src/cxx_api/metrics/metrics_adapter.h" -#include "src/cxx_api/metrics/metrics_impl.h" -#include "src/cxx_api/callback/callback_adapter.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/expression/net_impl.h" +#include "src/runtime/cxx_api/converters.h" +#include "src/runtime/cxx_api/metrics/metrics_adapter.h" +#include "src/runtime/cxx_api/metrics/metrics_impl.h" +#include "src/runtime/cxx_api/callback/callback_adapter.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" #include "src/train/train_session.h" #include "src/train/transfer_session.h" diff --git a/mindspore/lite/src/cxx_api/train/train_support.cc b/mindspore/lite/src/runtime/cxx_api/train/train_support.cc similarity index 84% rename from mindspore/lite/src/cxx_api/train/train_support.cc rename to mindspore/lite/src/runtime/cxx_api/train/train_support.cc index 01a14201038..0af5dc5df5c 100644 --- a/mindspore/lite/src/cxx_api/train/train_support.cc +++ b/mindspore/lite/src/runtime/cxx_api/train/train_support.cc @@ -24,18 +24,18 @@ #include "include/context.h" #include "include/api/callback/callback.h" #include "include/api/metrics/metrics.h" -#include "src/lite_model.h" -#include "src/inner_context.h" +#include "src/runtime/lite_model.h" +#include "src/runtime/inner_context.h" #include "src/runtime/inner_allocator.h" -#include "src/cxx_api/model/model_impl.h" -#include "src/cxx_api/converters.h" -#include "src/cxx_api/graph/graph_data.h" -#include "src/cxx_api/tensor/tensor_impl.h" -#include "src/cxx_api/tensor_utils.h" -#include "src/cxx_api/metrics/metrics_adapter.h" -#include "src/cxx_api/metrics/metrics_impl.h" -#include "src/cxx_api/callback/callback_adapter.h" -#include "src/cxx_api/callback/callback_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/converters.h" +#include "src/runtime/cxx_api/graph/graph_data.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor_utils.h" +#include "src/runtime/cxx_api/metrics/metrics_adapter.h" +#include "src/runtime/cxx_api/metrics/metrics_impl.h" +#include "src/runtime/cxx_api/callback/callback_adapter.h" +#include "src/runtime/cxx_api/callback/callback_impl.h" #include "src/common/log_adapter.h" #include "src/train/train_session.h" #include "src/train/static_allocator.h" diff --git a/mindspore/lite/src/cxx_api/types.cc b/mindspore/lite/src/runtime/cxx_api/types.cc similarity index 99% rename from mindspore/lite/src/cxx_api/types.cc rename to mindspore/lite/src/runtime/cxx_api/types.cc index 93af29af4d2..8d77939b238 100644 --- a/mindspore/lite/src/cxx_api/types.cc +++ b/mindspore/lite/src/runtime/cxx_api/types.cc @@ -20,7 +20,7 @@ #include #include "include/api/status.h" #include "include/api/dual_abi_helper.h" -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" #include "src/common/log_adapter.h" #include "include/version.h" diff --git a/mindspore/lite/src/delegate/auto_registration_factory.h b/mindspore/lite/src/runtime/delegate/auto_registration_factory.h similarity index 100% rename from mindspore/lite/src/delegate/auto_registration_factory.h rename to mindspore/lite/src/runtime/delegate/auto_registration_factory.h diff --git a/mindspore/lite/src/delegate/delegate_utils.cc b/mindspore/lite/src/runtime/delegate/delegate_utils.cc similarity index 94% rename from mindspore/lite/src/delegate/delegate_utils.cc rename to mindspore/lite/src/runtime/delegate/delegate_utils.cc index 1c760584b71..0534f14f270 100644 --- a/mindspore/lite/src/delegate/delegate_utils.cc +++ b/mindspore/lite/src/runtime/delegate/delegate_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/delegate_utils.h" +#include "src/runtime/delegate/delegate_utils.h" namespace mindspore::lite { bool IsSubGraphInputTensor(const std::vector &inputs, mindspore::MSTensor input) { if (find(inputs.begin(), inputs.end(), input) != inputs.end()) { diff --git a/mindspore/lite/src/delegate/delegate_utils.h b/mindspore/lite/src/runtime/delegate/delegate_utils.h similarity index 100% rename from mindspore/lite/src/delegate/delegate_utils.h rename to mindspore/lite/src/runtime/delegate/delegate_utils.h diff --git a/mindspore/lite/src/delegate/npu/CMakeLists.txt b/mindspore/lite/src/runtime/delegate/npu/CMakeLists.txt similarity index 100% rename from mindspore/lite/src/delegate/npu/CMakeLists.txt rename to mindspore/lite/src/runtime/delegate/npu/CMakeLists.txt diff --git a/mindspore/lite/src/delegate/npu/npu_converter_utils.cc b/mindspore/lite/src/runtime/delegate/npu/npu_converter_utils.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/npu_converter_utils.cc rename to mindspore/lite/src/runtime/delegate/npu/npu_converter_utils.cc index 17fa2f264fd..4bf30026fc7 100644 --- a/mindspore/lite/src/delegate/npu/npu_converter_utils.cc +++ b/mindspore/lite/src/runtime/delegate/npu/npu_converter_utils.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/npu_converter_utils.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { #define C4NUM 4 #define C8NUM 8 diff --git a/mindspore/lite/src/delegate/npu/npu_converter_utils.h b/mindspore/lite/src/runtime/delegate/npu/npu_converter_utils.h similarity index 100% rename from mindspore/lite/src/delegate/npu/npu_converter_utils.h rename to mindspore/lite/src/runtime/delegate/npu/npu_converter_utils.h diff --git a/mindspore/lite/src/delegate/npu/npu_delegate.cc b/mindspore/lite/src/runtime/delegate/npu/npu_delegate.cc similarity index 84% rename from mindspore/lite/src/delegate/npu/npu_delegate.cc rename to mindspore/lite/src/runtime/delegate/npu/npu_delegate.cc index 79cf43f88b9..46abbf0020c 100644 --- a/mindspore/lite/src/delegate/npu/npu_delegate.cc +++ b/mindspore/lite/src/runtime/delegate/npu/npu_delegate.cc @@ -14,50 +14,50 @@ * limitations under the License. */ -#include "src/delegate/npu/npu_delegate.h" +#include "src/runtime/delegate/npu/npu_delegate.h" #include #include "include/errorcode.h" #include "src/common/prim_util.h" -#include "src/delegate/npu/pass/npu_pass_utils.h" -#include "src/delegate/npu/op/npu_op.h" -#include "src/delegate/npu/op/activation_npu.h" -#include "src/delegate/npu/op/argmax_npu.h" -#include "src/delegate/npu/op/arithmetic_npu.h" -#include "src/delegate/npu/op/arithmetic_self_npu.h" -#include "src/delegate/npu/op/avg_pooling_npu.h" -#include "src/delegate/npu/op/batchnorm_npu.h" -#include "src/delegate/npu/op/cast_npu.h" -#include "src/delegate/npu/op/concat_npu.h" -#include "src/delegate/npu/op/convolution_npu.h" -#include "src/delegate/npu/op/crop_and_resize_npu.h" -#include "src/delegate/npu/op/deconvolution_npu.h" -#include "src/delegate/npu/op/eltwise_npu.h" -#include "src/delegate/npu/op/expand_dims_npu.h" -#include "src/delegate/npu/op/fullconnection_npu.h" -#include "src/delegate/npu/op/gather_npu.h" -#include "src/delegate/npu/op/instance_norm_npu.h" -#include "src/delegate/npu/op/matmul_npu.h" -#include "src/delegate/npu/op/max_pooling_npu.h" -#include "src/delegate/npu/op/pad_npu.h" -#include "src/delegate/npu/op/reduce_npu.h" -#include "src/delegate/npu/op/reshape_npu.h" -#include "src/delegate/npu/op/resize_npu.h" -#include "src/delegate/npu/op/scale_npu.h" -#include "src/delegate/npu/op/slice_npu.h" -#include "src/delegate/npu/op/softmax_npu.h" -#include "src/delegate/npu/op/split_npu.h" -#include "src/delegate/npu/op/squeeze_npu.h" -#include "src/delegate/npu/op/strided_slice_npu.h" -#include "src/delegate/npu/op/tile_npu.h" -#include "src/delegate/npu/op/transpose_npu.h" -#include "src/delegate/npu/op/unsqueeze_npu.h" -#include "src/delegate/npu/op/abs_npu.h" -#include "src/delegate/npu/op/flatten_npu.h" -#include "src/delegate/npu/npu_graph.h" -#include "src/delegate/delegate_utils.h" -#include "src/delegate/npu/pass/npu_transform_pass.h" -#include "src/delegate/npu/pass/npu_insert_transform_pass.h" -#include "src/delegate/npu/pass/npu_fusion_pass.h" +#include "src/runtime/delegate/npu/pass/npu_pass_utils.h" +#include "src/runtime/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/activation_npu.h" +#include "src/runtime/delegate/npu/op/argmax_npu.h" +#include "src/runtime/delegate/npu/op/arithmetic_npu.h" +#include "src/runtime/delegate/npu/op/arithmetic_self_npu.h" +#include "src/runtime/delegate/npu/op/avg_pooling_npu.h" +#include "src/runtime/delegate/npu/op/batchnorm_npu.h" +#include "src/runtime/delegate/npu/op/cast_npu.h" +#include "src/runtime/delegate/npu/op/concat_npu.h" +#include "src/runtime/delegate/npu/op/convolution_npu.h" +#include "src/runtime/delegate/npu/op/crop_and_resize_npu.h" +#include "src/runtime/delegate/npu/op/deconvolution_npu.h" +#include "src/runtime/delegate/npu/op/eltwise_npu.h" +#include "src/runtime/delegate/npu/op/expand_dims_npu.h" +#include "src/runtime/delegate/npu/op/fullconnection_npu.h" +#include "src/runtime/delegate/npu/op/gather_npu.h" +#include "src/runtime/delegate/npu/op/instance_norm_npu.h" +#include "src/runtime/delegate/npu/op/matmul_npu.h" +#include "src/runtime/delegate/npu/op/max_pooling_npu.h" +#include "src/runtime/delegate/npu/op/pad_npu.h" +#include "src/runtime/delegate/npu/op/reduce_npu.h" +#include "src/runtime/delegate/npu/op/reshape_npu.h" +#include "src/runtime/delegate/npu/op/resize_npu.h" +#include "src/runtime/delegate/npu/op/scale_npu.h" +#include "src/runtime/delegate/npu/op/slice_npu.h" +#include "src/runtime/delegate/npu/op/softmax_npu.h" +#include "src/runtime/delegate/npu/op/split_npu.h" +#include "src/runtime/delegate/npu/op/squeeze_npu.h" +#include "src/runtime/delegate/npu/op/strided_slice_npu.h" +#include "src/runtime/delegate/npu/op/tile_npu.h" +#include "src/runtime/delegate/npu/op/transpose_npu.h" +#include "src/runtime/delegate/npu/op/unsqueeze_npu.h" +#include "src/runtime/delegate/npu/op/abs_npu.h" +#include "src/runtime/delegate/npu/op/flatten_npu.h" +#include "src/runtime/delegate/npu/npu_graph.h" +#include "src/runtime/delegate/delegate_utils.h" +#include "src/runtime/delegate/npu/pass/npu_transform_pass.h" +#include "src/runtime/delegate/npu/pass/npu_insert_transform_pass.h" +#include "src/runtime/delegate/npu/pass/npu_fusion_pass.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/delegate/npu/npu_delegate.h b/mindspore/lite/src/runtime/delegate/npu/npu_delegate.h similarity index 91% rename from mindspore/lite/src/delegate/npu/npu_delegate.h rename to mindspore/lite/src/runtime/delegate/npu/npu_delegate.h index 9eaf5f8b584..2093a7897f3 100644 --- a/mindspore/lite/src/delegate/npu/npu_delegate.h +++ b/mindspore/lite/src/runtime/delegate/npu/npu_delegate.h @@ -21,9 +21,9 @@ #include #include "include/api/delegate.h" #include "include/context.h" -#include "src/delegate/npu/npu_manager.h" -#include "src/delegate/npu/pass/npu_pass_manager.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/pass/npu_pass_manager.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class NPUDelegate : public Delegate { diff --git a/mindspore/lite/src/delegate/npu/npu_executor.cc b/mindspore/lite/src/runtime/delegate/npu/npu_executor.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/npu_executor.cc rename to mindspore/lite/src/runtime/delegate/npu/npu_executor.cc index 4a7eeba1971..af21aadd3bf 100644 --- a/mindspore/lite/src/delegate/npu/npu_executor.cc +++ b/mindspore/lite/src/runtime/delegate/npu/npu_executor.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "src/delegate/npu/npu_executor.h" +#include "src/runtime/delegate/npu/npu_executor.h" #include #include #include "include/errorcode.h" -#include "src/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/npu_manager.h" #include "src/common/log_adapter.h" namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/npu_executor.h b/mindspore/lite/src/runtime/delegate/npu/npu_executor.h similarity index 95% rename from mindspore/lite/src/delegate/npu/npu_executor.h rename to mindspore/lite/src/runtime/delegate/npu/npu_executor.h index 53403e77c83..8d11202e1c6 100644 --- a/mindspore/lite/src/delegate/npu/npu_executor.h +++ b/mindspore/lite/src/runtime/delegate/npu/npu_executor.h @@ -22,8 +22,8 @@ #include #include "include/errorcode.h" #include "include/HiAiModelManagerService.h" -#include "src/delegate/npu/npu_manager.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class NPUExecutor { diff --git a/mindspore/lite/src/delegate/npu/npu_graph.cc b/mindspore/lite/src/runtime/delegate/npu/npu_graph.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/npu_graph.cc rename to mindspore/lite/src/runtime/delegate/npu/npu_graph.cc index e15bfb326d1..672e53de6d3 100644 --- a/mindspore/lite/src/delegate/npu/npu_graph.cc +++ b/mindspore/lite/src/runtime/delegate/npu/npu_graph.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "src/delegate/npu/npu_graph.h" +#include "src/runtime/delegate/npu/npu_graph.h" #include -#include "src/delegate/npu/npu_subgraph.h" -#include "src/delegate/delegate_utils.h" -#include "src/delegate/npu/op/transpose_npu.h" -#include "src/delegate/npu/transpose_kernel.h" +#include "src/runtime/delegate/npu/npu_subgraph.h" +#include "src/runtime/delegate/delegate_utils.h" +#include "src/runtime/delegate/npu/op/transpose_npu.h" +#include "src/runtime/delegate/npu/transpose_kernel.h" namespace mindspore { NPUGraph::~NPUGraph() { for (auto *kernel : all_kernels_) { diff --git a/mindspore/lite/src/delegate/npu/npu_graph.h b/mindspore/lite/src/runtime/delegate/npu/npu_graph.h similarity index 96% rename from mindspore/lite/src/delegate/npu/npu_graph.h rename to mindspore/lite/src/runtime/delegate/npu/npu_graph.h index 4cba464d5fc..d275b1d4673 100644 --- a/mindspore/lite/src/delegate/npu/npu_graph.h +++ b/mindspore/lite/src/runtime/delegate/npu/npu_graph.h @@ -22,8 +22,8 @@ #include #include #include "include/api/kernel.h" -#include "src/delegate/npu/op/npu_op.h" -#include "src/delegate/npu/npu_executor.h" +#include "src/runtime/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/npu_executor.h" namespace mindspore { class NPUGraph : public kernel::Kernel { diff --git a/mindspore/lite/src/delegate/npu/npu_manager.cc b/mindspore/lite/src/runtime/delegate/npu/npu_manager.cc similarity index 99% rename from mindspore/lite/src/delegate/npu/npu_manager.cc rename to mindspore/lite/src/runtime/delegate/npu/npu_manager.cc index 22bf32b92eb..3f481fd1a57 100644 --- a/mindspore/lite/src/delegate/npu/npu_manager.cc +++ b/mindspore/lite/src/runtime/delegate/npu/npu_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/npu_manager.h" #include #include "include/hiai_ir_build.h" #include "include/HiAiModelManagerService.h" diff --git a/mindspore/lite/src/delegate/npu/npu_manager.h b/mindspore/lite/src/runtime/delegate/npu/npu_manager.h similarity index 100% rename from mindspore/lite/src/delegate/npu/npu_manager.h rename to mindspore/lite/src/runtime/delegate/npu/npu_manager.h diff --git a/mindspore/lite/src/delegate/npu/npu_subgraph.cc b/mindspore/lite/src/runtime/delegate/npu/npu_subgraph.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/npu_subgraph.cc rename to mindspore/lite/src/runtime/delegate/npu/npu_subgraph.cc index f525f2df6ef..a1f94699b74 100644 --- a/mindspore/lite/src/delegate/npu/npu_subgraph.cc +++ b/mindspore/lite/src/runtime/delegate/npu/npu_subgraph.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/npu_subgraph.h" +#include "src/runtime/delegate/npu/npu_subgraph.h" #include #include #include @@ -26,7 +26,7 @@ #include "include/hiai_ir_build.h" #include "include/version.h" #include "src/common/utils.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { static std::set npu_specific_weight_nodes = { schema::PrimitiveType_Conv2DFusion, schema::PrimitiveType_Conv2dTransposeFusion, schema::PrimitiveType_PadFusion, diff --git a/mindspore/lite/src/delegate/npu/npu_subgraph.h b/mindspore/lite/src/runtime/delegate/npu/npu_subgraph.h similarity index 98% rename from mindspore/lite/src/delegate/npu/npu_subgraph.h rename to mindspore/lite/src/runtime/delegate/npu/npu_subgraph.h index ef6c14f2e11..9335e2c2c78 100644 --- a/mindspore/lite/src/delegate/npu/npu_subgraph.h +++ b/mindspore/lite/src/runtime/delegate/npu/npu_subgraph.h @@ -21,7 +21,7 @@ #include #include #include "include/api/kernel.h" -#include "src/delegate/npu/npu_executor.h" +#include "src/runtime/delegate/npu/npu_executor.h" namespace mindspore { class NPUSubGraph : public kernel::Kernel { diff --git a/mindspore/lite/src/delegate/npu/op/abs_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/abs_npu.cc similarity index 95% rename from mindspore/lite/src/delegate/npu/op/abs_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/abs_npu.cc index e2bcbe8ad73..5e378bc830c 100644 --- a/mindspore/lite/src/delegate/npu/op/abs_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/abs_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/abs_npu.h" +#include "src/runtime/delegate/npu/op/abs_npu.h" #include "include/graph/op/all_ops.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { int AbsNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/abs_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/abs_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/abs_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/abs_npu.h index 96d788f6fe5..85475b8d03b 100644 --- a/mindspore/lite/src/delegate/npu/op/abs_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/abs_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class AbsNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/activation_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/activation_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/activation_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/activation_npu.cc index faacbfaab85..e7b05b9507f 100644 --- a/mindspore/lite/src/delegate/npu/op/activation_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/activation_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/activation_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/activation_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ActivationNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, const std::vector &out_tensors) { diff --git a/mindspore/lite/src/delegate/npu/op/activation_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/activation_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/activation_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/activation_npu.h index 7b83a11e0e2..72dbf5fed64 100644 --- a/mindspore/lite/src/delegate/npu/op/activation_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/activation_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/compatible/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ActivationNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/argmax_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/argmax_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/argmax_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/argmax_npu.cc index ad5684cab5c..2749fbd36e2 100644 --- a/mindspore/lite/src/delegate/npu/op/argmax_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/argmax_npu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/op/argmax_npu.h" +#include "src/runtime/delegate/npu/op/argmax_npu.h" #include namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/op/argmax_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/argmax_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/argmax_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/argmax_npu.h index dd75f660cbe..94f3690713c 100644 --- a/mindspore/lite/src/delegate/npu/op/argmax_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/argmax_npu.h @@ -21,7 +21,7 @@ #include #include "include/graph/op/all_ops.h" #include "include/graph/compatible/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/op/arithmetic_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/arithmetic_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/arithmetic_npu.cc index 746ed62ea40..2f9661ff777 100644 --- a/mindspore/lite/src/delegate/npu/op/arithmetic_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/arithmetic_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/arithmetic_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int ARITHMETIC_INPUT_NUM = 2; constexpr int MAX_HW_SIZE = 1664; diff --git a/mindspore/lite/src/delegate/npu/op/arithmetic_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_npu.h similarity index 98% rename from mindspore/lite/src/delegate/npu/op/arithmetic_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/arithmetic_npu.h index b655886982d..f546e724b3e 100644 --- a/mindspore/lite/src/delegate/npu/op/arithmetic_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ArithmeticNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/arithmetic_self_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_self_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/arithmetic_self_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/arithmetic_self_npu.cc index 5fcc294e390..4f07c2982a8 100644 --- a/mindspore/lite/src/delegate/npu/op/arithmetic_self_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_self_npu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/op/arithmetic_self_npu.h" +#include "src/runtime/delegate/npu/op/arithmetic_self_npu.h" #include namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/op/arithmetic_self_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_self_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/arithmetic_self_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/arithmetic_self_npu.h index 8cba73753e6..caddc67862f 100644 --- a/mindspore/lite/src/delegate/npu/op/arithmetic_self_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/arithmetic_self_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/math_defs.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ArithmeticSelfNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/avg_pooling_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/avg_pooling_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/avg_pooling_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/avg_pooling_npu.cc index d78a7e6ecfb..bd820429404 100644 --- a/mindspore/lite/src/delegate/npu/op/avg_pooling_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/avg_pooling_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/avg_pooling_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" -#include "src/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/op/avg_pooling_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_manager.h" namespace mindspore { constexpr int MAX_HW_SIZE = 65534; diff --git a/mindspore/lite/src/delegate/npu/op/avg_pooling_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/avg_pooling_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/avg_pooling_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/avg_pooling_npu.h index b19242fc3b3..d15275daff2 100644 --- a/mindspore/lite/src/delegate/npu/op/avg_pooling_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/avg_pooling_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class AvgPoolingNPUOp : public ConvolutionBaseNPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/batchnorm_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/batchnorm_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/batchnorm_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/batchnorm_npu.cc index 1481149bd47..b263827ea29 100644 --- a/mindspore/lite/src/delegate/npu/op/batchnorm_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/batchnorm_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/batchnorm_npu.h" +#include "src/runtime/delegate/npu/op/batchnorm_npu.h" #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int SCALE_INDEX = 1; diff --git a/mindspore/lite/src/delegate/npu/op/batchnorm_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/batchnorm_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/batchnorm_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/batchnorm_npu.h index ffb06cc005f..d93364559ce 100644 --- a/mindspore/lite/src/delegate/npu/op/batchnorm_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/batchnorm_npu.h @@ -20,7 +20,7 @@ #include #include "include/graph/op/all_ops.h" #include "include/graph/compatible/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class BatchnormNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/cast_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/cast_npu.cc similarity index 95% rename from mindspore/lite/src/delegate/npu/op/cast_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/cast_npu.cc index 4ed08ba01ec..beac5063928 100644 --- a/mindspore/lite/src/delegate/npu/op/cast_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/cast_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/cast_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/cast_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int CastNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/cast_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/cast_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/cast_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/cast_npu.h index 03e8df3622d..98d5c90795e 100644 --- a/mindspore/lite/src/delegate/npu/op/cast_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/cast_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class CastNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/concat_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/concat_npu.cc similarity index 95% rename from mindspore/lite/src/delegate/npu/op/concat_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/concat_npu.cc index 62f665145ce..1ffa4739f2a 100644 --- a/mindspore/lite/src/delegate/npu/op/concat_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/concat_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/concat_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/concat_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ConcatNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/concat_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/concat_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/concat_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/concat_npu.h index f346aafe306..e92d6bc65ba 100644 --- a/mindspore/lite/src/delegate/npu/op/concat_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/concat_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ConcatNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/convolution_base_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/convolution_base_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/convolution_base_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_base_npu.cc index 1769e859fce..121a202c905 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_base_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_base_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/convolution_base_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" -#include "src/delegate/npu/transpose_kernel.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/transpose_kernel.h" #include "nnacl/int8/pack_int8.h" namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/op/convolution_base_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/convolution_base_npu.h similarity index 98% rename from mindspore/lite/src/delegate/npu/op/convolution_base_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_base_npu.h index 0cbd04ce3c8..495cde33209 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_base_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_base_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { constexpr int WEIGHT_INDEX = 1; constexpr int BIAS_INDEX = 2; diff --git a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_int8_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_depthwise_int8_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.cc index 478e1840c36..63a4e638e5c 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_int8_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/convolution_depthwise_int8_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ConvolutionDepthwiseInt8NPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_int8_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_depthwise_int8_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.h index cf797f38a32..6b9bf0b44eb 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_int8_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.h @@ -20,7 +20,7 @@ #include #include #include "include/graph/compatible/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class ConvolutionDepthwiseInt8NPUOp : public ConvolutionBaseNPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_depthwise_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_npu.cc index e53d991b819..f3cff0a752f 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/convolution_depthwise_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/convolution_depthwise_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ConvolutionDepthwiseNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_depthwise_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_npu.h index 49ec07e29ab..a177d4b0fe6 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_depthwise_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_depthwise_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/compatible/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class ConvolutionDepthwiseNPUOp : public ConvolutionBaseNPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/convolution_int8_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/convolution_int8_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_int8_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_int8_npu.cc index 1382d904d31..af7c93f13e8 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_int8_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_int8_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/convolution_int8_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/convolution_int8_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ConvolutionInt8NPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/convolution_int8_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/convolution_int8_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_int8_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_int8_npu.h index 5d36beb7094..4c90f23d2b4 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_int8_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_int8_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class ConvolutionInt8NPUOp : public ConvolutionBaseNPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/convolution_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/convolution_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/convolution_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_npu.cc index 7bb27a031d3..3b6b108c17d 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_npu.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "src/delegate/npu/op/convolution_npu.h" -#include "src/delegate/npu/op/convolution_depthwise_npu.h" -#include "src/delegate/npu/op/convolution_int8_npu.h" -#include "src/delegate/npu/op/convolution_depthwise_int8_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/convolution_npu.h" +#include "src/runtime/delegate/npu/op/convolution_depthwise_npu.h" +#include "src/runtime/delegate/npu/op/convolution_int8_npu.h" +#include "src/runtime/delegate/npu/op/convolution_depthwise_int8_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ConvolutionNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, const std::vector &out_tensors) { diff --git a/mindspore/lite/src/delegate/npu/op/convolution_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/convolution_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/convolution_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/convolution_npu.h index 4da811f7ab7..65a60d6c8d7 100644 --- a/mindspore/lite/src/delegate/npu/op/convolution_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/convolution_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class ConvolutionNPUOp : public ConvolutionBaseNPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/crop_and_resize_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/crop_and_resize_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/crop_and_resize_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/crop_and_resize_npu.cc index eaf221237e9..9b2b08a097a 100644 --- a/mindspore/lite/src/delegate/npu/op/crop_and_resize_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/crop_and_resize_npu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/op/crop_and_resize_npu.h" +#include "src/runtime/delegate/npu/op/crop_and_resize_npu.h" namespace mindspore { constexpr int BOXES_INDEX = 1; constexpr int BOX_INDEX = 2; diff --git a/mindspore/lite/src/delegate/npu/op/crop_and_resize_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/crop_and_resize_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/crop_and_resize_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/crop_and_resize_npu.h index ee213524c25..e24fb64e573 100644 --- a/mindspore/lite/src/delegate/npu/op/crop_and_resize_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/crop_and_resize_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class CropAndResizeNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/deconvolution_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/deconvolution_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/deconvolution_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/deconvolution_npu.cc index d7826d5e309..50dcd80be85 100644 --- a/mindspore/lite/src/delegate/npu/op/deconvolution_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/deconvolution_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/deconvolution_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/deconvolution_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" #include "nnacl/op_base.h" #include "src/common/log_util.h" diff --git a/mindspore/lite/src/delegate/npu/op/deconvolution_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/deconvolution_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/deconvolution_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/deconvolution_npu.h index 771ec41ce21..bcc56debbd5 100644 --- a/mindspore/lite/src/delegate/npu/op/deconvolution_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/deconvolution_npu.h @@ -20,7 +20,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class DeconvolutionNPUOp : public ConvolutionBaseNPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/eltwise_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/eltwise_npu.cc similarity index 94% rename from mindspore/lite/src/delegate/npu/op/eltwise_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/eltwise_npu.cc index c41af78184c..bfbb27ea9e6 100644 --- a/mindspore/lite/src/delegate/npu/op/eltwise_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/eltwise_npu.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/delegate/npu/op/eltwise_npu.h" +#include "src/runtime/delegate/npu/op/eltwise_npu.h" #include "include/graph/op/all_ops.h" -#include "src/kernel_registry.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int EltwiseNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/eltwise_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/eltwise_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/eltwise_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/eltwise_npu.h index 79cc2d8b169..693824fb666 100644 --- a/mindspore/lite/src/delegate/npu/op/eltwise_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/eltwise_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class EltwiseNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/expand_dims_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/expand_dims_npu.cc similarity index 93% rename from mindspore/lite/src/delegate/npu/op/expand_dims_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/expand_dims_npu.cc index 93a3b5ebf2b..72e6290b6eb 100644 --- a/mindspore/lite/src/delegate/npu/op/expand_dims_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/expand_dims_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/expand_dims_npu.h" +#include "src/runtime/delegate/npu/op/expand_dims_npu.h" #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ExpandDimsNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/expand_dims_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/expand_dims_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/expand_dims_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/expand_dims_npu.h index ffaf543e572..c7e0e0f027c 100644 --- a/mindspore/lite/src/delegate/npu/op/expand_dims_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/expand_dims_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ExpandDimsNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/flatten_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/flatten_npu.cc similarity index 95% rename from mindspore/lite/src/delegate/npu/op/flatten_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/flatten_npu.cc index fd1fad1e568..296dda83c60 100644 --- a/mindspore/lite/src/delegate/npu/op/flatten_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/flatten_npu.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/delegate/npu/op/flatten_npu.h" +#include "src/runtime/delegate/npu/op/flatten_npu.h" #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/npu_converter_utils.h" -#include "src/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_manager.h" namespace mindspore { int FlattenNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/flatten_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/flatten_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/flatten_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/flatten_npu.h index 6ddd77aafc9..408f58fec1a 100644 --- a/mindspore/lite/src/delegate/npu/op/flatten_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/flatten_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class FlattenNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/fullconnection_int8_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_int8_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/fullconnection_int8_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/fullconnection_int8_npu.cc index 8518572ccd0..3467d1a222b 100644 --- a/mindspore/lite/src/delegate/npu/op/fullconnection_int8_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_int8_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/fullconnection_int8_npu.h" +#include "src/runtime/delegate/npu/op/fullconnection_int8_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int FC_INPUT_DIM = 2; diff --git a/mindspore/lite/src/delegate/npu/op/fullconnection_int8_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_int8_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/fullconnection_int8_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/fullconnection_int8_npu.h index 2cb29dedd45..911f11eb6a9 100644 --- a/mindspore/lite/src/delegate/npu/op/fullconnection_int8_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_int8_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class FullconnectionINT8NPUOp : public ConvolutionBaseNPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/fullconnection_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/fullconnection_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/fullconnection_npu.cc index d23238b7c59..9ccd0edb98d 100644 --- a/mindspore/lite/src/delegate/npu/op/fullconnection_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_npu.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/delegate/npu/op/fullconnection_npu.h" -#include "src/delegate/npu/op/fullconnection_int8_npu.h" +#include "src/runtime/delegate/npu/op/fullconnection_npu.h" +#include "src/runtime/delegate/npu/op/fullconnection_int8_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int FC_INPUT_DIM = 2; diff --git a/mindspore/lite/src/delegate/npu/op/fullconnection_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/fullconnection_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/fullconnection_npu.h index 2d5925bc543..60a026d79bd 100644 --- a/mindspore/lite/src/delegate/npu/op/fullconnection_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/fullconnection_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class FullconnectionNPUOp : public ConvolutionBaseNPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/gather_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/gather_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/gather_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/gather_npu.cc index 7a80f56a39d..cbfadbdf68f 100644 --- a/mindspore/lite/src/delegate/npu/op/gather_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/gather_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/gather_npu.h" -#include "src/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/op/gather_npu.h" +#include "src/runtime/delegate/npu/npu_manager.h" namespace mindspore { constexpr int AXIS_INDEX = 2; diff --git a/mindspore/lite/src/delegate/npu/op/gather_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/gather_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/gather_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/gather_npu.h index fadd643f14d..ce0f87a0539 100644 --- a/mindspore/lite/src/delegate/npu/op/gather_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/gather_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class GatherNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/instance_norm_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/instance_norm_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/instance_norm_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/instance_norm_npu.cc index d017e03a87c..438f80840e2 100644 --- a/mindspore/lite/src/delegate/npu/op/instance_norm_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/instance_norm_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/instance_norm_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/instance_norm_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int GAMMA_INDEX = 1; diff --git a/mindspore/lite/src/delegate/npu/op/instance_norm_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/instance_norm_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/instance_norm_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/instance_norm_npu.h index 79534fa7b6d..daf1a58531c 100644 --- a/mindspore/lite/src/delegate/npu/op/instance_norm_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/instance_norm_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class InstanceNormNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/matmul_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/matmul_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/matmul_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/matmul_npu.cc index 9e81579bd03..1accb56b89e 100644 --- a/mindspore/lite/src/delegate/npu/op/matmul_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/matmul_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/matmul_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/matmul_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int BIAS_INDEX = 2; constexpr int MATMUL_COMMON_DIM = 2; diff --git a/mindspore/lite/src/delegate/npu/op/matmul_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/matmul_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/matmul_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/matmul_npu.h index 9a2df1941cb..7998b4c3c16 100644 --- a/mindspore/lite/src/delegate/npu/op/matmul_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/matmul_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class MatMulNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/max_pooling_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/max_pooling_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/max_pooling_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/max_pooling_npu.cc index 74658878fc5..f814241fff7 100644 --- a/mindspore/lite/src/delegate/npu/op/max_pooling_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/max_pooling_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/max_pooling_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/max_pooling_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int MaxPoolingNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, const std::vector &out_tensors) { diff --git a/mindspore/lite/src/delegate/npu/op/max_pooling_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/max_pooling_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/max_pooling_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/max_pooling_npu.h index 8a5863822d9..0faa594cdb0 100644 --- a/mindspore/lite/src/delegate/npu/op/max_pooling_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/max_pooling_npu.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_OP_MAX_POOLING_NPU_H_ #include #include -#include "src/delegate/npu/op/convolution_base_npu.h" +#include "src/runtime/delegate/npu/op/convolution_base_npu.h" namespace mindspore { class MaxPoolingNPUOp : public ConvolutionBaseNPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/npu_op.h b/mindspore/lite/src/runtime/delegate/npu/op/npu_op.h similarity index 100% rename from mindspore/lite/src/delegate/npu/op/npu_op.h rename to mindspore/lite/src/runtime/delegate/npu/op/npu_op.h diff --git a/mindspore/lite/src/delegate/npu/op/pad_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/pad_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/pad_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/pad_npu.cc index c8f98ed788c..d068c030548 100644 --- a/mindspore/lite/src/delegate/npu/op/pad_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/pad_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/pad_npu.h" +#include "src/runtime/delegate/npu/op/pad_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int PAD_PAIR_SIZE = 2; diff --git a/mindspore/lite/src/delegate/npu/op/pad_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/pad_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/pad_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/pad_npu.h index 32cb6c9776c..3ef2c2556c2 100644 --- a/mindspore/lite/src/delegate/npu/op/pad_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/pad_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class PadNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/reduce_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/reduce_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/reduce_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/reduce_npu.cc index c7ccbcb414b..216f1264460 100644 --- a/mindspore/lite/src/delegate/npu/op/reduce_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/reduce_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/reduce_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/reduce_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ReduceNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/reduce_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/reduce_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/reduce_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/reduce_npu.h index e8fc0d6e7b7..6732e9d9f72 100644 --- a/mindspore/lite/src/delegate/npu/op/reduce_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/reduce_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ReduceNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/reshape_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/reshape_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/reshape_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/reshape_npu.cc index bcae92b0b78..9187cabf766 100644 --- a/mindspore/lite/src/delegate/npu/op/reshape_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/reshape_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/reshape_npu.h" +#include "src/runtime/delegate/npu/op/reshape_npu.h" #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int ReshapeNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, const std::vector &out_tensors) { diff --git a/mindspore/lite/src/delegate/npu/op/reshape_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/reshape_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/reshape_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/reshape_npu.h index fefd3cc3d48..c41c4db92a8 100644 --- a/mindspore/lite/src/delegate/npu/op/reshape_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/reshape_npu.h @@ -21,7 +21,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ReshapeNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/resize_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/resize_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/resize_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/resize_npu.cc index 922c5c59f25..ec3bfe3d260 100644 --- a/mindspore/lite/src/delegate/npu/op/resize_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/resize_npu.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/delegate/npu/op/resize_npu.h" +#include "src/runtime/delegate/npu/op/resize_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" -#include "src/delegate/npu/npu_manager.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_manager.h" namespace mindspore { int ResizeNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/resize_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/resize_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/resize_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/resize_npu.h index b1f43d596e2..95c792be7be 100644 --- a/mindspore/lite/src/delegate/npu/op/resize_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/resize_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ResizeNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/scale_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/scale_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/scale_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/scale_npu.cc index 51a461c4593..a21c19e88d5 100644 --- a/mindspore/lite/src/delegate/npu/op/scale_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/scale_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/scale_npu.h" +#include "src/runtime/delegate/npu/op/scale_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int INPUT_INDEX = 0; diff --git a/mindspore/lite/src/delegate/npu/op/scale_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/scale_npu.h similarity index 98% rename from mindspore/lite/src/delegate/npu/op/scale_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/scale_npu.h index 75ea4a7e3e4..8fd2e1b0aef 100644 --- a/mindspore/lite/src/delegate/npu/op/scale_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/scale_npu.h @@ -20,7 +20,7 @@ #include #include "include/graph/op/all_ops.h" #include "include/graph/op/nn_defs.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class ScaleNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/slice_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/slice_npu.cc similarity index 93% rename from mindspore/lite/src/delegate/npu/op/slice_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/slice_npu.cc index 904045c1ff4..fee3afae3ea 100644 --- a/mindspore/lite/src/delegate/npu/op/slice_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/slice_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/slice_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/slice_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { constexpr int OFFSET_INDEX = 1; diff --git a/mindspore/lite/src/delegate/npu/op/slice_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/slice_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/slice_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/slice_npu.h index 5dd962148be..20dfa859fd2 100644 --- a/mindspore/lite/src/delegate/npu/op/slice_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/slice_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class SliceNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/softmax_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/softmax_npu.cc similarity index 94% rename from mindspore/lite/src/delegate/npu/op/softmax_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/softmax_npu.cc index 911ac9107d8..77279f25b2b 100644 --- a/mindspore/lite/src/delegate/npu/op/softmax_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/softmax_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/softmax_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/softmax_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int SoftmaxNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/softmax_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/softmax_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/softmax_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/softmax_npu.h index 045be8f9d66..ca06dd86381 100644 --- a/mindspore/lite/src/delegate/npu/op/softmax_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/softmax_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/nn_defs.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class SoftmaxNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/split_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/split_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/split_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/split_npu.cc index 30821fc0ad6..c080ccf760e 100644 --- a/mindspore/lite/src/delegate/npu/op/split_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/split_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/split_npu.h" +#include "src/runtime/delegate/npu/op/split_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int SplitNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/split_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/split_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/split_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/split_npu.h index 5dc6e994dd8..63e47e1fdbd 100644 --- a/mindspore/lite/src/delegate/npu/op/split_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/split_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class SplitNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/squeeze_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/squeeze_npu.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/op/squeeze_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/squeeze_npu.cc index 16c83c56215..7a75ca5902a 100644 --- a/mindspore/lite/src/delegate/npu/op/squeeze_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/squeeze_npu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/op/squeeze_npu.h" +#include "src/runtime/delegate/npu/op/squeeze_npu.h" namespace mindspore { int SqueezeNPUOp::Init(const schema::Primitive *primitive, const std::vector &in_tensors, const std::vector &out_tensors) { diff --git a/mindspore/lite/src/delegate/npu/op/squeeze_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/squeeze_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/squeeze_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/squeeze_npu.h index 7ed3f5d82e0..d964fba8a37 100644 --- a/mindspore/lite/src/delegate/npu/op/squeeze_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/squeeze_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class SqueezeNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/strided_slice_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/strided_slice_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/strided_slice_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/strided_slice_npu.cc index cc80a7f98bf..afe6c104d4e 100644 --- a/mindspore/lite/src/delegate/npu/op/strided_slice_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/strided_slice_npu.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "src/delegate/npu/op/strided_slice_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/strided_slice_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int StridedSliceNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/strided_slice_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/strided_slice_npu.h similarity index 98% rename from mindspore/lite/src/delegate/npu/op/strided_slice_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/strided_slice_npu.h index 88d9711121d..d55fec13fbe 100644 --- a/mindspore/lite/src/delegate/npu/op/strided_slice_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/strided_slice_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { constexpr int ONNX_INPUT_SIZE = 5; diff --git a/mindspore/lite/src/delegate/npu/op/tile_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/tile_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/tile_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/tile_npu.cc index 0bd2795f981..56804a487e1 100644 --- a/mindspore/lite/src/delegate/npu/op/tile_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/tile_npu.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/op/tile_npu.h" +#include "src/runtime/delegate/npu/op/tile_npu.h" #include -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { int TileNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, diff --git a/mindspore/lite/src/delegate/npu/op/tile_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/tile_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/tile_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/tile_npu.h index 3e5c2cec001..bc81878a23a 100644 --- a/mindspore/lite/src/delegate/npu/op/tile_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/tile_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class TileNPUOp : public NPUOp { diff --git a/mindspore/lite/src/delegate/npu/op/transpose_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/transpose_npu.cc similarity index 96% rename from mindspore/lite/src/delegate/npu/op/transpose_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/transpose_npu.cc index 92c1a446020..33ae744802b 100644 --- a/mindspore/lite/src/delegate/npu/op/transpose_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/transpose_npu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/op/transpose_npu.h" +#include "src/runtime/delegate/npu/op/transpose_npu.h" namespace mindspore { int TransposeNPUOp::IsSupport(const schema::Primitive *primitive, const std::vector &in_tensors, const std::vector &out_tensors) { diff --git a/mindspore/lite/src/delegate/npu/op/transpose_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/transpose_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/transpose_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/transpose_npu.h index 65261ec34f7..c6ee1ca8422 100644 --- a/mindspore/lite/src/delegate/npu/op/transpose_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/transpose_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class TransposeNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/op/unsqueeze_npu.cc b/mindspore/lite/src/runtime/delegate/npu/op/unsqueeze_npu.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/op/unsqueeze_npu.cc rename to mindspore/lite/src/runtime/delegate/npu/op/unsqueeze_npu.cc index 0e1e8612317..5df70490ba8 100644 --- a/mindspore/lite/src/delegate/npu/op/unsqueeze_npu.cc +++ b/mindspore/lite/src/runtime/delegate/npu/op/unsqueeze_npu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/op/unsqueeze_npu.h" +#include "src/runtime/delegate/npu/op/unsqueeze_npu.h" #include namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/op/unsqueeze_npu.h b/mindspore/lite/src/runtime/delegate/npu/op/unsqueeze_npu.h similarity index 97% rename from mindspore/lite/src/delegate/npu/op/unsqueeze_npu.h rename to mindspore/lite/src/runtime/delegate/npu/op/unsqueeze_npu.h index e60a14f7ac6..f8cc236880f 100644 --- a/mindspore/lite/src/delegate/npu/op/unsqueeze_npu.h +++ b/mindspore/lite/src/runtime/delegate/npu/op/unsqueeze_npu.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/npu_op.h" namespace mindspore { class UnsqueezeNPUOp : public NPUOp { public: diff --git a/mindspore/lite/src/delegate/npu/pass/npu_base_pass.h b/mindspore/lite/src/runtime/delegate/npu/pass/npu_base_pass.h similarity index 95% rename from mindspore/lite/src/delegate/npu/pass/npu_base_pass.h rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_base_pass.h index 058b390662b..52d3b451313 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_base_pass.h +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_base_pass.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_BASE_PASS_H_ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_BASE_PASS_H_ #include -#include "src/delegate/npu/npu_graph.h" +#include "src/runtime/delegate/npu/npu_graph.h" namespace mindspore { class NPUBasePass { diff --git a/mindspore/lite/src/delegate/npu/pass/npu_fusion_pass.cc b/mindspore/lite/src/runtime/delegate/npu/pass/npu_fusion_pass.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/pass/npu_fusion_pass.cc rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_fusion_pass.cc index 8a8374c4cbe..c5d9f3b9cbe 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_fusion_pass.cc +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_fusion_pass.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/delegate/npu/pass/npu_fusion_pass.h" +#include "src/runtime/delegate/npu/pass/npu_fusion_pass.h" #include -#include "src/delegate/npu/pass/npu_pass_utils.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/pass/npu_pass_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/delegate/npu/pass/npu_fusion_pass.h b/mindspore/lite/src/runtime/delegate/npu/pass/npu_fusion_pass.h similarity index 92% rename from mindspore/lite/src/delegate/npu/pass/npu_fusion_pass.h rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_fusion_pass.h index 39ccae9b5fb..1c9b068a5d1 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_fusion_pass.h +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_fusion_pass.h @@ -17,8 +17,8 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_FUSION_PASS_H_ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_FUSION_PASS_H_ #include -#include "src/delegate/npu/op/npu_op.h" -#include "src/delegate/npu/pass/npu_base_pass.h" +#include "src/runtime/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/pass/npu_base_pass.h" namespace mindspore { class NPUFusionPass : public NPUBasePass { diff --git a/mindspore/lite/src/delegate/npu/pass/npu_insert_transform_pass.cc b/mindspore/lite/src/runtime/delegate/npu/pass/npu_insert_transform_pass.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/pass/npu_insert_transform_pass.cc rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_insert_transform_pass.cc index 453b204dc65..431f1c40987 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_insert_transform_pass.cc +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_insert_transform_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/delegate/npu/pass/npu_insert_transform_pass.h" +#include "src/runtime/delegate/npu/pass/npu_insert_transform_pass.h" #include #include #include -#include "src/delegate/npu/pass/npu_pass_utils.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/pass/npu_pass_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/delegate/npu/pass/npu_insert_transform_pass.h b/mindspore/lite/src/runtime/delegate/npu/pass/npu_insert_transform_pass.h similarity index 94% rename from mindspore/lite/src/delegate/npu/pass/npu_insert_transform_pass.h rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_insert_transform_pass.h index fb4e197095b..0196248b24f 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_insert_transform_pass.h +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_insert_transform_pass.h @@ -17,8 +17,8 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_INSERT_TRANSFORM_PASS_H_ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_INSERT_TRANSFORM_PASS_H_ #include -#include "src/delegate/npu/op/npu_op.h" -#include "src/delegate/npu/pass/npu_base_pass.h" +#include "src/runtime/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/pass/npu_base_pass.h" namespace mindspore { enum class InsertState { InsertNone, PreInsert, PostInsert, BothInsert }; class NPUInsertTransformPass : public NPUBasePass { diff --git a/mindspore/lite/src/delegate/npu/pass/npu_pass_manager.cc b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_manager.cc similarity index 95% rename from mindspore/lite/src/delegate/npu/pass/npu_pass_manager.cc rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_manager.cc index dacb70fdfcf..5c182567b91 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_pass_manager.cc +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/delegate/npu/pass/npu_pass_manager.h" +#include "src/runtime/delegate/npu/pass/npu_pass_manager.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/delegate/npu/pass/npu_pass_manager.h b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_manager.h similarity index 95% rename from mindspore/lite/src/delegate/npu/pass/npu_pass_manager.h rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_manager.h index 8fa7159ab62..004c03372de 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_pass_manager.h +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_manager.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_PASS_MANAGER_H_ #define MINDSPORE_LITE_SRC_RUNTIME_DELEGATE_NPU_PASS_NPU_PASS_MANAGER_H_ #include -#include "src/delegate/npu/pass/npu_base_pass.h" +#include "src/runtime/delegate/npu/pass/npu_base_pass.h" namespace mindspore { class NPUPassManager { public: diff --git a/mindspore/lite/src/delegate/npu/pass/npu_pass_utils.cc b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_utils.cc similarity index 97% rename from mindspore/lite/src/delegate/npu/pass/npu_pass_utils.cc rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_utils.cc index 9ecd679bdd3..3b59caf5f87 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_pass_utils.cc +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_utils.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "src/delegate/npu/pass/npu_pass_utils.h" +#include "src/runtime/delegate/npu/pass/npu_pass_utils.h" #include -#include "src/delegate/npu/op/scale_npu.h" -#include "src/delegate/npu/op/transpose_npu.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/scale_npu.h" +#include "src/runtime/delegate/npu/op/transpose_npu.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" namespace mindspore { std::unordered_map> nodes2const_index{ diff --git a/mindspore/lite/src/delegate/npu/pass/npu_pass_utils.h b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_utils.h similarity index 96% rename from mindspore/lite/src/delegate/npu/pass/npu_pass_utils.h rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_utils.h index efe2b9ee7a9..a61a90db258 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_pass_utils.h +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_pass_utils.h @@ -20,8 +20,8 @@ #include #include #include -#include "src/delegate/npu/op/npu_op.h" -#include "src/delegate/npu/op/transpose_npu.h" +#include "src/runtime/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/op/transpose_npu.h" namespace mindspore { extern std::unordered_map> nodes2const_index; diff --git a/mindspore/lite/src/delegate/npu/pass/npu_transform_pass.cc b/mindspore/lite/src/runtime/delegate/npu/pass/npu_transform_pass.cc similarity index 98% rename from mindspore/lite/src/delegate/npu/pass/npu_transform_pass.cc rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_transform_pass.cc index 9de7225b606..2befc95dddf 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_transform_pass.cc +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_transform_pass.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/delegate/npu/pass/npu_transform_pass.h" +#include "src/runtime/delegate/npu/pass/npu_transform_pass.h" #include -#include "src/delegate/npu/pass/npu_pass_utils.h" -#include "src/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/pass/npu_pass_utils.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/delegate/npu/pass/npu_transform_pass.h b/mindspore/lite/src/runtime/delegate/npu/pass/npu_transform_pass.h similarity index 92% rename from mindspore/lite/src/delegate/npu/pass/npu_transform_pass.h rename to mindspore/lite/src/runtime/delegate/npu/pass/npu_transform_pass.h index 593e2ba4e21..4b80c0f936c 100644 --- a/mindspore/lite/src/delegate/npu/pass/npu_transform_pass.h +++ b/mindspore/lite/src/runtime/delegate/npu/pass/npu_transform_pass.h @@ -19,8 +19,8 @@ #include #include -#include "src/delegate/npu/op/npu_op.h" -#include "src/delegate/npu/pass/npu_base_pass.h" +#include "src/runtime/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/pass/npu_base_pass.h" namespace mindspore { class NPUTransformPass : public NPUBasePass { diff --git a/mindspore/lite/src/delegate/npu/transpose_kernel.cc b/mindspore/lite/src/runtime/delegate/npu/transpose_kernel.cc similarity index 94% rename from mindspore/lite/src/delegate/npu/transpose_kernel.cc rename to mindspore/lite/src/runtime/delegate/npu/transpose_kernel.cc index 7cbf383eaf1..31115b25935 100644 --- a/mindspore/lite/src/delegate/npu/transpose_kernel.cc +++ b/mindspore/lite/src/runtime/delegate/npu/transpose_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/delegate/npu/transpose_kernel.h" -#include "src/delegate/npu/npu_converter_utils.h" -#include "src/delegate/npu/op/npu_op.h" +#include "src/runtime/delegate/npu/transpose_kernel.h" +#include "src/runtime/delegate/npu/npu_converter_utils.h" +#include "src/runtime/delegate/npu/op/npu_op.h" #include "nnacl/fp32/pack_fp32.h" namespace mindspore { void PackNHWCToNCHWFp32(const void *src, void *dst, int batches, int plane, int channel) { diff --git a/mindspore/lite/src/delegate/npu/transpose_kernel.h b/mindspore/lite/src/runtime/delegate/npu/transpose_kernel.h similarity index 100% rename from mindspore/lite/src/delegate/npu/transpose_kernel.h rename to mindspore/lite/src/runtime/delegate/npu/transpose_kernel.h diff --git a/mindspore/lite/src/executor.cc b/mindspore/lite/src/runtime/executor.cc similarity index 97% rename from mindspore/lite/src/executor.cc rename to mindspore/lite/src/runtime/executor.cc index 35b6dbb6787..035835e895c 100644 --- a/mindspore/lite/src/executor.cc +++ b/mindspore/lite/src/runtime/executor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/executor.h" +#include "src/runtime/executor.h" #include #include "include/errorcode.h" #include "src/common/tensor_util.h" diff --git a/mindspore/lite/src/executor.h b/mindspore/lite/src/runtime/executor.h similarity index 97% rename from mindspore/lite/src/executor.h rename to mindspore/lite/src/runtime/executor.h index 5370ae196bf..5d3be9db333 100644 --- a/mindspore/lite/src/executor.h +++ b/mindspore/lite/src/runtime/executor.h @@ -19,7 +19,7 @@ #include #include "src/runtime/inner_allocator.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "include/lite_session.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/huffman_decode.cc b/mindspore/lite/src/runtime/huffman_decode.cc similarity index 99% rename from mindspore/lite/src/huffman_decode.cc rename to mindspore/lite/src/runtime/huffman_decode.cc index cb9ce002771..22271e4c753 100644 --- a/mindspore/lite/src/huffman_decode.cc +++ b/mindspore/lite/src/runtime/huffman_decode.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/huffman_decode.h" +#include "src/runtime/huffman_decode.h" #include namespace mindspore { diff --git a/mindspore/lite/src/huffman_decode.h b/mindspore/lite/src/runtime/huffman_decode.h similarity index 100% rename from mindspore/lite/src/huffman_decode.h rename to mindspore/lite/src/runtime/huffman_decode.h diff --git a/mindspore/lite/src/runtime/infer_manager.cc b/mindspore/lite/src/runtime/infer_manager.cc index 2b4c15c7382..d6d15b8e38f 100644 --- a/mindspore/lite/src/runtime/infer_manager.cc +++ b/mindspore/lite/src/runtime/infer_manager.cc @@ -20,13 +20,13 @@ #include #include "src/common/prim_util.h" #include "src/common/tensor_util.h" -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" #include "schema/model_generated.h" #include "include/errorcode.h" #include "nnacl/errorcode.h" #include "src/tensorlist.h" #include "include/registry/register_kernel_interface.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/inner_context.cc b/mindspore/lite/src/runtime/inner_context.cc similarity index 99% rename from mindspore/lite/src/inner_context.cc rename to mindspore/lite/src/runtime/inner_context.cc index baa2bc7953f..40557f90db6 100644 --- a/mindspore/lite/src/inner_context.cc +++ b/mindspore/lite/src/runtime/inner_context.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" #include #include #include "include/errorcode.h" @@ -27,7 +27,7 @@ #include "include/HiAiModelManagerType.h" #endif #ifdef GPU_OPENCL -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #endif #include "nnacl/kernel.h" #include "src/runtime/inner_allocator.h" diff --git a/mindspore/lite/src/inner_context.h b/mindspore/lite/src/runtime/inner_context.h similarity index 98% rename from mindspore/lite/src/inner_context.h rename to mindspore/lite/src/runtime/inner_context.h index 5ac424072a0..12c39c4acc2 100644 --- a/mindspore/lite/src/inner_context.h +++ b/mindspore/lite/src/runtime/inner_context.h @@ -28,7 +28,7 @@ #include "thread/threadpool.h" #include "nnacl/op_base.h" #ifdef ENABLE_ARM -#include "src/cpu_info.h" +#include "src/runtime/cpu_info.h" #endif namespace mindspore::lite { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.cc index df17ecab42a..843fc0c9688 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/argminmax_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.h index 2fe504a4e7d..d1402452a1f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/argminmax_base.h @@ -23,7 +23,7 @@ #include "nnacl/fp16/arg_min_max_fp16.h" #endif #include "nnacl/common_func.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ArgMinMaxCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/arithmetic_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/arithmetic_base.h index 9f681d28a16..8ea1e435443 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/arithmetic_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/arithmetic_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_ARITHMETIC_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/arithmetic.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/assert.cc b/mindspore/lite/src/runtime/kernel/cpu/base/assert.cc index 2fa435107d8..efd9a8df550 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/assert.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/assert.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/assert.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/assert.h b/mindspore/lite/src/runtime/kernel/cpu/base/assert.h index a1790019a88..5f28bbd3095 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/assert.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/assert.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_ASSERT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class AssertCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/call.cc b/mindspore/lite/src/runtime/kernel/cpu/base/call.cc index 8150a39e63f..23e09cc9a20 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/call.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/call.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/call.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/call.h b/mindspore/lite/src/runtime/kernel/cpu/base/call.h index 16bd71ba042..ce4f3ecc3ea 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/call.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/call.h @@ -18,7 +18,7 @@ #include #include "src/tensor.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" // this file is useless when move create actor before schedule. namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.cc index 35ff54ecab1..03dde02a877 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.h index cb580e6656a..5be622a5801 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/concat_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONCAT_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/concat_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.cc b/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.cc index 398487a3237..3797934ddc7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/constant_of_shape.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.h b/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.h index 1f9051a281c..a4e1ddf66ab 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.h @@ -18,7 +18,7 @@ #include #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/constant_of_shape_parameter.h" #include "nnacl/fp32/constant_of_shape_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.cc index 61804cae039..ffcd68cc18d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/base/convolution_base.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.h index 924a9ec674b..270b512a2d4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.h @@ -27,11 +27,11 @@ #include #endif #endif -#include "src/lite_kernel.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/pack_weight_manager.h" #include "include/context.h" #include "src/runtime/kernel/cpu/base/layout_transform.h" -#include "src/weight_decoder.h" +#include "src/runtime/weight_decoder.h" #include "include/errorcode.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.cc index f432639d117..c5cace9db80 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/fp32/crop_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.h index fa8d2e23594..d3ff417fc8d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/crop_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_CROP_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/crop_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.cc index 6d2ce9a6340..f712bd5b727 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/int8/quant_dtype_cast_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.h index c3d2ad074cf..38731f060c3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/detection_post_process_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_DETECTION_POST_PROCESS_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/detection_post_process_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.cc b/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.cc index e2a6fc517f7..404c30c9060 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/format_transpose.h" #include "nnacl/base/format_transpose.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.h b/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.h index 4f16ea55df5..752ac01aaca 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/format_transpose.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_FORMAT_TRANSPOSE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/format_transpose_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/gather_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/gather_base.h index 5e12f9337c4..93466c76737 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/gather_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/gather_base.h @@ -19,7 +19,7 @@ #include #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class GatherBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_base.h index 0e456d77cb0..1b96d96ebde 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_base.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_common_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_creator.h b/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_creator.h index d516626265e..73b95c6746f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_creator.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/group_convolution_creator.h @@ -19,9 +19,9 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/conv_parameter.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" namespace mindspore::kernel { struct TensorInfo { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.cc index 35caa646284..666133fc3f8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.cc @@ -20,7 +20,7 @@ #include "nnacl/fp16/one_hot_fp16.h" #endif #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.h index c048996452b..c45c4052c21 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/one_hot_base.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_ONE_HOT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/one_hot_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.cc b/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.cc index 02d7ee5c3da..08103d85f29 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/partial_fusion.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.h b/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.h index 29618957a0b..80e7d64e3df 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/partial_fusion.h @@ -18,7 +18,7 @@ #include #include "src/tensor.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" // this file is going to be removed when move create actor before schedule. namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.cc index 0f9eac4939d..1a436907d71 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/pooling_base.h" #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.h index da47ab64a28..a249d3741c9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/pooling_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_POOLING_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/pooling_fp32.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.cc b/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.cc index ba6ff2485b8..453dd1a258e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.cc @@ -18,7 +18,7 @@ #include #include "src/runtime/kernel/cpu/base/prior_box.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.h b/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.h index 379ab889d15..f73322e4406 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/prior_box.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_PRIOR_BOX_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/reshape_parameter.h" #include "nnacl/fp32/prior_box_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.cc b/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.cc index 50402d378e1..1efcc16f107 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/quant_dtype_cast.h" #include #include "nnacl/int8/quant_dtype_cast_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.h b/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.h index 3328664b33e..ef72a8d1a23 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_QUANTDTYPECAST_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class QuantDTypeCastCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.cc b/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.cc index 4080f5c7f18..dc85e2f5cd6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/random_normal.h" #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.h b/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.h index d3132e9b8b3..5e3de788fcf 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/random_normal.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_RANDOM_NORMAL_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/random_parameter.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.cc index 9a355f95885..12f4008737f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/reduce_base.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" #include "include/errorcode.h" #include "src/runtime/kernel/cpu/fp32/reduce_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.h index 5a036e1793b..0521dd823b4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/reduce_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_REDUCE_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/reduce_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.cc index e3217a21041..65196b49062 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/base/reshape_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.h index 99bb5f0ec77..a5dda464b57 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/reshape_base.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_RESHAPE_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.cc index 6f802ff62c4..b2dbfa55bcd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/base/resize_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.h index bf60da51997..56460e86d8a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/resize_base.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_RESIZE_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/resize_parameter.h" using mindspore::schema::PrimitiveType_Resize; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.cc index d1c852afd66..755fd08eb7c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.h index aa3a2a06289..2c8a2f67c25 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/scatter_nd_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_SCATTER_ND_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/base/scatter_nd_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/select.cc b/mindspore/lite/src/runtime/kernel/cpu/base/select.cc index 1eb3a316340..c0a6ab0a5de 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/select.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/select.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/base/select.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/tensorlist.h" #include "src/common/tensor_util.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/select.h b/mindspore/lite/src/runtime/kernel/cpu/base/select.h index a9a1ad615d3..e86441af026 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/select.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/select.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_SELECT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.cc index 318d1fa6504..6456959ddf7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/base/slice_base.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/slice_base.h" #include "src/tensor.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.h index 2fbd18f665e..297b1a4ec0d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/slice_base.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_SLICE_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/slice_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.cc index ea38b716676..3cade9c0293 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.cc @@ -19,7 +19,7 @@ #include "src/runtime/kernel/cpu/fp32/softmax_fp32.h" #include "nnacl/fp32/softmax_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.h index a3064391f1e..321ca43a75a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/softmax_base.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_SOFTMAX_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/softmax_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/split_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/split_base.cc index 59d9183252e..036b794fbe9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/split_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/split_base.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/split_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/split_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/split_base.h index 372c2956d50..9fd05b97b3e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/split_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/split_base.h @@ -20,7 +20,7 @@ #include #include "include/errorcode.h" #include "include/context.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/split_parameter.h" #include "nnacl/base/split_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.cc index 9a1cf68733f..3067fb8fd63 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/split_with_over_lap_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/tensor.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.h index 8291400609d..47b6e65c8f3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/split_with_over_lap_base.h @@ -20,7 +20,7 @@ #include #include "include/errorcode.h" #include "include/context.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "nnacl/split_parameter.h" #include "nnacl/base/split_with_over_lap_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.cc index 05017bd7b15..8a783d29a31 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/stack_base.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/stack_base.h" #include "include/errorcode.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.h index b650027e38d..38194d077f8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/stack_base.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_STACK_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/stack_parameter.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.cc b/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.cc index f2b0a46d9f4..9715e1ce4c7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/base/strided_slice.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.h b/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.h index 742f4d7d211..c760c24fce8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/strided_slice.h @@ -19,7 +19,7 @@ #include #include "nnacl/fp32/strided_slice_fp32.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class StridedSliceCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.cc b/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.cc index fb7d3634f7e..621e93e0f99 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/base/tile_base.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/nnacl_common.h" #include "include/errorcode.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.h index 4caea4414d2..95d895c7cd7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/tile_base.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_BASE_TILE_BASE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/base/tile_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/base/transpose_base.h b/mindspore/lite/src/runtime/kernel/cpu/base/transpose_base.h index 4c5f46042da..e4aeb49c6e6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/base/transpose_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/base/transpose_base.h @@ -18,7 +18,7 @@ #include #include "nnacl/transpose.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class TransposeBaseCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/switch.cc b/mindspore/lite/src/runtime/kernel/cpu/control/switch.cc index 29b83571765..f21866b62d6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/switch.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/switch.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/control/switch.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/switch.h b/mindspore/lite/src/runtime/kernel/cpu/control/switch.h index a2c4625ce74..8234d401eb4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/switch.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/switch.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONTROL_SWITCH_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class SwitchCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.cc b/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.cc index 9cc3d045598..45527c13a9d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/control/switch_layer.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.h b/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.h index 43e7c57d65d..f42f34e571d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/switch_layer.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONTROL_SWITCH_LAYER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class SwitchLayerCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.cc b/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.cc index 884e09be837..e93377293c5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.cc @@ -18,9 +18,9 @@ #include "include/errorcode.h" #include "src/runtime/kernel/cpu/control/tensor_array.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/tensorlist.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "src/common/log_util.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.h b/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.h index 55683ed2c67..56184d553e8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensor_array.h @@ -20,7 +20,7 @@ #include #include #include "nnacl/tensor_array_parameter.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.cc b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.cc index 64d8c36a2a9..43449b69169 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/control/tensorlist_fromtensor.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.h b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.h index a25908e9219..ec717de5533 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_fromtensor.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONTROL_TENSORLISTFROMTENSOR_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" #include "schema/model_generated.h" #include "nnacl/tensorlist_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.cc b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.cc index a960ac90e6f..56ec3765d45 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/control/tensorlist_getitem.h" #include "include/errorcode.h" #include "include/ms_tensor.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.h b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.h index 58218710e5c..bf66008d06b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_getitem.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONTROL_TENSORLISTGETITEM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" #include "schema/model_generated.h" #include "nnacl/tensorlist_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.cc b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.cc index 923e63666e3..b8c55eb4862 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/control/tensorlist_reserve.h" #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.h b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.h index 17a94cf1724..3563a08a1fb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_reserve.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONTROL_TENSORLISTRESERVE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" #include "schema/model_generated.h" #include "nnacl/tensorlist_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.cc b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.cc index 7ba628c293c..3de1ebf52d8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/control/tensorlist_setitem.h" #include "include/errorcode.h" #include "include/ms_tensor.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.h b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.h index 763ef5c5420..35d96e5bfa6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_setitem.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_CONTROL_TENSORLISTSETITEM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" #include "schema/model_generated.h" #include "nnacl/tensorlist_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.cc b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.cc index 8d2cace3e75..eed534f3188 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.cc @@ -18,7 +18,7 @@ #include #include "include/errorcode.h" #include "ir/dtype/type_id.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.h b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.h index 8cad9211485..6484c9d2a6f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.h +++ b/mindspore/lite/src/runtime/kernel/cpu/control/tensorlist_stack.h @@ -19,7 +19,7 @@ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensorlist.h" #include "schema/model_generated.h" #include "nnacl/tensorlist_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/cpu_kernel.h b/mindspore/lite/src/runtime/kernel/cpu/cpu_kernel.h index 3115037857b..791f2843f5f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/cpu_kernel.h +++ b/mindspore/lite/src/runtime/kernel/cpu/cpu_kernel.h @@ -17,9 +17,9 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_CPU_KERNEL_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/kernel.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore::kernel { class CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.cc index e3fc0f7cdd6..fdbb987b2fd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/activation_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.h index f711edbf328..563962d363f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/activation_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_ACTIVATION_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/activation_fp32.h" #include "nnacl/fp16/activation_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.cc index 85a1b0065fc..c85826db531 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp16/addn_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16/arithmetic_fp16.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.h index f0017cb794c..d8467005f61 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/addn_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_ADDN_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.cc index dc45184f231..66c29f0df3b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.cc @@ -19,7 +19,7 @@ #include "nnacl/fp16/arithmetic_fp16.h" #include "nnacl/fp16/cast_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.h index cd58360f2dc..057501d29a8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_compare_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_ARITHMETIC_COMPARE_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp16/arithmetic_fp16.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_fp16.cc index b980ba121bb..1d335023db7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/arithmetic_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" #include "nnacl/fp16/arithmetic_fp16.h" #include "nnacl/fp16/cast_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_self_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_self_fp16.cc index ef5420c5799..bf03f574bc7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_self_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/arithmetic_self_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/arithmetic_self_fp16.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16/arithmetic_self_fp16.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/batchnorm_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/batchnorm_fp16.cc index 1ab85d8e2fd..638da535b31 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/batchnorm_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/batchnorm_fp16.cc @@ -18,7 +18,7 @@ #include "src/runtime/kernel/cpu/fp16/common_fp16.h" #include "nnacl/fp16/batchnorm_fp16.h" #include "nnacl/fp16/cast_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.cc index f4f9eae0499..c280db5acc0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.cc @@ -18,7 +18,7 @@ #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/runtime/kernel/cpu/fp16/biasadd_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.h index 7e774906d5a..0704361c5f0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/biasadd_fp16.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_BIASADD_FP16_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_BIASADD_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp16/arithmetic_fp16.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.cc index 008632b5a4e..48e8dc0012a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/cast_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.h index 5a3bbc575ef..0350e6b37e9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/cast_fp16.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_CAST_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "nnacl/fp16/cast_fp16.h" #include "nnacl/base/cast_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/common_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/common_fp16.h index 184323f74b6..32c009cdd74 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/common_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/common_fp16.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_COMMON_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { float16_t *ConvertInputFp32toFp16(lite::Tensor *input, const lite::InnerContext *ctx); diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/concat_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/concat_fp16.cc index 989b6badbcb..1addcf94406 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/concat_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/concat_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/concat_fp16.h" #include "nnacl/fp16/cast_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_1x1_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_1x1_fp16.h index e3eaea9ed67..77634ba8ea2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_1x1_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_1x1_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "src/common/utils.h" #include "nnacl/matmul_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.cc index e88231707bf..7aa823b0af0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.cc @@ -26,7 +26,7 @@ #include "src/runtime/kernel/cpu/base/group_convolution_creator.h" #include "nnacl/base/conv_common_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.h index c4c6938c008..1b83c168c2b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_delegate_fp16.h @@ -18,7 +18,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/conv_parameter.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_3x3_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_3x3_fp16.h index 24600b95e09..2a9f8b37a6a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_3x3_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_3x3_fp16.h @@ -19,7 +19,7 @@ #ifdef ENABLE_ARM #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_fp16.h index d99273a098b..b73b5d6cb8d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_CONVOLUTION_DEPTHWISE_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp16/conv_depthwise_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_slidewindow_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_slidewindow_fp16.h index 060b506fb80..a7db57d8e55 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_slidewindow_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_depthwise_slidewindow_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_CONVOLUTION_DEPTHWISE_SLIDEWINDOW_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp16/conv_depthwise_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_fp16.h index 9762d39a2c5..a27c40371e6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_winograd_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_winograd_fp16.h index 4561a76ce7e..f1f6dda7ad5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_winograd_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/convolution_winograd_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp16/conv_fp16.h" #include "nnacl/fp16/winograd_utils_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.cc index 90107b30009..819446b0b66 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp16/crop_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.h index c843074be22..f9bad5b3c02 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/crop_fp16.h @@ -22,7 +22,7 @@ #include "include/errorcode.h" #include "nnacl/crop_parameter.h" #include "nnacl/fp16/crop_fp16.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/crop_base.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_depthwise_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_depthwise_fp16.h index cceaf246ef0..cadc84bd445 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_depthwise_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_depthwise_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_DECONVOLUTION_DEPTHWISE_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp16/conv_depthwise_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_fp16.h index a5a8a4d5c3b..89e583b5f61 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/deconvolution_fp16.h @@ -20,7 +20,7 @@ #include #include "nnacl/fp16/deconv_fp16.h" #include "nnacl/fp16/matmul_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/depth_to_space_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/depth_to_space_fp16.cc index f2ac7668603..f4ae2c4fd34 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/depth_to_space_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/depth_to_space_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/depth_to_space_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.cc index 78e9131ede7..78ef73c3ce5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp16/fill_fp16.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.h index 4478472d9ff..7bcf2fa130e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/fill_fp16.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_FILL_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp16/fill_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/fullconnection_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/fullconnection_fp16.cc index 50d7720b05b..eec61011dab 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/fullconnection_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/fullconnection_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/fullconnection_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/fused_batchnorm_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/fused_batchnorm_fp16.cc index 5f30db01262..84b5a1a431d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/fused_batchnorm_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/fused_batchnorm_fp16.cc @@ -18,7 +18,7 @@ #include "nnacl/fp16/batchnorm_fp16.h" #include "nnacl/fp16/cast_fp16.h" #include "nnacl/fp16/scale_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/gather_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/gather_fp16.cc index 53f41fd775c..8395269ba22 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/gather_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/gather_fp16.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp16/gather_fp16.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16/cast_fp16.h" #include "src/runtime/infer_manager.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/group_convolution_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/group_convolution_fp16.h index 7b5935116d0..97d1d7f1063 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/group_convolution_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/group_convolution_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/group_convolution_base.h" #include "nnacl/fp16/conv_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.cc index f13dbe6f448..eefbae4050a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/gru_fp16.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/gru_fp16.h" #include "nnacl/fp16/cast_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.h index b46677e4b8c..807026678cc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/gru_fp16.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRU_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRU_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/gru_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.cc index 03fcaaecbd2..e7fbbe38cac 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/instance_norm_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/cast_fp16.h" #include "nnacl/fp16/instance_norm_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.h index 03dc4ec3bf3..c5529395d38 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/instance_norm_fp16.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_INSTANCE_NORM_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_INSTANCE_NORM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/instance_norm_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.cc index 63a196fda5e..89bee5adb81 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/layer_norm_fp16.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/layer_norm_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.h index fc3c4aabd2c..f7270f7d464 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/layer_norm_fp16.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_LAYER_NORM_FP16_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_LAYER_NORM_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/layer_norm_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.cc index 7e1c1cb440f..c32b8daeb4b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.cc @@ -21,7 +21,7 @@ #include "nnacl/fp16/log_softmax_fp16.h" #include "nnacl/fp16/cast_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.h index 367ca332ea6..90ff2254195 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/log_softmax_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/softmax_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.cc index 10efb21a404..d8620918bf5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/lstm_fp16.h" #include "nnacl/fp16/cast_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.h index 6ea5c4be3c0..418dbb368e0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/lstm_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_LSTM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/lstm_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_base_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_base_fp16.h index 0ec03233635..5f5ebf444ed 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_base_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_base_fp16.h @@ -21,7 +21,7 @@ #include #endif #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/common/common.h" #include "nnacl/matmul_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_fp16.cc index 48b2e42e138..0e447098344 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/matmul_fp16.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp16/matmul_fp16.h" #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::kCHWDimNumber; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/pad_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/pad_fp16.cc index f4ae16dd8af..30acf8f44be 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/pad_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/pad_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/pad_fp16.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.cc index 9d06ffcba47..444b69ca5eb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/pooling_fp16.h" #include #include "nnacl/fp16/pooling_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.h index f47e7771d95..68c5e5778b3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/pooling_fp16.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/pooling_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.cc index 2cfde02d6fd..4ff27971a9a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/power_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.h index 033f1c3c5ce..91dde5e10e3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/power_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_POWER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp16/power_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/prelu_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/prelu_fp16.cc index c6380b57591..38983391166 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/prelu_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/prelu_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/prelu_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/prelu_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.cc index dbfd6605c93..e576d4ac8b5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.cc @@ -17,7 +17,7 @@ #include #include "nnacl/int8/quant_dtype_cast_int8.h" #include "nnacl/fp16/quant_dtype_cast_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.h index 132b8cbd92e..ed200b8cbba 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/quant_dtype_cast_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class QuantDTypeCastFp16CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.cc index 621f8f14c76..47d52f330cd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/ragged_range_fp16.h" #include #include "nnacl/fp16/ragged_range_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.h index b6dc5afddc9..16da80b4906 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/ragged_range_fp16.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_RAGGED_RANGE_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class RaggedRangeFp16CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/reduce_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/reduce_fp16.cc index dd76b7c0025..e2cc1288712 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/reduce_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/reduce_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/reduce_fp16.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/reduce_fp16.h" #include "src/runtime/kernel/cpu/base/reduce_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/resize_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/resize_fp16.cc index a0fcafcbc71..3cf89c10262 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/resize_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/resize_fp16.cc @@ -17,7 +17,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.cc index 699a250a3eb..72aa3286b80 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" #include "nnacl/fp16/scale_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.h index 014d6c363b0..7d5a681bd32 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/scale_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_SCALE_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/fp32/scale_fp32.h" #include "nnacl/scale.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.cc index 2226f0aad7f..82c6c7c5bd7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/slice_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/slice_base.h" #include "nnacl/fp16/cast_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.h index b29a34d924d..c19bd1a8894 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/slice_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_SLICE_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/slice_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.cc index 3e86dff6e6c..0759d73628b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.cc @@ -21,7 +21,7 @@ #include "nnacl/fp16/softmax_fp16.h" #include "nnacl/fp16/cast_fp16.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.h index 5958700228a..0ed9adf93a9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/softmax_fp16.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/softmax_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.cc index a185e4d6052..7abcf28951d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16/stack_fp16.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/stack_parameter.h" #include "include/errorcode.h" #include "src/runtime/kernel/cpu/fp16/common_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.h index 91e8d9b39c4..17f2b36d36e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/stack_fp16.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_STACK_FP16_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/stack_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/transpose_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/transpose_fp16.cc index e7b4743127e..8b43839634f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/transpose_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/transpose_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/transpose_fp16.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16/pack_fp16.h" #include "nnacl/fp16/transpose_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16/where_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16/where_fp16.cc index 4817b38bc36..c741a7bff10 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16/where_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16/where_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16/where_fp16.h" #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16/where_fp16.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.cc index 5c385f1708d..ed3717cd635 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.h" #include "nnacl/fp16_grad/activation_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.h index 6ea2db8e9c5..f04314d971b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/activation_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_ACTIVATION_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp16_grad/activation_grad.h" #include "nnacl/fp32_grad/activation_grad.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.cc index 4e5639f460e..52504a6cde6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16_grad/arithmetic_grad.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.h index 541b0b87db1..9f792acdc43 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_ARITHMETIC_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp16/arithmetic_fp16.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.cc index bc9aef5bad6..f6fd0dd8f48 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.h index ce770404a64..2676189b464 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/arithmetic_fp16_self_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_ARITHMETIC_SELF_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp16_grad/arithmetic_self_grad.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.cc index a00a6104d41..d5b89748cac 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.h index 6c29d0f4e79..493f42da8e1 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bias_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_BIAS_FP16_GRAD_H_ #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "nnacl/fp16/arithmetic_fp16.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.cc index 8941226e51b..62e7ffd2258 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.cc @@ -23,7 +23,7 @@ #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16_grad/batch_norm.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.h index 1db13ed6a39..8fc91ef12ec 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/bn_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_BN_FP16_GRAD_H_ #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "nnacl/fp32_grad/batch_norm.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.cc index efe8e271d6b..b2a3a71da0f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/pack.h" #include "nnacl/fp16_grad/convolution_grad_filter.h" #include "nnacl/fp16_grad/pack_fp16_ext.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.h index eab199c46f7..c9b9d55c415 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_filter.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_CONVOLUTION_FP16_GRAD_FILTER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ConvolutionGradFilterCPUKernelFp16 : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.cc index a2945809b0a..b48c91eeb9f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/pack.h" #include "nnacl/fp16_grad/pack_fp16_ext.h" #include "nnacl/fp16_grad/gemm_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.h index 20b852c14fc..2047e67981e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/convolution_fp16_grad_input.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_CONVOLUTION_FP16_GRAD_INPUT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ConvolutionGradInputCPUKernelFp16 : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.cc index b63854e03fe..6217cecfb11 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.cc @@ -18,7 +18,7 @@ #include "src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.h" #include "nnacl/fp16_grad/dropout_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32_grad/dropout_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.h index d726db5ec6b..eb435fb0fcd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/dropout_fp16_grad.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_DROPOUT_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class DropoutGradCPUKernelFp16 : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.cc index cedc2c019c6..a6c7e9d5083 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16_grad/layernorm_grad.h" #include "nnacl/fp32_grad/layernormgrad_parameter.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.h index 4c464aa011a..e352cbc3529 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/layernorm_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_LAYERNORM_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.cc index cae4a120a6a..8b1a36aeded 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp16/arithmetic_self_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.h index 56e300fdd07..2b63c1114fd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/neg_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_NEG_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.cc index 7b2e0f63b4a..ed5d5295c27 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16/pooling_fp16.h" #include "nnacl/fp16_grad/pooling_grad.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.h index edef1117401..a09422bc50a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/pooling_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_POOLING_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { using mindspore::schema::PadMode; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.cc index 85c6baf7a58..348661c80b9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.cc @@ -19,7 +19,7 @@ #include "nnacl/fp16_grad/resize_grad.h" #include "nnacl/errorcode.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.h index d371eba8b6f..aa5adb0d889 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/resize_fp16_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_RESIZE_FP16_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ResizeGradCPUKernelFp16 : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.cc index 1a7c2e763e8..39015055dc2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.cc @@ -18,9 +18,9 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16_grad/strided_slice_grad.h" -#include "src/ops/populate/strided_slice_populate.h" +#include "src/common/ops/populate/strided_slice_populate.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH::kCPU; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.h index 7328da7b0d8..a5e65d666eb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/strided_slice_fp16_grad.h @@ -19,7 +19,7 @@ #include #include "nnacl/fp16_grad/strided_slice_grad.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore::kernel { class StridedSliceGradCPUKernelFp16 : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.cc index b386a153ea8..e65cd4e8541 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp16_grad/unsorted_segment_sum.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.h b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.h index 961474dd54d..949118dbeb9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp16_grad/unsorted_segment_sum_fp16.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP16_GRAD_UNSORTED_SEGMENT_SUM_FP16_H_ #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore::kernel { class UnsortedSegmentSumCPUKernelFp16 : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.cc index 53cd9748613..b19b143507f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/activation_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.h index 23417ed6380..f0b7dbfc9da 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/activation_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.cc index 739a6306b44..8f2a9854db4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/adder_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "schema/model_generated.h" #include "nnacl/fp32/adder_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.h index 728a3fe1022..ab2a49de81e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/adder_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_ADDER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/fp32/convolution_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.cc index ad360540b87..3f15746ee73 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp32/addn_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/arithmetic_fp32.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.h index d5b19ef7609..8ec293eaa78 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/addn_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_ADDN_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.cc index 48d870a5b81..2b7c6373306 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.cc @@ -18,7 +18,7 @@ #include #include #include "src/runtime/kernel/cpu/fp32/matmul_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/activation_fp32.h" #include "nnacl/fp32/splice_fp32.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.h index a771a3f86b3..74c3d5e9c0a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/affine_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_AFFINE_FP32_H #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/affine_parameter.h" #include "nnacl/splice_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.cc index c19380d10b5..990e009b36f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/all_gather_fp32.h" #include "schema/ops_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.h index 0120dddbcdb..ac48992a238 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/all_gather_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_ALL_GATHER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/all_gather_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_compare_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_compare_fp32.cc index c28e5036ecb..ed8b376243f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_compare_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_compare_fp32.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp32/arithmetic_compare_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/arithmetic_compare_fp32.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_fp32.cc index 45f905d9262..6c2cf8064b9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/arithmetic_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/arithmetic_fp32.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.cc index 73385739025..34493e55d39 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/arithmetic_self_fp32.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.h index ebc3fef683a..a375f194ada 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/arithmetic_self_fp32.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" using mindspore::schema::PrimitiveType_Abs; using mindspore::schema::PrimitiveType_Ceil; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.cc index 6397f0952cb..f64d1427f72 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/batch_to_space_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.h index 25abd851d65..0a9d7b01091 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/batch_to_space_fp32.h @@ -20,7 +20,7 @@ #include "include/errorcode.h" #include "nnacl/batch_to_space.h" #include "nnacl/base/batch_to_space_base.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class BatchToSpaceCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.cc index 45fbcdea7d4..80df1b63f1b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/batchnorm_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.h index 456a6e3fbbc..08390b0017a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/batchnorm_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BATCHNORM_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/batchnorm_fp32.h" #include "nnacl/batchnorm_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.cc index 0361961bd9b..64cae0a95bb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.cc @@ -18,7 +18,7 @@ #include #include "nnacl/fp32/bias_add.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.h index 69870bcd73d..d2e8d9dfa3d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/bias_fp32.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BIAS_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BIAS_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/arithmetic_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.cc index 7e699b21918..679ccf83666 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/broadcast_to_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.h index a50fd237c66..393d84dfcf9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/broadcast_to_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_BROADCAST_TO_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/base/broadcast_to.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_for_x86_fp16.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_for_x86_fp16.cc index e70560f4c7d..48f990f6d47 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_for_x86_fp16.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_for_x86_fp16.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/cast_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.cc index 1299c8bb167..81b95185ba7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/cast_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.h index 42d4c5b1f1b..2cacd554421 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/cast_fp32.h @@ -18,7 +18,7 @@ #include #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/tensor.h" #include "nnacl/op_base.h" #include "nnacl/base/cast_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.cc index 129310d85ba..44e93dcbc6d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_MEMORY_FAILED; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.h index 7162d7b5f11..7d59b28b941 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/errorcode.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.cc index 548cd19fb94..9ee76cc65b6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/cpu/fp32/convolution_fp32.h" #include "src/runtime/kernel/cpu/fp32/convolution_1x1_fp32.h" #include "src/runtime/kernel/cpu/fp32/convolution_winograd_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.h index 03914f3f4f4..80226649c0c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_delegate_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_DELEGATE_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/conv_parameter.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_3x3_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_3x3_fp32.h index 3418da52023..a7e427e8674 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_3x3_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_3x3_fp32.h @@ -19,7 +19,7 @@ #if defined(ENABLE_ARM) || (defined(ENABLE_SSE) && !defined(ENABLE_AVX)) #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.cc index b0b97c18abc..01e06d2673c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.h" #include "include/errorcode.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_INFER_INVALID; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.h index d26db7a13b7..a9e110425ff 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_fp32.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.cc index 3537b1f1238..ee1ad6b187e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.h" #include "include/errorcode.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_INFER_INVALID; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.h index 0428b1deeb0..0511096b6f5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_indirect_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_DEPTHWISE_INDIRECT_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.cc index 6c16ac3b90c..afc2e2dab87 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" #include "include/errorcode.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.h index 9aa8307d9e9..c81539b33a4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_DEPTHWISE_SLIDEWINDOW_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_x86_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_x86_fp32.h index 9e1b8fd2a38..61fa25700b8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_x86_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_depthwise_slidewindow_x86_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_DEPTHWISE_SLIDEWINDOW_X86_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.cc index 2529622a18c..f42d595d77f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.cc @@ -15,11 +15,11 @@ */ #include "src/runtime/kernel/cpu/fp32/convolution_fp32.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" #include "include/errorcode.h" #include "nnacl/common_func.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/conv_common_fp32.h" #include "nnacl/fp32/matmul_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.h index 1f86103e908..6529b176621 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.cc index bc3ba0f73e0..367e406fb8b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.cc @@ -19,7 +19,7 @@ #include "nnacl/fp32/conv_common_fp32.h" #include "nnacl/fp32/conv_1x1_x86_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.h index 7eb24a24f4e..a675866e144 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_slidewindow_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_SLIDEWINDOW_H_ #ifdef ENABLE_AVX #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_winograd_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_winograd_fp32.h index 2e3037650c2..5b97b648419 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_winograd_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/convolution_winograd_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_CONVOLUTION_WINOGRAD_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/winograd_transform.h" #include "nnacl/base/minimal_filtering_generator.h" #include "nnacl/fp32/conv_winograd_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.cc index 19454fa7196..0e6414c489c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/resize_fp32.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.h index 03fda5663b8..9d2b8b8fed7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_and_resize_fp32.h @@ -19,7 +19,7 @@ #include #include "include/errorcode.h" #include "nnacl/resize_parameter.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class CropAndResizeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.cc index 9781be6addf..9f82358a4f0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/crop_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.h index 1730189783e..453fd257650 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.h @@ -20,7 +20,7 @@ #include "include/errorcode.h" #include "nnacl/fp32/crop_fp32.h" #include "nnacl/crop_parameter.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/layout_transform.h" #include "src/runtime/kernel/cpu/base/crop_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.cc index 009b4d828eb..8f9635c40d5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/cumsum_fp32.h" #include "nnacl/fp32/cumsum_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.h index 86eee6bb04b..12eda35bc0e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/cumsum_fp32.h @@ -19,7 +19,7 @@ #include #include "include/errorcode.h" #include "nnacl/cumsum_parameter.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore::kernel { class CumSumCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_depthwise_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_depthwise_fp32.h index 37b6dea7497..febe1a5902a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_depthwise_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_depthwise_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_DECONVOLUTION_DEPTHWISE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_fp32.h index a1a5d38c5f6..40f7665e123 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_fp32.h @@ -19,8 +19,8 @@ #include #include -#include "src/lite_kernel.h" -#include "src/kernel_registry.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_winograd_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_winograd_fp32.h index 5ed9a8a96f1..acf1be8dbf6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_winograd_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_winograd_fp32.h @@ -19,8 +19,8 @@ #include #include -#include "src/lite_kernel.h" -#include "src/kernel_registry.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "schema/model_generated.h" #include "nnacl/fp32/matmul_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.cc index 67a0680047b..4f21ae17d7d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/depth_to_space_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/depth_to_space_base.h" #include "nnacl/nnacl_common.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.h index ced65c41c2c..05885d63ec2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/depth_to_space_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_DEPTH_TO_SPACE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/depth_to_space_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.cc index 73ec724e644..3c4e56d40e9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/detection_post_process_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/int8/quant_dtype_cast_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.h index a037744d4bd..3c9ded3a0e4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_DETECTION_POST_PROCESS_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "src/runtime/kernel/cpu/base/detection_post_process_base.h" #include "nnacl/fp32/detection_post_process_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.cc index 02b73501be0..0715ab3a625 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.h index 7daf312f677..161259cf4b2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/embedding_lookup_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_EMBEDDING_LOOKUP_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/embedding_lookup_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.cc index 9799e50f034..96f8c3cf360 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/fill_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.h index f04e81fe857..56024e80893 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/fill_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_FILL_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/base/fill_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/fullconnection_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/fullconnection_fp32.cc index 1a66f474275..6f40a7ee1d2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/fullconnection_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/fullconnection_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/fullconnection_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/fused_batchnorm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/fused_batchnorm_fp32.cc index 1b9deeeb3c0..7243e3b0056 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/fused_batchnorm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/fused_batchnorm_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/fused_batchnorm_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.cc index 3908dae33dc..7024048a71b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.cc @@ -19,7 +19,7 @@ #include #include "schema/model_generated.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.h index 4886a401d4c..2f9e108ae21 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/gatherNd_fp32.h @@ -20,7 +20,7 @@ #include #include #include "nnacl/fp32/gatherNd_fp32.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/gather_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/gather_fp32.cc index 80dca2e3926..19bfc81dc7a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/gather_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/gather_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/gather_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.cc index 7d6182f7125..0aec828a30b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/glu_fp32.h" #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/cpu/base/split_base.h" #include "nnacl/fp32/activation_fp32.h" #include "nnacl/fp32/arithmetic_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.h index e853b71bffa..4bfb9433354 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/glu_fp32.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/op_base.h" #include "nnacl/split_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/group_convolution_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/group_convolution_fp32.h index f244f0545d8..3e56d09a2d4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/group_convolution_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/group_convolution_fp32.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/group_convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.cc index f84e4154b29..291b97fc2fd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/groupnorm_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/common/tensor_util.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.h index 62c4206a0cb..3823c53e0cf 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/groupnorm_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_CPU_FP32_GROUPNORM_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/group_norm_fp32.h" #include "nnacl/fp32/scale_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.cc index 26b482ccddc..93fb6563483 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/gru_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/gru_fp32.h" #include "nnacl/fp32/lstm_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.h index c0a719eab55..70b2fb8325c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/gru_fp32.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRU_FP32_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRU_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/gru_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.cc index 94fe47d0420..75c019a7d7b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/instance_norm_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/instance_norm_fp32.h" #include "nnacl/fp32/pack_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.h index 7392beb4a59..c1714fcc8c6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/instance_norm_fp32.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_INSTANCE_NORM_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_INSTANCE_NORM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/instance_norm_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.cc index f2ac5015a6c..93bf087320a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/invert_permutation_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" #include "nnacl/fp32/invert_permutation_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.h index f63885a74ec..c899c5cc259 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/invert_permutation_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_INVERT_PERMUTATION_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/errorcode.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/l2_norm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/l2_norm_fp32.h index b144b9af7ab..b05534a939d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/l2_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/l2_norm_fp32.h @@ -18,11 +18,11 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_L2_NORM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/l2_norm_parameter.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.cc index 3a43d254615..8670fec9328 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/layer_norm_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.h index c9df7bf7eca..6a2a9fbc634 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/layer_norm_fp32.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_LAYER_NORM_FP32_H_ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_LAYER_NORM_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/layer_norm_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.cc index fe49ef65fa3..31341b0f273 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/local_response_norm_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.h index 09dcbf6bf8e..3d7852c35dc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/local_response_norm_fp32.h @@ -19,7 +19,7 @@ #include #include "nnacl/fp32/local_response_norm_fp32.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class LocalResponseNormCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.cc index 8ac58a424a4..1e326ebb2b9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.cc @@ -19,7 +19,7 @@ #include #include "nnacl/fp32/log_softmax_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.h index 7564bb53b9f..c2610135e83 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/log_softmax_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_LOG_SOFTMAX_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/softmax_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.cc index d41ad6e97e0..72ee445ae79 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/pack_fp32.h" #include "nnacl/fp32/matmul_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.h index a470e784015..0f21fc0dfda 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/lstm_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_LSTM_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/lstm_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32.cc index 9cd9a01a1ad..00c72985bb2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32.cc @@ -18,7 +18,7 @@ #include #include "include/errorcode.h" #include "nnacl/fp32/matmul_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::kCHWDimNumber; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32_base.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32_base.h index 76574d21ca7..f05607a3e1e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32_base.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32_base.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_MATMUL_FP32_BASE_H_ #include -#include "src/lite_kernel.h" -#include "src/pack_weight_manager.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/pack_weight_manager.h" #include "nnacl/matmul_parameter.h" #include "include/errorcode.h" #include "src/common/common.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.cc index e7809a821cb..5c532e56a93 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.cc @@ -19,7 +19,7 @@ #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/nllloss_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.h index 55d12f5ae9e..643aa5a11fd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.h @@ -19,7 +19,7 @@ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/nllloss_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.cc index 6a53a47aa6b..469094e1a17 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.cc @@ -20,7 +20,7 @@ #include #include "nnacl/non_max_suppression_parameter.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.h index fff7b1fd3f1..be91d5166ba 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/non_max_suppression_parameter.h" using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.cc index d0f4846a43d..a512877ee3b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.cc @@ -17,7 +17,7 @@ #include "include/errorcode.h" #include "nnacl/op_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/tensor.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.h index 16728e6276d..2b263d51a07 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/nonzero_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_NONZERO_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class NonZeroCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.cc index c8e8c2b3267..3807d5fccd4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/pad_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.h index ca0488cf17d..c86e7ce06c5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/pad_fp32.h @@ -24,7 +24,7 @@ #include "nnacl/fp32/pad_fp32.h" #include "nnacl/errorcode.h" #include "nnacl/common_func.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/layout_transform.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.cc index a0cd9dcaba6..152a6ab7d99 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/pooling_fp32.h" #include #include "nnacl/fp32/pooling_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.h index 1a1c9ba35f3..906be37479e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/pooling_fp32.h @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/cpu/base/pooling_base.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class PoolingCPUKernel : public PoolingBaseCPUKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.cc index df54e5a80d2..6144496085a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/power_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.h index 2d32f076bab..c61e4bf17cc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_POWER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/power_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.cc index 349b3716ee2..83483142633 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/prelu_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/prelu_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.h index 261eb192aa5..3a63dcfe75d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/prelu_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_PRELU_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/prelu_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.cc index b69880db20d..63d34f75087 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/ragged_range_fp32.h" #include #include "nnacl/fp32/ragged_range_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.h index b9bf62e2dc1..5644ea2f133 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/ragged_range_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_RAGGED_RANGE_FP32_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class RaggedRangeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.cc index 4d65304a384..be49a511542 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/range_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/range_fp32.h" #ifdef ENABLE_FP16 diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.h index d51b106b5b5..4bb7ed360c6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/range_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_RANGE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class RangeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.cc index 6ca4f3aa74a..2ed45cc6f59 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/rank_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.h index 65a17dc5d59..ce4ebd34537 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/rank_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_RANK_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class RankCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.cc index 60438af39f6..801cb2804f5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/reduce_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/reduce_fp32.h" #include "src/runtime/kernel/cpu/base/reduce_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.h index 5433ed4cecb..ef13f649617 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_REDUCE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/reduce_fp32.h" #include "src/runtime/kernel/cpu/base/reduce_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.cc index 5bd14ec61f1..7bd4640c088 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.h" #include "schema/ops_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.h index 7ecbb7af036..38751a095f5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reduce_scatter_fp32.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/reduce_scatter_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.cc index 9622d4680a5..20045199361 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/matmul_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.h index 74eae802161..aa5d819dbcc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/relative_position_attention_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_RELATIVE_POSITION_ATTENTION_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/attention_fp32.h" #include "nnacl/matmul_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.cc index af33efc3339..c413ff0fef9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.cc @@ -18,7 +18,7 @@ #include #include "src/runtime/kernel/cpu/fp32/resize_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.h index 15fdb44880b..dbeb644ed83 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/resize_fp32.h @@ -20,7 +20,7 @@ #include #include "include/errorcode.h" #include "nnacl/fp32/resize_fp32.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/resize_base.h" struct ResizeCoordinate { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.cc index b919fb025d0..85629f7a9e0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.cc @@ -17,7 +17,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/reverse_fp32.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.h index f342557e4a3..b45a24c67bc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_REVERSE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" using mindspore::lite::InnerContext; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.cc index f040d22cddd..0584600ab5c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.h index d3153a83bdb..7960dafc802 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/reverse_sequence_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_REVERSE_SEQUENCE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/reverse_sequence_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.cc index 8bf3a004f1d..9b5919819e1 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.cc @@ -17,7 +17,7 @@ #include "nnacl/fp32/roi_pooling_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.h index d7dfd54da75..7d5ccd8fb51 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_ROI_POOLING_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/roi_pooling_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.cc index 4850d3c168b..dd9acd04b61 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.h index c8bd5afbad2..71201f07342 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/scale_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SCALE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/scale_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.cc index a1fc6208b46..26d5801f207 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.h index fa455ddbf5a..ae07b065965 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/scatter_nd_update_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SCATTER_ND_UPDATE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/base/scatter_nd_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.cc index d02ac8db03b..ba7032f8cca 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/shape_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.h index 47220fe8c57..c1eb239dc9c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SHAPE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ShapeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.cc index c8c8c5f10cb..ced86ed719d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/shape_fusion_fp32.h" #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "src/runtime/infer_manager.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.h index 8bff56dae65..a8a3c34166a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SHAPE_FUSION_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ShapeFusionCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.cc index be76314c1e7..bb04c392e13 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/size_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.h index ffa27616c31..ec1685fa783 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/size_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SIZE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/invert_permutation_fp32.h" #include "include/errorcode.h" #include "include/context.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.cc index d8e81c70114..b1bac23f6cc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.cc @@ -19,7 +19,7 @@ #include #include "nnacl/fp32/softmax_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.h index 045466c2a1f..ab06c472794 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/softmax_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SOFTMAX_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/softmax_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.cc index 1fa690e8ae7..deb4b5a740a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp32/space_to_batch_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.h index 654016aea1b..4aa74acd7ea 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_batch_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SPACE_TO_BATCH_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/space_to_batch_fp32.h" #include "nnacl/common_func.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.cc index 1552257904f..633d360b126 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.cc @@ -17,7 +17,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/space_to_depth_base.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.h index 80ad1b83e72..2d6c896af1e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/space_to_depth_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_BACKEND_ARM_FP32_SPACE_TO_DEPTH_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/space_to_depth_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.cc index 47f88f0f56a..9ee9d81eacb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.cc @@ -23,7 +23,7 @@ #endif #include "schema/model_generated.h" #include "schema/ops_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.h index 98942769e5b..8f45acfe3ea 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/sparse_to_dense_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SPARSETODENSE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/sparse_to_dense_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.cc index 9093e024ed5..47a41681302 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32/splice_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "nnacl/fp32/splice_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.h index b3f93971699..b4b88e8ec58 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/splice_fp32.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SPLICE_SPLICE_FP32_H #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_SPLICE_SPLICE_FP32_H #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/splice_parameter.h" namespace mindspore::kernel { class SpliceCPUKernel final : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.cc index dfd67d7814d..41bdb5f4813 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/topk_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.h index 6c1db4e1840..b7d6afe1d65 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/topk_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_TOPK_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/topk_fp32.h" #ifdef ENABLE_FP16 #include "nnacl/fp16/topk_fp16.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_fp32.cc index 470ac1695eb..94f08fde142 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_fp32.cc @@ -16,7 +16,7 @@ */ #include "src/runtime/kernel/cpu/fp32/transpose_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/transpose_fp32.h" #include "nnacl/fp32/pack_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_server_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_server_fp32.cc index 58875ec22c0..c41d8c5ddb8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_server_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/transpose_server_fp32.cc @@ -15,7 +15,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/fp32/transpose_server_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/pack_fp32.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.cc index 8b8e06732d5..495dec7607a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.cc @@ -17,7 +17,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.h index d0974b790dc..ce2ea4319a9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/uniform_real_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_UNIFORM_REAL_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/random_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.cc index 49de1272244..852315b70d7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/unique_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/unique_fp32.h" #ifdef ENABLE_FP16 diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.h index cd9c53c50b3..5ca2c37eb66 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/unique_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_UNIQUE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class UniqueCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.cc index 8dbbbfa2c04..5a42fad8b1d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32/unstack_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.h index e7e9f99a720..a6f69a912e9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/unstack_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_UNSTACK_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/base/unstack_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.cc index b1f13fee8f2..e017dbb9166 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.cc @@ -17,7 +17,7 @@ #include #include "schema/model_generated.h" #include "nnacl/fp32/where_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/common_func.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.h index 9c22e22724e..279f88aa8b7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/where_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_WHERE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/fp32/where_fp32.h" #include "src/runtime/kernel/cpu/base/layout_transform.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.cc index 3207697bcc1..19886d79091 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32/zeroslike_fp32.h" #include "schema/model_generated.h" #include "nnacl/base/zeroslike_base.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.h index db4e09d5dd5..13a65e16365 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32/zeroslike_fp32.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_ZEROSLIKE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ZerosLikeCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.cc index 205838a2560..c52247198c3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/activation_grad.h" #include "nnacl/fp32_grad/activation_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.h index 18a3dbad0de..60b7d496633 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_ACTIVATION_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/activation_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/adam.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/adam.cc index 7cef033c02b..7e5b309596d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/adam.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/adam.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "plugin/device/cpu/kernel/nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/apply_momentum.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/apply_momentum.cc index b9267372e7b..9d928d3463f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/apply_momentum.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/apply_momentum.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/apply_momentum.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.cc index 4ad33b0e110..6ee8fad8c8f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32_grad/reduce_grad.h" #include "nnacl/fp32_grad/arithmetic_grad.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.h index 86ee8dd8900..4b58612295c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_ARITHMETIC_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/arithmetic_fp32.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.cc index b0a40188610..253ac5e435c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/fp32_grad/arithmetic_grad.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.h index 63b1a5c23d1..e0bb6767eaa 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/arithmetic_self_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_ARITHMETIC_SELF_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.cc index 3e69e61aa78..96efd122799 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/assign.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.h index 8ba11c5cf1d..92037d6504b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/assign.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_ASSIGN_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32_grad/optimizer.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.cc index e774a4d3340..21e76495bdd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/fp32_grad/bias_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.h index b09700362b0..b607803b91d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bias_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_BIAS_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/arithmetic_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.cc index f7ec4432736..879df2616e1 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.cc @@ -22,7 +22,7 @@ #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32_grad/batch_norm.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.h index c03e8e3c820..4fd3c2bac92 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/bn_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_BN_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution.h index a159e8dee38..18fd5c709a5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_CONVOLUTION_H_ #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore::kernel { class ConvolutionTrainCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.cc index 160239cc308..046ad37527f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/pack.h" #include "nnacl/fp32_grad/convolution_grad_filter.h" #include "nnacl/fp32_grad/pack_ext.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.h index be57a08310a..3234d01c8d6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_CONVOLUTION_GRAD_FILTER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ConvolutionGradFilterCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.cc index a4c883ac0bd..46c1aa00bb8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/pack.h" #include "nnacl/fp32_grad/pack_ext.h" #include "nnacl/fp32_grad/gemm.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.h index 0abba9e63ae..2e15a20fac7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_CONVOLUTION_GRAD_INPUT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ConvolutionGradInputCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.cc index f8be63cea3d..7d6cdca5a1c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/pack.h" #include "nnacl/fp32_grad/pack_ext.h" #include "nnacl/fp32_grad/gemm.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.h index 371d8fb9bd9..a5d70bd032f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_DECONVOLUTION_GRAD_FILTER_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class DeConvolutionGradFilterCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.cc index ce2d8cc0202..405aca319b9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.cc @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/fp32_grad/dropout.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32_grad/dropout_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.h index 46f9a1e7712..97758517297 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout.h @@ -18,7 +18,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class DropoutCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.cc index efcef9ba791..bbc85c859ca 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.cc @@ -18,7 +18,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/dropout_grad.h" #include "nnacl/fp32_grad/dropout_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32_grad/dropout_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.h index f3ec9fe87d6..53874616896 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/dropout_grad.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_DROPOUT_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class DropoutGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.cc index 396efa7d960..1ec2fa826a3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.cc @@ -18,7 +18,7 @@ #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32_grad/layernorm_grad.h" #include "nnacl/fp32_grad/layernormgrad_parameter.h" #include "nnacl/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.h index 2ddd53ea8ec..b42f647c825 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/layernorm_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_LAYERNORM_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.cc index 1934bc7200a..b6da9d0b935 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.cc @@ -19,7 +19,7 @@ #include #include "utils/ms_utils.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/lstm_fp32.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.h index fdf80c5d0dd..1397ef454a2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_data_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_LSTM_GRAD_DATA_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32_grad/lstm_grad_fp32.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.cc index abcdf251ec4..f57c150be65 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.cc @@ -19,7 +19,7 @@ #include #include "utils/ms_utils.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/lstm_fp32.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.h index 63d5affac7f..7957eb0acf7 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_LSTM_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32_grad/lstm_grad_fp32.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.cc index 9121cea4466..9ff9750e99e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.cc @@ -18,7 +18,7 @@ #include #include "utils/ms_utils.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/lstm_fp32.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.h index 34a6ad1a581..1559b321829 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/lstm_grad_weight_fp32.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_LSTM_GRAD_WEIGHT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32_grad/lstm_grad_fp32.h" namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/make_tuple.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/make_tuple.h index 2fd15d9d3d9..a5c9b37b8b5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/make_tuple.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/make_tuple.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_MAKE_TUPLE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/nnacl/fp32/arithmetic.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.cc index ad3bef1c5bb..8f99334937d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/neg_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/arithmetic_self_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.h index 588d9801b74..86a9eed5872 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/neg_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_NEG_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.cc index 9a70f441db2..cdda35066bd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.cc @@ -19,7 +19,7 @@ #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32_grad/nllloss_grad_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.h index 0d14d17347c..5ee2074fca9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.h @@ -19,7 +19,7 @@ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/nllloss_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.cc index a1ed1243ba9..139c7fd6049 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/pooling_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/pooling_fp32.h" #include "nnacl/fp32_grad/pooling_grad.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.h index bce572d1b0e..884790b930a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/pooling_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_POOLING_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { using mindspore::schema::PadMode; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.cc index 1f2b4cc9553..1ff4452e8c1 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/power_grad.h" #include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/arithmetic_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.h index 481b8dd8a4e..45524ea36e6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/power_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_POWER_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/power_parameter.h" #include "nnacl/fp32/power_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.cc index abb00949aab..86f7edf5173 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.cc @@ -19,7 +19,7 @@ #include "nnacl/fp32_grad/resize_grad.h" #include "nnacl/errorcode.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.h index 804bc5e7468..9d4b37bcf8f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/resize_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_RESIZE_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ResizeGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sgd.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sgd.cc index 78165976ec9..86ab8675083 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sgd.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sgd.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.cc index 3a482f82ac7..11d2bb9604a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.h index c94622988d5..ab44119fb7e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class SigmoidCrossEntropyWithLogitsCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.cc index d3b3f36b534..ec2e42c4c07 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.h index 4eb238263d8..fd1516a168f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sigmoid_cross_entropy_with_logits_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class SigmoidCrossEntropyWithLogitsGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.cc index 0cee3596be3..98a03166cb4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.h index 7c74f501283..1781f933b6c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_SMOOTH_L1_LOSS_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32_grad/smooth_l1_loss.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.cc index b47211de26f..ea3b2a8a2a4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.h index 6424d0191e5..eefa7ea985b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/smooth_l1_loss_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_SMOOTH_L1_LOSS_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32_grad/smooth_l1_loss.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_cross_entropy_with_logits.cc index 5908ab90b33..1dde8a798fe 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_cross_entropy_with_logits.cc @@ -15,7 +15,7 @@ */ #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/softmax_parameter.h" #include "nnacl/fp32/softmax_fp32.h" #include "src/runtime/kernel/cpu/fp32_grad/softmax_cross_entropy_with_logits.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.cc index a98fd5cea09..c57580968f8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.cc @@ -19,7 +19,7 @@ #include #include "nnacl/fp32_grad/softmax_grad.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.h index cf03bee661b..a740a1fe8d9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_SOFTMAX_GRAD_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/softmax_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc index 168b36a28cf..db786ec187a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/sparse_softmax_cross_entropy_with_logits.cc @@ -15,7 +15,7 @@ */ #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/softmax_parameter.h" #include "nnacl/fp32/softmax_fp32.h" #include "nnacl/fp32_grad/softmax.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.cc index 034a22d7337..8102ce4d2d9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.cc @@ -19,9 +19,9 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32_grad/strided_slice_grad.h" -#include "src/ops/populate/strided_slice_populate.h" +#include "src/common/ops/populate/strided_slice_populate.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.h index 71d42c7a66d..34d18cb629a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/strided_slice_grad.h @@ -19,7 +19,7 @@ #include #include "nnacl/fp32_grad/strided_slice_grad.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class StridedSliceGradCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.cc index 2c29c6eed8d..f3d1f2f4af8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.cc @@ -18,7 +18,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/unsorted_segment_sum_base.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.h index 4757f093c50..2933959e0aa 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_grad/unsorted_segment_sum.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_GRAD_UNSORTED_SEGMENT_SUM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class UnsortedSegmentSumCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.cc b/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.cc index b7d16396f7a..2cbafea1c6f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.cc @@ -19,7 +19,7 @@ #include #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #ifdef ENABLE_ARM64 #include #endif diff --git a/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.h b/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.h index 2d8fb8d34aa..c201c835103 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.h +++ b/mindspore/lite/src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.h @@ -19,7 +19,7 @@ #include #include "nnacl/matmul_parameter.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/transpose_fp32.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/activation_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/activation_int8.cc index 0c0b9e47e86..c6ed510f396 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/activation_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/activation_int8.cc @@ -20,7 +20,7 @@ #include "src/runtime/kernel/cpu/int8/tanh_int8.h" #include "src/runtime/kernel/cpu/int8/leaky_relu_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.cc index da9f4bf3b55..3e726ab5e35 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/add_int8.h" #include "nnacl/int8/quantize.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/common/file_utils.h" #include "src/common/log_util.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.h index d7a4a7687aa..02b81c18d11 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/add_int8.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/add_int8.h" #include "nnacl/arithmetic.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.cc index 753f8cd39bc..5198d8fa000 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/argminmax_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.h index 82d5bb8860f..378e36aec45 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/argminmax_int8.h @@ -21,7 +21,7 @@ #include "nnacl/int8/arg_min_max_int8.h" #include "nnacl/common_func.h" #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class ArgMinMaxInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.cc index 77d72f5d896..5b2e903a83c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.cc @@ -19,7 +19,7 @@ #include "src/runtime/kernel/cpu/int8/mul_int8.h" #include "nnacl/arithmetic.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.h index d8e63efb7d6..a1c1f0cbfec 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_ARITHMETIC_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" #include "nnacl/int8/arithmetic_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.cc index 9524bee0109..5e94b47704f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/int8/arithmetic_self_int8.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.h index ff8296f3fd7..72a76a3ff3e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/arithmetic_self_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_ARITHMETIC_SELF_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/arithmetic_self_parameter.h" #include "nnacl/int8/arithmetic_self_int8.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.cc index 25c55b9f0e1..520e0f11a20 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.cc @@ -17,7 +17,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.h index 279e72cacd5..e59b3e7ff75 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/batch_to_space_int8.h @@ -21,7 +21,7 @@ #include "nnacl/batch_to_space.h" #include "nnacl/base/batch_to_space_base.h" #include "nnacl/int8/batch_to_space_int8.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class BatchToSpaceInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.cc index d3ea0a448d9..af154ef4157 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/int8/batchnorm_int8.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/batchnorm_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.h index 10356434d2a..bb32738f923 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/batchnorm_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_BATCHNORM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/int8/batchnorm_int8.h" #include "nnacl/batchnorm_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.cc index f90891c241e..ce155bac87a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/concat_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.h index 46b647a223b..ff746da2e6a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/concat_int8.h @@ -21,7 +21,7 @@ #include #include "nnacl/int8/concat_int8.h" #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_1x1_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_1x1_int8.h index cca1af1fc28..53f8054598b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_1x1_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_1x1_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_CONVOLUTION_1x1_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/errorcode.h" #include "schema/model_generated.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_3x3_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_3x3_int8.h index 099d3278c5f..d3915f4ce37 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_3x3_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_3x3_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_CONVOLUTION_3X3_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/winograd_transform.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_3x3_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_3x3_int8.h index 572d0e9755b..1ff8e95a057 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_3x3_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_3x3_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_CONVOLUTION_DEPTHWISE_3X3_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_int8.h index 89c1737189a..a005f9980fa 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_CONVOLUTION_DEPTHWISE_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_slidewindow_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_slidewindow_int8.h index e66e388534d..e22294e4abb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_slidewindow_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_depthwise_slidewindow_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_CONVOLUTION_DEPTHWISE_SLIDEWINDOW_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/common/log_util.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.cc index fcee187b22e..cca3c034c32 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.cc @@ -18,7 +18,7 @@ #include "include/errorcode.h" #include "nnacl/int8/conv_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #ifdef ENABLE_ARM64 #include "src/runtime/kernel/cpu/int8/opt_op_handler.h" #endif diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.h index 49dc09c8a96..453df5259ae 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_CONVOLUTION_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "src/common/utils.h" #include "nnacl/int8/conv_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.cc index ef5d8e5446b..081b0570e5a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.cc @@ -24,7 +24,7 @@ #include "src/runtime/kernel/cpu/int8/group_convolution_int8.h" #include "src/runtime/kernel/cpu/base/group_convolution_creator.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.h b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.h index 4743d320d6e..7a9cb7f9180 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/convolution_int8_creator.h @@ -19,7 +19,7 @@ #include #include "nnacl/op_base.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { LiteKernel *CpuConvInt8KernelSelect(const std::vector &inputs, diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.cc index c1431d3d184..251c6f60088 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/crop_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.h index cb07856e1ce..0e567153768 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/crop_int8.h @@ -22,7 +22,7 @@ #include "include/errorcode.h" #include "include/context.h" #include "nnacl/int8/crop_int8.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/crop_base.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_depthwise_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_depthwise_int8.h index f04a860d66b..e94e14050b4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_depthwise_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_depthwise_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_DECONVOLUTION_DEPTHWISE_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" #include "nnacl/fp32/conv_depthwise_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_int8.h index c8d8010035e..27b25b55b87 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/deconvolution_int8.h @@ -17,9 +17,9 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_DECONVOLUTION_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/matmul_parameter.h" #include "nnacl/int8/deconv_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/depth_to_space_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/depth_to_space_int8.cc index 35f01ab4811..a2810e4320c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/depth_to_space_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/depth_to_space_int8.cc @@ -17,7 +17,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.cc index 3dab278df31..f321730ac4d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/detection_post_process_int8.h" #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/int8/quant_dtype_cast_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.h index f898a57533d..42520f2eda9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/detection_post_process_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_DETECTION_POST_PROCESS_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "src/runtime/kernel/cpu/base/detection_post_process_base.h" #include "nnacl/fp32/detection_post_process_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.cc index 8857166b2a9..30301077fe9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.cc @@ -18,7 +18,7 @@ #include #include #include "nnacl/int8/arithmetic_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.h index 22589db7df9..7b3804bcc97 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/div_int8.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_DIV_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/div_int8.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.cc index eb7931bfcbf..af860a5be07 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.cc @@ -18,7 +18,7 @@ #include "nnacl/gather_parameter.h" #include "nnacl/int8/dynamic_gather_int8.h" #include "nnacl/int8/quantize.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.h index f2d4263bffc..2b163300aca 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_gather_int8.h @@ -20,7 +20,7 @@ #include #include "nnacl/gather_parameter.h" #include "nnacl/int8/quantize.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class DynamicGatherInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.cc index d88e676f5d5..41b8b58b5a9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/dynamic_quant.h" #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" #include "include/errorcode.h" #include "nnacl/dynamic_quant_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.h b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.h index dc835a2ba2f..203fbdb86a8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/dynamic_quant.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class DynamicQuantCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/fullconnection_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/fullconnection_int8.cc index d4255c208db..53c4e864034 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/fullconnection_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/fullconnection_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/fullconnection_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.cc index a1290014296..fce7a4f1fa5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.cc @@ -20,7 +20,7 @@ #include #include "schema/model_generated.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/int8/gatherNd_int8.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.h index f51c4ff22aa..8248714c7f4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/gatherNd_int8.h @@ -19,7 +19,7 @@ #include #include "nnacl/int8/quantize.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class GatherNdInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.cc index 22ebf19e6b2..889b1593349 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.cc @@ -20,7 +20,7 @@ #include "nnacl/int8/gather_int8.h" #include "nnacl/int8/quantize.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.h index 11997e4f5e7..26613b622a8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/gather_int8.h @@ -20,7 +20,7 @@ #include #include "nnacl/gather_parameter.h" #include "nnacl/int8/quantize.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class GatherInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/group_convolution_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/group_convolution_int8.h index db9f41d62bb..1120d39d432 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/group_convolution_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/group_convolution_int8.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/op_base.h" #include "src/runtime/kernel/cpu/base/group_convolution_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.cc index 94109d81868..f856398a089 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.cc @@ -18,7 +18,7 @@ #include #include "nnacl/int8/hswish_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.h index 7d059c06c73..2e337731e4a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_BACKEND_ARM_INT8_HSWISH_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/hswish_int8.h" #include "nnacl/int8/quantize.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/l2_norm_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/l2_norm_int8.cc index 63fa47fbc6f..2615ed1ddbf 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/l2_norm_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/l2_norm_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/int8/l2_norm_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/layer_norm_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/layer_norm_int8.h index 4387242e4be..d21eb779580 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/layer_norm_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/layer_norm_int8.h @@ -19,7 +19,7 @@ #include #include #include "nnacl/int8/layer_norm_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.cc index 9f78ff3b81a..8830269d7b6 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/leaky_relu_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.h index 2c352f1428c..2b764f799b2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/leaky_relu_int8.h @@ -23,7 +23,7 @@ #include "include/context.h" #include "nnacl/fp32/activation_fp32.h" #include "nnacl/int8/leaky_relu_int8.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class LeakyReluInt8CPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_base_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_base_int8.h index 89395a55931..0dbb8087087 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_base_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_base_int8.h @@ -20,7 +20,7 @@ #include #include "include/errorcode.h" #include "include/context.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/matmul_parameter.h" #include "nnacl/common_func.h" #include "nnacl/int8/quantize.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_dynamic_base_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_dynamic_base_int8.h index e736a2add93..baef88a77be 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_dynamic_base_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_dynamic_base_int8.h @@ -20,7 +20,7 @@ #include #include "include/errorcode.h" #include "include/context.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/matmul_parameter.h" #include "nnacl/common_func.h" #include "nnacl/int8/quantize.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.cc index fd58d580d65..b539224f7a9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.cc @@ -20,7 +20,7 @@ #include "nnacl/int8/matmul_int8.h" #include "nnacl/common_func.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.h index 917b63641bd..25460285b4e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/matmul_int8.h @@ -21,7 +21,7 @@ #include "include/context.h" #include "nnacl/matmul_parameter.h" #include "nnacl/int8/quantize.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/int8/matmul_base_int8.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.cc index 5f814c76f9d..00e50581bb8 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/mul_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.h index 18c03cc34f5..7c091551fc3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/mul_int8.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/mul_parameter.h" #include "nnacl/int8/mul_int8.h" #include "nnacl/int8/arithmetic_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.cc index 13e7cece210..7cc8bfc4e9c 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/int8/pad_int8.h" #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/op_base.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.h index 533c78e2707..0dbe28597cc 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/pad_int8.h @@ -19,7 +19,7 @@ #include #include #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/errorcode.h" #include "nnacl/pad_parameter.h" #include "nnacl/int8/pad_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.cc index 5980595b4af..9cca58349cb 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/int8/pooling_int8.h" #include "nnacl/int8/pooling_int8.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.h index 9d1a8223700..47c5b057fb5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/pooling_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_POOLING_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "src/runtime/kernel/cpu/base/pooling_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.cc index a5cb702bb66..d0be2cad2b3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.cc @@ -18,7 +18,7 @@ #include #include "nnacl/int8/power_int8.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.h index 9e3fd571075..b258503c280 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_POWER_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/quantize.h" #include "nnacl/power_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.cc index 7977cc76609..daba7c7a798 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/reduce_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/int8/quantize.h" #include "nnacl/pack.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.h index be4b3966f56..b16890bb71f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/reduce_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_REDUCE_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/reduce_parameter.h" #include "nnacl/int8/reduce_int8.h" #include "nnacl/int8/quantize.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.cc index d987a12db54..b4ec5d74a95 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/relux_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.h index 9392c9bf9e6..17a805380a3 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_BACKEND_ARM_INT8_RELUX_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/fp32/activation_fp32.h" #include "nnacl/int8/relux_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.cc index 456ff297760..6fb16457817 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.cc @@ -19,7 +19,7 @@ #include "nnacl/int8/reshape_int8.h" #include "schema/model_generated.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.h index 3d13ac07c56..af10cf12173 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/reshape_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_RESHAPE_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/reshape_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.cc index ce013328e7f..b2f92a8422f 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.cc @@ -20,7 +20,7 @@ #include "include/errorcode.h" #include "nnacl/int8/resize_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.h index 4154db1bf4d..7aa44b04c64 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/resize_int8.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_RESIZE_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/cpu/base/resize_base.h" #include "nnacl/int8/quantize.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.cc index 85671c58bd2..3b5fcbd38c9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/scale_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.h index 335ed6ba601..a023bf188e2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/scale_int8.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/scale.h" #include "nnacl/int8/quantize.h" #include "nnacl/int8/arithmetic_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.cc index 99f0d11d787..88a5cec8983 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.cc @@ -20,7 +20,7 @@ #include "nnacl/int8/sigmoid_int8.h" #include "nnacl/int8/quantize.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.h index c047ab6ea09..44832670cde 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/sigmoid_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_BACKEND_ARM_INT8_SIGMOID_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/sigmoid_int8.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/slice_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/slice_int8.cc index eb250988426..df07de33985 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/slice_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/slice_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/slice_int8.h" #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/int8/slice_int8.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/softmax_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/softmax_int8.cc index eb58c8aef01..bb8c9d92ccd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/softmax_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/softmax_int8.cc @@ -19,7 +19,7 @@ #include "nnacl/int8/softmax_int8.h" #include "schema/model_generated.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::RET_ERROR; using mindspore::lite::RET_OK; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/space_to_batch_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/space_to_batch_int8.cc index 1e9e547a0c4..f229263764b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/space_to_batch_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/space_to_batch_int8.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/runtime/kernel/cpu/int8/space_to_batch_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/space_to_batch_fp32.h" #include "nnacl/int8/space_to_batch_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.cc index 787dcd175e0..71f3212b33a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.cc @@ -19,7 +19,7 @@ #include "nnacl/split_parameter.h" #include "nnacl/int8/split_int8.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.h index 891907c101d..12996d695e5 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/split_int8.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_SPLIT_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "src/runtime/kernel/cpu/base/split_base.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.cc index 62cb082f487..76c3f6d76d9 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/int8/squeeze_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.h index 377a2c80ec8..cf34a8024b2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/squeeze_int8.h @@ -20,7 +20,7 @@ #include #include "include/context.h" #include "include/errorcode.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/squeeze_int8.h" #include "nnacl/squeeze_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.cc index 64b2502b4de..6e60519e39e 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/sub_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.h index 6158ee3b206..b19b4c4ba9d 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.h @@ -21,7 +21,7 @@ #include #include "nnacl/int8/arithmetic_int8.h" #include "nnacl/int8/quantize.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/sub_int8.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/tanh_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/tanh_int8.h index 5a838ba9977..30ab9363290 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/tanh_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/tanh_int8.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/tanh_int8.h" #include "nnacl/int8/quantize.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.cc index b09b5ba1560..87fc47f7d01 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/topk_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.h index c543c16ac81..2e3762b941a 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/topk_int8.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_INT8_TOPK_INT8_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/int8/topk_int8.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/transpose_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/transpose_int8.cc index 401152e5a19..003e81bedee 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/transpose_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/transpose_int8.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/int8/transpose_int8.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/int8/transpose_int8.h" #include "nnacl/int8/pack_int8.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.cc b/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.cc index d6af637a98a..2fbad4a19e1 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.cc @@ -17,7 +17,7 @@ #include "nnacl/int8/unsqueeze_int8.h" #include "src/runtime/kernel/cpu/int8/unsqueeze_int8.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" using mindspore::kernel::KERNEL_ARCH; diff --git a/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.h b/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.h index 1121ce4741c..14fe9850424 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.h +++ b/mindspore/lite/src/runtime/kernel/cpu/int8/unsqueeze_int8.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_FP32_UNSQUEEZE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/int8/unsqueeze_int8.h" #include "src/runtime/kernel/cpu/base/layout_transform.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.cc b/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.cc index b13ae92808b..9ffbbed9ed4 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/cpu/string/extract_feature.h" #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.h b/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.h index 66d53a5208c..8b1a988f388 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.h +++ b/mindspore/lite/src/runtime/kernel/cpu/string/extract_feature.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_STRING_EXTRACT_FEATURE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "src/common/string_utils.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.cc b/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.cc index acd0ffb398c..c47e55c0194 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/string/hashtable_lookup.h" #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/common/string_utils.h" using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.h b/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.h index e217b04655b..959d44cd299 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.h +++ b/mindspore/lite/src/runtime/kernel/cpu/string/hashtable_lookup.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_STRING_HASHTABLE_LOOKUP_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.cc b/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.cc index b6b238f847f..fb69625b056 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.cc @@ -17,7 +17,7 @@ #include "include/errorcode.h" #include "src/common/string_utils.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.h b/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.h index 90cb968589e..7ff101236fd 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.h +++ b/mindspore/lite/src/runtime/kernel/cpu/string/lsh_projection.h @@ -20,7 +20,7 @@ #include #include "nnacl/lsh_projection_parameter.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" namespace mindspore::kernel { class LshProjectionCPUKernel : public LiteKernel { diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/normalize.cc b/mindspore/lite/src/runtime/kernel/cpu/string/normalize.cc index 11949248ef2..39ad89a5fd2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/normalize.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/string/normalize.cc @@ -19,7 +19,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/normalize.h b/mindspore/lite/src/runtime/kernel/cpu/string/normalize.h index e7add59e160..a32015b3fb0 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/normalize.h +++ b/mindspore/lite/src/runtime/kernel/cpu/string/normalize.h @@ -18,7 +18,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "src/common/string_utils.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/predict.cc b/mindspore/lite/src/runtime/kernel/cpu/string/predict.cc index 0863186cfe8..811d2cc25a2 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/predict.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/string/predict.cc @@ -16,7 +16,7 @@ #include "src/runtime/kernel/cpu/string/predict.h" #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/predict.h b/mindspore/lite/src/runtime/kernel/cpu/string/predict.h index 418086c69f5..4c4369c3311 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/predict.h +++ b/mindspore/lite/src/runtime/kernel/cpu/string/predict.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_STRING_PREDICT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "include/context.h" #include "nnacl/predict_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.cc b/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.cc index e7b27d21891..899b69c5561 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.cc +++ b/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/cpu/string/skip_gram.h" #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" using mindspore::lite::KernelRegistrar; using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.h b/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.h index 832807e3c93..188a0e1d88b 100644 --- a/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.h +++ b/mindspore/lite/src/runtime/kernel/cpu/string/skip_gram.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_ARM_STRING_SKIP_GRAM_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/skip_gram_parameter.h" #include "src/common/string_utils.h" diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_allocator.cc b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_allocator.cc similarity index 99% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_allocator.cc rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_allocator.cc index 17962bc9047..890b7b54d63 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_allocator.cc +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_allocator.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/runtime/gpu/opencl/opencl_allocator.h" +#include "src/runtime/kernel/gpu/opencl/opencl_allocator.h" #include -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/common/log_adapter.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_allocator.h b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_allocator.h similarity index 100% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_allocator.h rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_allocator.h diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_executor.cc b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_executor.cc similarity index 98% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_executor.cc rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_executor.cc index fafcd710a1d..aa3d6dbd56f 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_executor.cc +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_executor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/runtime/gpu/opencl/opencl_executor.h" +#include "src/runtime/kernel/gpu/opencl/opencl_executor.h" #include "src/runtime/kernel/opencl/utils.h" #include "nnacl/pack.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_executor.h b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_executor.h similarity index 95% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_executor.h rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_executor.h index e406e7d9960..650cab6d63b 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_executor.h +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_executor.h @@ -18,10 +18,10 @@ #define MINDSPORE_LITE_SRC_RUNTIME_OPENCL_EXECUTOR_H_ #include -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #include "src/runtime/inner_allocator.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/executor.h" +#include "src/runtime/executor.h" #include "include/lite_session.h" namespace mindspore::lite::opencl { diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_runtime.cc b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime.cc similarity index 99% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_runtime.cc rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime.cc index b517db8c58f..e88dbae6be6 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_runtime.cc +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #include #include #include #include #include "include/errorcode.h" #include "src/runtime/kernel/opencl/utils.h" -#include "src/runtime/gpu/opencl/opencl_allocator.h" +#include "src/runtime/kernel/gpu/opencl/opencl_allocator.h" #include "src/common/file_utils.h" using mindspore::kernel::CLErrorCode; diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_runtime.h b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime.h similarity index 98% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_runtime.h rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime.h index 6ac3a7caf69..950f4dc28c1 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_runtime.h +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime.h @@ -25,8 +25,8 @@ #include #include "dtype/type_id.h" #include "src/common/log_adapter.h" -#include "src/runtime/gpu/opencl/opencl_wrapper.h" -#include "src/runtime/gpu/opencl/opencl_allocator.h" +#include "src/runtime/kernel/gpu/opencl/opencl_wrapper.h" +#include "src/runtime/kernel/gpu/opencl/opencl_allocator.h" #include "schema/gpu_cache_generated.h" #define EXT_ARM_IMPORT_MEMORY_HOST "cl_arm_import_memory_host" diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_runtime_wrapper.cc b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime_wrapper.cc similarity index 98% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_runtime_wrapper.cc rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime_wrapper.cc index c24a86c45f0..e189395011a 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_runtime_wrapper.cc +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_runtime_wrapper.cc @@ -21,9 +21,9 @@ #include #include "include/errorcode.h" #include "src/runtime/kernel/opencl/utils.h" -#include "src/runtime/gpu/opencl/opencl_allocator.h" +#include "src/runtime/kernel/gpu/opencl/opencl_allocator.h" #include "src/common/file_utils.h" -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" using mindspore::kernel::CLErrorCode; diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_wrapper.cc b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_wrapper.cc similarity index 99% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_wrapper.cc rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_wrapper.cc index bd91e0ccd09..d7b12294ca8 100644 --- a/mindspore/lite/src/runtime/gpu/opencl/opencl_wrapper.cc +++ b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_wrapper.cc @@ -16,7 +16,7 @@ #ifdef USE_OPENCL_WRAPPER -#include "src/runtime/gpu/opencl/opencl_wrapper.h" +#include "src/runtime/kernel/gpu/opencl/opencl_wrapper.h" #include #include #include diff --git a/mindspore/lite/src/runtime/gpu/opencl/opencl_wrapper.h b/mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_wrapper.h similarity index 100% rename from mindspore/lite/src/runtime/gpu/opencl/opencl_wrapper.h rename to mindspore/lite/src/runtime/kernel/gpu/opencl/opencl_wrapper.h diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc index 961360b6fd0..b8af1a7d818 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/activation.cc @@ -19,7 +19,7 @@ #include #include "src/runtime/kernel/opencl/kernel/activation.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/kernel/opencl/cl/activation.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/argminmax.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/argminmax.cc index 51533384bee..d4d89a6b12c 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/argminmax.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/argminmax.cc @@ -17,7 +17,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/kernel/argminmax.h" #include "src/runtime/kernel/opencl/cl/argminmax.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic.cc index 2dbd3e8ea65..d60b5e8649e 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 "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/arithmetic.cl.inc" #include "nnacl/arithmetic.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic_self.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic_self.cc index 400dec3f7b9..6978cf2d625 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic_self.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/arithmetic_self.cc @@ -16,7 +16,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/arithmetic_self.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/arithmeticself.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/batch_to_space_nd.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/batch_to_space_nd.cc index b3c03f80973..115ecfde23e 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/batch_to_space_nd.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/batch_to_space_nd.cc @@ -16,7 +16,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/batch_to_space_nd.h" #include "src/runtime/kernel/opencl/cl/batch_to_space_nd.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.cc index c3119ba8cde..b8588a67219 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/batchnorm.cc @@ -17,7 +17,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/batchnorm.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/batchnorm.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.cc index 929c69df45f..f30b5311119 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/cast.cc @@ -17,7 +17,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/cast.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/cast.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/concat.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/concat.cc index a3a6748d1cc..51a96535452 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/concat.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/concat.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/concat.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d.cc index ab5dc104c8f..7e26b4c246f 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "schema/ops_generated.h" #include "src/common/utils.h" 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 86e6694a1ed..8f934215dd6 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.cc @@ -18,7 +18,7 @@ #include #include #include "nnacl/fp32/common_func_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/cl/conv2d_transpose.cl.inc" #include "src/runtime/kernel/opencl/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h index fca7395280d..3195115734c 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/conv2d_transpose.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_CONV2D_TRANSPOSE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/conv_parameter.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" 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 c8ab6e193fa..26ce22caad8 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/depthwise_conv2d.cc @@ -20,7 +20,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "nnacl/fp32/common_func_fp32.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc index 757748ca381..19a72f6927b 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/opencl/kernel/fill.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" using mindspore::kernel::KERNEL_ARCH::kGPU; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc index 163795066f1..3f57afa7d10 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/fullconnection.cc @@ -18,7 +18,7 @@ #include #include #include "nnacl/fp32/common_func_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/fullconnection.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/fullconnection.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/gather.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/gather.cc index a28388645c0..94e69135ab4 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/gather.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/gather.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/gather.h" #include "src/runtime/kernel/opencl/cl/gather.cl.inc" #include "src/runtime/kernel/opencl/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.cc index 4a737694f50..9e1a14ca140 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.cc @@ -17,7 +17,7 @@ #include #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/cl/gl_to_cl.cl.inc" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.h index f0ad68dcb44..5809f2865e1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/gl_to_cl.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_GL_TO_CL_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/int8/arithmetic_int8.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/int8/arithmetic_int8.cc index 623d10d8b3f..d7e77101a07 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/int8/arithmetic_int8.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/int8/arithmetic_int8.cc @@ -18,7 +18,7 @@ #include #include "nnacl/fp32/common_func_fp32.h" #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/int8/arithmetic.cl.inc" #include "nnacl/arithmetic.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/layer_norm.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/layer_norm.cc index e792ff80611..57b1f17afa2 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/layer_norm.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/layer_norm.cc @@ -17,7 +17,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/layer_norm.h" #include "nnacl/layer_norm_parameter.h" #include "src/runtime/kernel/opencl/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/matmul.cc index 3f70cb69492..2a252d733b4 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 "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/matmul.h" #include "src/runtime/kernel/opencl/kernel/strassen.h" #include "src/runtime/kernel/opencl/cl/matmul.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.cc index 410a2cd0eef..5a798982863 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.cc @@ -16,7 +16,7 @@ #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/one_hot.h" #include "src/runtime/kernel/opencl/cl/one_hot.cl.inc" 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 d9757804e67..22929581207 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/one_hot.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "nnacl/fp32/one_hot_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/pad.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/pad.cc index 953e6546314..0db209832cd 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/pad.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/pad.cc @@ -19,7 +19,7 @@ #include "src/common/utils.h" #include "src/runtime/kernel/opencl/kernel/pad.h" #include "src/runtime/kernel/opencl/utils.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "src/runtime/kernel/opencl/cl/pad.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.cc index 4c37321a09f..b91ff2d2d89 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/pooling2d.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/opencl/kernel/pooling2d.h" #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/pooling2d.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/power.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/power.cc index d0ec35ab2f6..4e5743fb3c1 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/power.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/power.cc @@ -19,7 +19,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/power.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/prelu.cc index 67b6dcab8ee..8adbc0bf131 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 #include #include "src/runtime/kernel/opencl/cl/prelu.cl.inc" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "include/errorcode.h" #include "nnacl/fp32/common_func_fp32.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.cc index e2ef45917c5..e8404e17981 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.cc @@ -19,7 +19,7 @@ #include #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/reduce.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/reduce.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.h index ed4be99ab29..5e8cdc1ebba 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/reduce.h @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "nnacl/reduce_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.cc index d3c064c7f22..f02fa2d5f36 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.cc @@ -17,7 +17,7 @@ #include #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/reshape.h" #include "src/runtime/kernel/opencl/cl/reshape.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.h index d61171b84dc..34366176757 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/reshape.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_RESHAPE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.cc index 66cb99b8d20..b8c870fc331 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/opencl/kernel/resize.h" #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/cl/resize.cl.inc" using mindspore::kernel::KERNEL_ARCH::kGPU; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.h index 5663dc19765..4421ed4f07c 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/resize.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_RESIZE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "nnacl/resize_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc index 1552539147d..d7dfc69223f 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/scale.cc @@ -19,7 +19,7 @@ #include #include #include "schema/model_generated.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/fp32/common_func_fp32.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/scale.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.cc index 4509a598995..43fe681df75 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/softmax.cc @@ -17,7 +17,7 @@ #include "src/runtime/kernel/opencl/kernel/softmax.h" #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "nnacl/softmax_parameter.h" #include "src/runtime/kernel/opencl/cl/softmax.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.cc index 431c1ff9150..f422f7561de 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_batch_nd.cc @@ -15,7 +15,7 @@ */ #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/space_to_batch_nd.h" #include "src/runtime/kernel/opencl/cl/space_to_batch_nd.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.cc index 8d05464f2a6..0c01af84f5b 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/space_to_depth.cc @@ -16,7 +16,7 @@ #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/space_to_depth.h" #include "src/runtime/kernel/opencl/cl/space_to_depth.cl.inc" 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 66d39d1ac18..8a6a896c6b9 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 @@ -19,7 +19,7 @@ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" #include "nnacl/space_to_depth_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.cc index 0f0171ebad3..c071a1fcc25 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/sparse_to_dense.cc @@ -19,7 +19,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/sparse_to_dense.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/split.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/split.cc index a39357b9da7..af40f6a0f69 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/split.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/split.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/cl/split.cl.inc" using mindspore::kernel::KERNEL_ARCH::kGPU; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/stack.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/stack.cc index b63ead467e9..2293ad4c5ba 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/stack.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/stack.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/stack.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.cc index 426b18c3256..b4a1ec07eae 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/strided_slice.cc @@ -17,7 +17,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/strided_slice.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/cl/strided_slice.cl.inc" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.cc index 214dc7c02e9..8d18bd0a4c7 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.cc @@ -18,7 +18,7 @@ #include #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/cl/to_format.cl.inc" using mindspore::kernel::KERNEL_ARCH::kGPU; diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.h index 6ed808c35ce..5f5c19e74a4 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_TO_FORMAT_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.cc index 7245d87a900..665da113d7c 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.cc @@ -16,7 +16,7 @@ #include #include "include/errorcode.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/kernel/transpose.h" #include "src/runtime/kernel/opencl/cl/transpose.cl.inc" #include "src/runtime/kernel/opencl/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.h b/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.h index 7f8fefb8738..5ca89cc74e0 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.h +++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/transpose.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_RUNTIME_KERNEL_OPENCL_KERNEL_TRANSPOSE_H_ #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/transpose.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/opencl_fusion.cc b/mindspore/lite/src/runtime/kernel/opencl/opencl_fusion.cc index fe93da5bf06..7be7c6446ba 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/opencl_fusion.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/opencl_fusion.cc @@ -23,7 +23,7 @@ #include "src/runtime/kernel/opencl/kernel/conv2d.h" #include "src/runtime/kernel/opencl/kernel/fusion_eltwise.h" #include "src/runtime/kernel/opencl/utils.h" -#include "src/runtime/gpu/opencl/opencl_executor.h" +#include "src/runtime/kernel/gpu/opencl/opencl_executor.h" #include "include/errorcode.h" #include "schema/ops_generated.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.cc b/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.cc index 947b66b4632..65d7b3b90fe 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.cc @@ -16,7 +16,7 @@ #include "src/runtime/infer_manager.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/weight_decoder.h" +#include "src/runtime/weight_decoder.h" #include "src/common/file_utils.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.h b/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.h index d5aa448fd60..19e9583a534 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.h +++ b/mindspore/lite/src/runtime/kernel/opencl/opencl_kernel.h @@ -23,10 +23,11 @@ #include #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" +#include "src/runtime/kernel_exec.h" #include "include/errorcode.h" -#include "src/runtime/gpu/opencl/opencl_runtime.h" -#include "mindspore/lite/src/weight_decoder.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" +#include "mindspore/lite/src/runtime/tensor_category.h" #include "src/runtime/kernel/opencl/utils.h" #include "nnacl/resize_parameter.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.cc b/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.cc index 63d87f36ed5..9eb80dc7f8e 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.cc @@ -20,7 +20,7 @@ #include #include #include -#include "src/runtime/gpu/opencl/opencl_executor.h" +#include "src/runtime/kernel/gpu/opencl/opencl_executor.h" #include "src/runtime/kernel/opencl/utils.h" #include "src/runtime/kernel/opencl/kernel/to_format.h" #include "src/runtime/kernel/opencl/kernel/gl_to_cl.h" diff --git a/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.h b/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.h index cd7ad70f426..3a84b36d216 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.h +++ b/mindspore/lite/src/runtime/kernel/opencl/opencl_subgraph.h @@ -21,9 +21,9 @@ #include #include #include "src/runtime/kernel/opencl/opencl_kernel.h" -#include "src/runtime/gpu/opencl/opencl_allocator.h" -#include "src/runtime/gpu/opencl/opencl_executor.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/kernel/gpu/opencl/opencl_allocator.h" +#include "src/runtime/kernel/gpu/opencl/opencl_executor.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::kernel { class OpenCLSubGraph : public SubGraphKernel { diff --git a/mindspore/lite/src/runtime/kernel/opencl/utils.cc b/mindspore/lite/src/runtime/kernel/opencl/utils.cc index 54bafc45c5c..9757a64e413 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/utils.cc +++ b/mindspore/lite/src/runtime/kernel/opencl/utils.cc @@ -19,7 +19,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/common/file_utils.h" using mindspore::schema::ActivationType_LEAKY_RELU; diff --git a/mindspore/lite/src/runtime/kernel/opencl/utils.h b/mindspore/lite/src/runtime/kernel/opencl/utils.h index 4412a7852f6..2886153364b 100644 --- a/mindspore/lite/src/runtime/kernel/opencl/utils.h +++ b/mindspore/lite/src/runtime/kernel/opencl/utils.h @@ -23,7 +23,7 @@ #include "CL/cl2.hpp" #include "src/common/log_adapter.h" #include "nnacl/op_base.h" -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "src/common/utils.h" #include "src/runtime/kernel/opencl/opencl_kernel.h" diff --git a/mindspore/lite/src/kernel_exec.cc b/mindspore/lite/src/runtime/kernel_exec.cc similarity index 98% rename from mindspore/lite/src/kernel_exec.cc rename to mindspore/lite/src/runtime/kernel_exec.cc index 6041db5445a..8f5951b78c3 100644 --- a/mindspore/lite/src/kernel_exec.cc +++ b/mindspore/lite/src/runtime/kernel_exec.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include #include "src/tensor.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/kernel_exec.h b/mindspore/lite/src/runtime/kernel_exec.h similarity index 98% rename from mindspore/lite/src/kernel_exec.h rename to mindspore/lite/src/runtime/kernel_exec.h index 3f2af3020a7..8b978e7d053 100644 --- a/mindspore/lite/src/kernel_exec.h +++ b/mindspore/lite/src/runtime/kernel_exec.h @@ -27,16 +27,16 @@ #include #endif #include "nnacl/op_base.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" #include "src/tensor.h" #include "include/errorcode.h" #include "schema/model_generated.h" #include "include/context.h" #include "include/api/kernel.h" -#include "src/cxx_api/tensor/tensor_impl.h" -#include "src/lite_kernel.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/lite_kernel.h" #include "include/api/delegate.h" -#include "model_loader/abstract_kernel.h" +#include "extendrt/mindir_loader/abstract_kernel.h" using mindspore::infer::Abstractkernel; diff --git a/mindspore/lite/src/kernel_exec_util.cc b/mindspore/lite/src/runtime/kernel_exec_util.cc similarity index 99% rename from mindspore/lite/src/kernel_exec_util.cc rename to mindspore/lite/src/runtime/kernel_exec_util.cc index 320a9e60882..474fcc25885 100644 --- a/mindspore/lite/src/kernel_exec_util.cc +++ b/mindspore/lite/src/runtime/kernel_exec_util.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include #include #include #include -#include "src/sub_graph_kernel.h" +#include "src/runtime/sub_graph_kernel.h" #include "nnacl/call_parameter.h" #if GPU_OPENCL #include "src/runtime/kernel/opencl/opencl_subgraph.h" -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #endif #include "src/control_flow/control_subgraph_creator.h" #include "src/runtime/kernel/cpu/base/partial_fusion.h" diff --git a/mindspore/lite/src/kernel_exec_util.h b/mindspore/lite/src/runtime/kernel_exec_util.h similarity index 96% rename from mindspore/lite/src/kernel_exec_util.h rename to mindspore/lite/src/runtime/kernel_exec_util.h index f6ed513d608..b483c87f99f 100644 --- a/mindspore/lite/src/kernel_exec_util.h +++ b/mindspore/lite/src/runtime/kernel_exec_util.h @@ -18,9 +18,9 @@ #define MINDSPORE_LITE_SRC_LITE_KERNEL_UTIL_H_ #include #include -#include "src/kernel_exec.h" -#include "src/sub_graph_kernel.h" -#include "src/inner_context.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/sub_graph_kernel.h" +#include "src/runtime/inner_context.h" namespace mindspore::kernel { diff --git a/mindspore/lite/src/kernel_registry.cc b/mindspore/lite/src/runtime/kernel_registry.cc similarity index 99% rename from mindspore/lite/src/kernel_registry.cc rename to mindspore/lite/src/runtime/kernel_registry.cc index aa3b106aab8..8513f026195 100644 --- a/mindspore/lite/src/kernel_registry.cc +++ b/mindspore/lite/src/runtime/kernel_registry.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include #include #include "include/errorcode.h" #ifndef CUSTOM_KERNEL_REGISTRY_CLIP #include "include/registry/register_kernel.h" #endif -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/version_manager.h" #include "nnacl/pooling_parameter.h" #if defined(ENABLE_FP16) && defined(ENABLE_ARM) diff --git a/mindspore/lite/src/kernel_registry.h b/mindspore/lite/src/runtime/kernel_registry.h similarity index 99% rename from mindspore/lite/src/kernel_registry.h rename to mindspore/lite/src/runtime/kernel_registry.h index 7b07c9f80c8..100f918d454 100644 --- a/mindspore/lite/src/kernel_registry.h +++ b/mindspore/lite/src/runtime/kernel_registry.h @@ -22,7 +22,7 @@ #include #include #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "schema/model_generated.h" using mindspore::kernel::kKernelArch_MAX; diff --git a/mindspore/lite/src/lite_kernel.cc b/mindspore/lite/src/runtime/lite_kernel.cc similarity index 99% rename from mindspore/lite/src/lite_kernel.cc rename to mindspore/lite/src/runtime/lite_kernel.cc index 7bf2d35378a..e7c8409ec4e 100644 --- a/mindspore/lite/src/lite_kernel.cc +++ b/mindspore/lite/src/runtime/lite_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include #include "src/tensor.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/lite_kernel.h b/mindspore/lite/src/runtime/lite_kernel.h similarity index 97% rename from mindspore/lite/src/lite_kernel.h rename to mindspore/lite/src/runtime/lite_kernel.h index 0a3af71380b..a3d4ebf0803 100644 --- a/mindspore/lite/src/lite_kernel.h +++ b/mindspore/lite/src/runtime/lite_kernel.h @@ -24,15 +24,15 @@ #include "src/common/utils.h" #include "src/common/log_util.h" #include "nnacl/op_base.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" #include "src/tensor.h" #include "include/errorcode.h" #include "schema/model_generated.h" -#include "src/cxx_api/tensor/tensor_impl.h" +#include "src/runtime/cxx_api/tensor/tensor_impl.h" #include "include/api/context.h" #include "include/api/kernel.h" -#include "src/thread_cost_model.h" -#include "model_loader/abstract_kernel.h" +#include "src/runtime/thread_cost_model.h" +#include "extendrt/mindir_loader/abstract_kernel.h" using mindspore::infer::Abstractkernel; diff --git a/mindspore/lite/src/lite_mindrt.cc b/mindspore/lite/src/runtime/lite_mindrt.cc similarity index 99% rename from mindspore/lite/src/lite_mindrt.cc rename to mindspore/lite/src/runtime/lite_mindrt.cc index c7b9a799d5c..e81156686db 100644 --- a/mindspore/lite/src/lite_mindrt.cc +++ b/mindspore/lite/src/runtime/lite_mindrt.cc @@ -16,9 +16,9 @@ #include #include -#include "src/lite_mindrt.h" +#include "src/runtime/lite_mindrt.h" #include "mindrt/include/mindrt.hpp" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include "src/common/tensor_util.h" #include "src/common/common.h" #include "src/runtime/inner_allocator.h" diff --git a/mindspore/lite/src/lite_mindrt.h b/mindspore/lite/src/runtime/lite_mindrt.h similarity index 97% rename from mindspore/lite/src/lite_mindrt.h rename to mindspore/lite/src/runtime/lite_mindrt.h index 259054f45a7..94923a5af2e 100644 --- a/mindspore/lite/src/lite_mindrt.h +++ b/mindspore/lite/src/runtime/lite_mindrt.h @@ -23,12 +23,12 @@ #include #include #include "actor/op_actor.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "actor/actor.h" #include "async/uuid_base.h" #include "async/future.h" -#include "src/sub_graph_kernel.h" -#include "src/cpu_info.h" +#include "src/runtime/sub_graph_kernel.h" +#include "src/runtime/cpu_info.h" #include "src/tensorlist.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/lite_model.cc b/mindspore/lite/src/runtime/lite_model.cc similarity index 99% rename from mindspore/lite/src/lite_model.cc rename to mindspore/lite/src/runtime/lite_model.cc index 9efb8fbd1dc..54a865d82c0 100644 --- a/mindspore/lite/src/lite_model.cc +++ b/mindspore/lite/src/runtime/lite_model.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" #include #include #include @@ -28,7 +28,7 @@ #include "src/common/graph_util.h" #include "src/common/file_utils.h" #include "src/tensor.h" -#include "model_loader/model_loader.h" +#include "extendrt/mindir_loader/model_loader.h" namespace mindspore::lite { namespace { diff --git a/mindspore/lite/src/lite_model.h b/mindspore/lite/src/runtime/lite_model.h similarity index 99% rename from mindspore/lite/src/lite_model.h rename to mindspore/lite/src/runtime/lite_model.h index 8467ebb48f4..51f9967fac2 100644 --- a/mindspore/lite/src/lite_model.h +++ b/mindspore/lite/src/runtime/lite_model.h @@ -27,7 +27,7 @@ #include "src/common/common.h" #include "src/common/log_adapter.h" #include "src/common/version_manager.h" -#include "src/schema_tensor_wrapper.h" +#include "src/runtime/schema_tensor_wrapper.h" #include "nnacl/op_base.h" #include "src/common/prim_util.h" #ifdef ENABLE_MODEL_OBF diff --git a/mindspore/lite/src/lite_session.cc b/mindspore/lite/src/runtime/lite_session.cc similarity index 99% rename from mindspore/lite/src/lite_session.cc rename to mindspore/lite/src/runtime/lite_session.cc index 633af34c4a7..72f39504e7c 100644 --- a/mindspore/lite/src/lite_session.cc +++ b/mindspore/lite/src/runtime/lite_session.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" #include "src/runtime/runtime_pass.h" #if defined(LINUX_RUNTIME) #include @@ -25,35 +25,35 @@ #include #include "include/errorcode.h" #include "src/common/log_adapter.h" -#include "src/scheduler.h" +#include "src/runtime/scheduler.h" #include "src/runtime/inner_allocator.h" -#include "src/executor.h" +#include "src/runtime/executor.h" #include "src/common/context_util.h" #include "src/common/utils.h" #include "src/common/graph_util.h" #include "src/common/tensor_util.h" #include "src/common/file_utils.h" -#include "src/lite_model.h" -#include "src/weight_decoder.h" +#include "src/runtime/lite_model.h" +#include "src/runtime/weight_decoder.h" #include "src/runtime/runtime_allocator.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #ifndef CUSTOM_KERNEL_REGISTRY_CLIP #include "src/registry/register_kernel_impl.h" #endif #ifdef ENABLE_MINDRT -#include "src/mindrt_executor.h" +#include "src/runtime/mindrt_executor.h" #endif #if SUPPORT_NPU -#include "src/delegate/npu/npu_delegate.h" +#include "src/runtime/delegate/npu/npu_delegate.h" #endif #if GPU_OPENCL #include "src/runtime/kernel/opencl/opencl_subgraph.h" #endif #if GPU_TENSORRT -#include "src/delegate/tensorrt/tensorrt_delegate.h" +#include "src/extendrt/delegate/tensorrt/tensorrt_delegate.h" #endif #include "src/runtime/runtime_convert.h" -#include "model_loader/model_loader.h" +#include "extendrt/mindir_loader/model_loader.h" using AbstractBaseModel = mindspore::infer::AbstractBaseModel; diff --git a/mindspore/lite/src/lite_session.h b/mindspore/lite/src/runtime/lite_session.h similarity index 97% rename from mindspore/lite/src/lite_session.h rename to mindspore/lite/src/runtime/lite_session.h index eca8ae3b63e..b61e6163c87 100644 --- a/mindspore/lite/src/lite_session.h +++ b/mindspore/lite/src/runtime/lite_session.h @@ -23,21 +23,21 @@ #include #include #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "include/ms_tensor.h" #include "include/lite_session.h" -#include "src/lite_model.h" -#include "src/inner_context.h" +#include "src/runtime/lite_model.h" +#include "src/runtime/inner_context.h" #include "src/runtime/runtime_allocator.h" #include "schema/model_generated.h" -#include "src/executor.h" +#include "src/runtime/executor.h" #include "src/tensor.h" #include "src/tensorlist.h" #include "include/api/delegate.h" #if GPU_OPENCL -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #endif -#include "src/scheduler_cb.h" +#include "src/runtime/scheduler_cb.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/mindrt_executor.cc b/mindspore/lite/src/runtime/mindrt_executor.cc similarity index 98% rename from mindspore/lite/src/mindrt_executor.cc rename to mindspore/lite/src/runtime/mindrt_executor.cc index dbe1f05a9b4..51052816ac6 100644 --- a/mindspore/lite/src/mindrt_executor.cc +++ b/mindspore/lite/src/runtime/mindrt_executor.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/mindrt_executor.h" +#include "src/runtime/mindrt_executor.h" #include #include -#include "src/lite_mindrt.h" +#include "src/runtime/lite_mindrt.h" #include "include/errorcode.h" #include "src/common/common.h" #include "src/common/tensor_util.h" #ifdef ENABLE_FP16 #include "nnacl/base/cast_base.h" #endif -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" namespace mindspore::lite { int MindrtExecutor::PrepareGraphInput(const std::vector &kernels, diff --git a/mindspore/lite/src/mindrt_executor.h b/mindspore/lite/src/runtime/mindrt_executor.h similarity index 96% rename from mindspore/lite/src/mindrt_executor.h rename to mindspore/lite/src/runtime/mindrt_executor.h index c9e2c1b6f8f..05eea2ed1c8 100644 --- a/mindspore/lite/src/mindrt_executor.h +++ b/mindspore/lite/src/runtime/mindrt_executor.h @@ -23,9 +23,9 @@ #include #include #include "src/runtime/inner_allocator.h" -#include "src/kernel_exec.h" -#include "src/lite_mindrt.h" -#include "src/executor.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/lite_mindrt.h" +#include "src/runtime/executor.h" #include "include/lite_session.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/ms_tensor.cc b/mindspore/lite/src/runtime/ms_tensor.cc similarity index 100% rename from mindspore/lite/src/ms_tensor.cc rename to mindspore/lite/src/runtime/ms_tensor.cc diff --git a/mindspore/lite/src/pack_weight.cc b/mindspore/lite/src/runtime/pack_weight.cc similarity index 99% rename from mindspore/lite/src/pack_weight.cc rename to mindspore/lite/src/runtime/pack_weight.cc index 31f44e7b3de..5de0362aef1 100644 --- a/mindspore/lite/src/pack_weight.cc +++ b/mindspore/lite/src/runtime/pack_weight.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/pack_weight.h" +#include "src/runtime/pack_weight.h" namespace mindspore::lite { STATUS PackWeight::InitWeightManagerByBuf(const char *model_buf, size_t model_size, int numa_id) { MS_CHECK_TRUE_MSG(model_buf != nullptr, RET_ERROR, "model buf is nullptr in pack weight manager."); diff --git a/mindspore/lite/src/pack_weight.h b/mindspore/lite/src/runtime/pack_weight.h similarity index 98% rename from mindspore/lite/src/pack_weight.h rename to mindspore/lite/src/runtime/pack_weight.h index 69747be4511..6dae5cb4f09 100644 --- a/mindspore/lite/src/pack_weight.h +++ b/mindspore/lite/src/runtime/pack_weight.h @@ -26,7 +26,7 @@ #include #include #include "src/tensor.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" namespace mindspore::lite { struct ModelConstWeight { // origin tensor data <-> packed tensor data diff --git a/mindspore/lite/src/pack_weight_manager.cc b/mindspore/lite/src/runtime/pack_weight_manager.cc similarity index 98% rename from mindspore/lite/src/pack_weight_manager.cc rename to mindspore/lite/src/runtime/pack_weight_manager.cc index 8eacaa556c3..d4c08f4e3ab 100644 --- a/mindspore/lite/src/pack_weight_manager.cc +++ b/mindspore/lite/src/runtime/pack_weight_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/pack_weight_manager.h" +#include "src/runtime/pack_weight_manager.h" namespace mindspore::lite { namespace { #ifndef __ANDROID__ diff --git a/mindspore/lite/src/pack_weight_manager.h b/mindspore/lite/src/runtime/pack_weight_manager.h similarity index 97% rename from mindspore/lite/src/pack_weight_manager.h rename to mindspore/lite/src/runtime/pack_weight_manager.h index abc1fbf1d38..f7dbaf7331c 100644 --- a/mindspore/lite/src/pack_weight_manager.h +++ b/mindspore/lite/src/runtime/pack_weight_manager.h @@ -21,7 +21,7 @@ #include "include/errorcode.h" #include "src/tensor.h" #ifdef SHARING_MODEL_WEIGHT -#include "src/pack_weight.h" +#include "src/runtime/pack_weight.h" #endif namespace mindspore::lite { class PackWeightManager { diff --git a/mindspore/lite/src/parallel_config.h b/mindspore/lite/src/runtime/parallel_config.h similarity index 100% rename from mindspore/lite/src/parallel_config.h rename to mindspore/lite/src/runtime/parallel_config.h diff --git a/mindspore/lite/src/runtime/pass/decrease_transpose_algo.cc b/mindspore/lite/src/runtime/pass/decrease_transpose_algo.cc index 289c06fdd6a..0e7dcd82eca 100644 --- a/mindspore/lite/src/runtime/pass/decrease_transpose_algo.cc +++ b/mindspore/lite/src/runtime/pass/decrease_transpose_algo.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/pass/decrease_transpose_algo.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include "src/runtime/pass/pass_utils.h" #include "nnacl/base/format_transpose.h" diff --git a/mindspore/lite/src/runtime/pass/delete_isolated_kernel.cc b/mindspore/lite/src/runtime/pass/delete_isolated_kernel.cc index 57715338c86..c3a36119b0e 100644 --- a/mindspore/lite/src/runtime/pass/delete_isolated_kernel.cc +++ b/mindspore/lite/src/runtime/pass/delete_isolated_kernel.cc @@ -17,7 +17,7 @@ #include "src/runtime/pass/delete_isolated_kernel.h" #include #include -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" namespace mindspore::lite::pass { int DeleteIsolatedKernel::Run(kernel::SubGraphKernel *subgraph, std::vector *tensors) { diff --git a/mindspore/lite/src/runtime/pass/infershape_pass.cc b/mindspore/lite/src/runtime/pass/infershape_pass.cc index 0ac87b20d6e..5ecd60bb610 100644 --- a/mindspore/lite/src/runtime/pass/infershape_pass.cc +++ b/mindspore/lite/src/runtime/pass/infershape_pass.cc @@ -16,7 +16,7 @@ #include "src/runtime/pass/infershape_pass.h" #include "src/runtime/infer_manager.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" namespace mindspore::lite::pass { int Infershape::Run(kernel::SubGraphKernel *subgraph, std::vector *tensors) { diff --git a/mindspore/lite/src/runtime/pass/pass_utils.cc b/mindspore/lite/src/runtime/pass/pass_utils.cc index 1549b57650b..d142c8c998f 100644 --- a/mindspore/lite/src/runtime/pass/pass_utils.cc +++ b/mindspore/lite/src/runtime/pass/pass_utils.cc @@ -19,7 +19,7 @@ #include #include #include -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/format_transpose_parameter.h" namespace mindspore::lite::pass { diff --git a/mindspore/lite/src/runtime/pass/pass_utils.h b/mindspore/lite/src/runtime/pass/pass_utils.h index f0b37866079..3a4692a785e 100644 --- a/mindspore/lite/src/runtime/pass/pass_utils.h +++ b/mindspore/lite/src/runtime/pass/pass_utils.h @@ -18,8 +18,8 @@ #include #include -#include "src/kernel_exec.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::lite::pass { static const std::vector nh2nc_perm = {0, 3, 1, 2}; diff --git a/mindspore/lite/src/runtime/pass/runtime_ncx_pass.h b/mindspore/lite/src/runtime/pass/runtime_ncx_pass.h index 298e58f15c4..208bb98f97c 100644 --- a/mindspore/lite/src/runtime/pass/runtime_ncx_pass.h +++ b/mindspore/lite/src/runtime/pass/runtime_ncx_pass.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_SRC_RUNTIME_PASS_RUNTIME_NCX_PASS__H_ #include -#include "src/kernel_exec.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::lite::pass { // To support NC4HW4(fp32) or NC8HW8(fp16) runtime kernel. diff --git a/mindspore/lite/src/runtime/pass/runtime_optimizer.h b/mindspore/lite/src/runtime/pass/runtime_optimizer.h index ad9c71310ce..4f11029f781 100644 --- a/mindspore/lite/src/runtime/pass/runtime_optimizer.h +++ b/mindspore/lite/src/runtime/pass/runtime_optimizer.h @@ -18,7 +18,7 @@ #include #include -#include "src/sub_graph_kernel.h" +#include "src/runtime/sub_graph_kernel.h" namespace mindspore::lite::pass { class RuntimePass { diff --git a/mindspore/lite/src/runtime/pass/to_nchw_format.cc b/mindspore/lite/src/runtime/pass/to_nchw_format.cc index 880de92b795..f771466baa6 100644 --- a/mindspore/lite/src/runtime/pass/to_nchw_format.cc +++ b/mindspore/lite/src/runtime/pass/to_nchw_format.cc @@ -16,9 +16,9 @@ #include "src/runtime/pass/to_nchw_format.h" #include -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" #include "src/runtime/pass/pass_utils.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore::lite::pass { // Holds the index of the input tensor index that needs to be inserted a transpose kernel. diff --git a/mindspore/lite/src/runtime/pass/to_nchw_format.h b/mindspore/lite/src/runtime/pass/to_nchw_format.h index 601084db23e..5f0d7043ec6 100644 --- a/mindspore/lite/src/runtime/pass/to_nchw_format.h +++ b/mindspore/lite/src/runtime/pass/to_nchw_format.h @@ -19,7 +19,7 @@ #include #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "src/runtime/pass/runtime_optimizer.h" #include "schema/ops_generated.h" diff --git a/mindspore/lite/src/runtime/pass/transpose_strategy.h b/mindspore/lite/src/runtime/pass/transpose_strategy.h index e7368346f2a..2e487ee05a4 100644 --- a/mindspore/lite/src/runtime/pass/transpose_strategy.h +++ b/mindspore/lite/src/runtime/pass/transpose_strategy.h @@ -19,7 +19,7 @@ #include #include #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "src/runtime/pass/pass_utils.h" namespace mindspore::lite::pass { diff --git a/mindspore/lite/src/runtime/runtime_pass.h b/mindspore/lite/src/runtime/runtime_pass.h index 8fbdf878c6c..246d47de155 100644 --- a/mindspore/lite/src/runtime/runtime_pass.h +++ b/mindspore/lite/src/runtime/runtime_pass.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_SRC_RUNTIME_RUNTIME_PASS_H_ #include -#include "src/kernel_exec.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/sub_graph_kernel.h" #include "schema/ops_generated.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/runtime/runtime_shape_fusion_pass.h b/mindspore/lite/src/runtime/runtime_shape_fusion_pass.h index 11b1729ccb3..851d6651356 100644 --- a/mindspore/lite/src/runtime/runtime_shape_fusion_pass.h +++ b/mindspore/lite/src/runtime/runtime_shape_fusion_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" #include "src/common/tensor_util.h" #include "schema/ops_generated.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/scheduler.cc b/mindspore/lite/src/runtime/scheduler.cc similarity index 99% rename from mindspore/lite/src/scheduler.cc rename to mindspore/lite/src/runtime/scheduler.cc index 7254814943b..9db5a9c7aab 100644 --- a/mindspore/lite/src/scheduler.cc +++ b/mindspore/lite/src/runtime/scheduler.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/scheduler.h" +#include "src/runtime/scheduler.h" #include #include #include @@ -25,33 +25,33 @@ #include "include/errorcode.h" #include "src/common/graph_util.h" #include "src/common/utils.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #ifndef CUSTOM_KERNEL_REGISTRY_CLIP #include "include/registry/register_kernel.h" #endif -#include "src/kernel_exec_util.h" -#include "src/sub_graph_kernel.h" -#include "src/ops/populate/populate_register.h" +#include "src/runtime/kernel_exec_util.h" +#include "src/runtime/sub_graph_kernel.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/version_manager.h" #include "src/common/prim_util.h" -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" #include "src/common/tensor_util.h" #include "src/common/context_util.h" #include "src/runtime/infer_manager.h" #include "src/runtime/runtime_pass.h" #include "src/runtime/pass/runtime_ncx_pass.h" #ifndef AUTO_PARALLEL_CLIP -#include "src/sub_graph_split.h" +#include "src/runtime/sub_graph_split.h" #endif -#include "src/weight_decoder.h" +#include "src/runtime/weight_decoder.h" #include "src/runtime/kernel/cpu/fp16/fp16_op_handler.h" #include "nnacl/nnacl_common.h" #if GPU_OPENCL #include "src/runtime/kernel/opencl/opencl_subgraph.h" -#include "src/runtime/gpu/opencl/opencl_runtime.h" +#include "src/runtime/kernel/gpu/opencl/opencl_runtime.h" #endif #include "include/registry/register_kernel_interface.h" -#include "model_loader/abstract_base_model.h" +#include "extendrt/mindir_loader/abstract_base_model.h" using AbstractBaseModel = mindspore::infer::AbstractBaseModel; diff --git a/mindspore/lite/src/scheduler.h b/mindspore/lite/src/runtime/scheduler.h similarity index 98% rename from mindspore/lite/src/scheduler.h rename to mindspore/lite/src/runtime/scheduler.h index 2858007b131..7ed25466308 100644 --- a/mindspore/lite/src/scheduler.h +++ b/mindspore/lite/src/runtime/scheduler.h @@ -25,10 +25,10 @@ #include #include #include -#include "src/sub_graph_kernel.h" -#include "src/inner_context.h" +#include "src/runtime/sub_graph_kernel.h" +#include "src/runtime/inner_context.h" #include "include/model.h" -#include "src/scheduler_cb.h" +#include "src/runtime/scheduler_cb.h" #include "include/api/delegate.h" #include "src/control_flow/control_flow_scheduler.h" #include "src/runtime/runtime_shape_fusion_pass.h" diff --git a/mindspore/lite/src/scheduler_cb.h b/mindspore/lite/src/runtime/scheduler_cb.h similarity index 100% rename from mindspore/lite/src/scheduler_cb.h rename to mindspore/lite/src/runtime/scheduler_cb.h diff --git a/mindspore/lite/src/schema_tensor_wrapper.cc b/mindspore/lite/src/runtime/schema_tensor_wrapper.cc similarity index 97% rename from mindspore/lite/src/schema_tensor_wrapper.cc rename to mindspore/lite/src/runtime/schema_tensor_wrapper.cc index 1f108e19948..4989caa340d 100644 --- a/mindspore/lite/src/schema_tensor_wrapper.cc +++ b/mindspore/lite/src/runtime/schema_tensor_wrapper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/schema_tensor_wrapper.h" +#include "src/runtime/schema_tensor_wrapper.h" #include "src/common/log_adapter.h" #include "src/common/file_utils.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/src/schema_tensor_wrapper.h b/mindspore/lite/src/runtime/schema_tensor_wrapper.h similarity index 100% rename from mindspore/lite/src/schema_tensor_wrapper.h rename to mindspore/lite/src/runtime/schema_tensor_wrapper.h diff --git a/mindspore/lite/src/sub_graph_kernel.cc b/mindspore/lite/src/runtime/sub_graph_kernel.cc similarity index 99% rename from mindspore/lite/src/sub_graph_kernel.cc rename to mindspore/lite/src/runtime/sub_graph_kernel.cc index 7e26fe2f393..cc0d08d1fee 100644 --- a/mindspore/lite/src/sub_graph_kernel.cc +++ b/mindspore/lite/src/runtime/sub_graph_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/sub_graph_kernel.h" +#include "src/runtime/sub_graph_kernel.h" #include #include #include "src/tensor.h" @@ -27,7 +27,7 @@ #include "src/common/tensor_util.h" #include "src/common/utils.h" #include "src/common/prim_inner.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/kernel_exec_util.h" namespace mindspore::kernel { using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/sub_graph_kernel.h b/mindspore/lite/src/runtime/sub_graph_kernel.h similarity index 98% rename from mindspore/lite/src/sub_graph_kernel.h rename to mindspore/lite/src/runtime/sub_graph_kernel.h index 623f150204f..3df1c36b04b 100644 --- a/mindspore/lite/src/sub_graph_kernel.h +++ b/mindspore/lite/src/runtime/sub_graph_kernel.h @@ -23,11 +23,11 @@ #include #include #include -#include "src/kernel_exec.h" -#include "src/executor.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/executor.h" #include "src/common/log_adapter.h" #include "src/common/version_manager.h" -#include "src/cpu_info.h" +#include "src/runtime/cpu_info.h" #if defined(ENABLE_ARM) && defined(ENABLE_FP16) #include "nnacl/constant_of_shape_parameter.h" #endif diff --git a/mindspore/lite/src/sub_graph_split.cc b/mindspore/lite/src/runtime/sub_graph_split.cc similarity index 99% rename from mindspore/lite/src/sub_graph_split.cc rename to mindspore/lite/src/runtime/sub_graph_split.cc index db754c65629..e9014df8340 100644 --- a/mindspore/lite/src/sub_graph_split.cc +++ b/mindspore/lite/src/runtime/sub_graph_split.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "src/sub_graph_split.h" +#include "src/runtime/sub_graph_split.h" #include #include #include @@ -24,9 +24,9 @@ #include "src/tensor.h" #include "schema/ops_generated.h" #include "schema/model_generated.h" -#include "src/ops/populate/populate_register.h" -#include "src/scheduler.h" -#include "src/tensor_category.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/runtime/scheduler.h" +#include "src/runtime/tensor_category.h" #include "nnacl/pooling_parameter.h" #include "include/model.h" #include "nnacl/base/conv_common_base.h" diff --git a/mindspore/lite/src/sub_graph_split.h b/mindspore/lite/src/runtime/sub_graph_split.h similarity index 97% rename from mindspore/lite/src/sub_graph_split.h rename to mindspore/lite/src/runtime/sub_graph_split.h index 8bb40e3027e..913cef7102e 100644 --- a/mindspore/lite/src/sub_graph_split.h +++ b/mindspore/lite/src/runtime/sub_graph_split.h @@ -23,9 +23,9 @@ #include #include #include "include/model.h" -#include "src/kernel_exec.h" -#include "src/lite_model.h" -#include "src/inner_context.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/lite_model.h" +#include "src/runtime/inner_context.h" #include "src/common/prim_util.h" #include "nnacl/conv_parameter.h" @@ -146,8 +146,8 @@ class SearchSubGraph { std::vector node_list_; DeviceType major_dt_; DeviceType minor_dt_; - size_t major_thread_ = 1; - size_t minor_thread_ = 1; + size_t major_thread_; + size_t minor_thread_; size_t total_cost_ = 0; bool offline_parallel_enable_ = false; }; diff --git a/mindspore/lite/src/tensor_category.cc b/mindspore/lite/src/runtime/tensor_category.cc similarity index 97% rename from mindspore/lite/src/tensor_category.cc rename to mindspore/lite/src/runtime/tensor_category.cc index dc741d6527d..07d14de0dce 100644 --- a/mindspore/lite/src/tensor_category.cc +++ b/mindspore/lite/src/runtime/tensor_category.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "src/common/utils.h" #include "schema/model_generated.h" diff --git a/mindspore/lite/src/tensor_category.h b/mindspore/lite/src/runtime/tensor_category.h similarity index 100% rename from mindspore/lite/src/tensor_category.h rename to mindspore/lite/src/runtime/tensor_category.h diff --git a/mindspore/lite/src/thread_cost_model.cc b/mindspore/lite/src/runtime/thread_cost_model.cc similarity index 98% rename from mindspore/lite/src/thread_cost_model.cc rename to mindspore/lite/src/runtime/thread_cost_model.cc index 41a7524dd9e..4df755afab9 100644 --- a/mindspore/lite/src/thread_cost_model.cc +++ b/mindspore/lite/src/runtime/thread_cost_model.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "src/thread_cost_model.h" +#include "src/runtime/thread_cost_model.h" #include #include "src/common/log_util.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" #include "thread/threadpool.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/thread_cost_model.h b/mindspore/lite/src/runtime/thread_cost_model.h similarity index 100% rename from mindspore/lite/src/thread_cost_model.h rename to mindspore/lite/src/runtime/thread_cost_model.h diff --git a/mindspore/lite/src/weight_decoder.cc b/mindspore/lite/src/runtime/weight_decoder.cc similarity index 99% rename from mindspore/lite/src/weight_decoder.cc rename to mindspore/lite/src/runtime/weight_decoder.cc index 5fb0a358294..1d44997b1ab 100644 --- a/mindspore/lite/src/weight_decoder.cc +++ b/mindspore/lite/src/runtime/weight_decoder.cc @@ -15,8 +15,8 @@ */ #include #include -#include "src/weight_decoder.h" -#include "src/huffman_decode.h" +#include "src/runtime/weight_decoder.h" +#include "src/runtime/huffman_decode.h" #include "tools/converter/quantizer/fse_decoder.h" #include "nnacl/conv_parameter.h" diff --git a/mindspore/lite/src/weight_decoder.h b/mindspore/lite/src/runtime/weight_decoder.h similarity index 99% rename from mindspore/lite/src/weight_decoder.h rename to mindspore/lite/src/runtime/weight_decoder.h index 1c4205f2c07..65b7273333f 100644 --- a/mindspore/lite/src/weight_decoder.h +++ b/mindspore/lite/src/runtime/weight_decoder.h @@ -26,10 +26,10 @@ #include #include "nnacl/matmul_parameter.h" #include "nnacl/gather_parameter.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "src/common/utils.h" #include "src/tensor.h" -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" static constexpr int kPerTensor = 1; static constexpr int kBitNum1 = 1; diff --git a/mindspore/lite/src/tensor.h b/mindspore/lite/src/tensor.h index 36dac63d667..9b620327ef3 100644 --- a/mindspore/lite/src/tensor.h +++ b/mindspore/lite/src/tensor.h @@ -29,7 +29,7 @@ #include "src/runtime/inner_allocator.h" #include "src/common/log_adapter.h" #include "src/common/utils.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/train/loss_kernel.h b/mindspore/lite/src/train/loss_kernel.h index ff3d605a4d7..9bcc6f34ec6 100644 --- a/mindspore/lite/src/train/loss_kernel.h +++ b/mindspore/lite/src/train/loss_kernel.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_SRC_TRAIN_LOSS_KERNEL_H_ #define MINDSPORE_LITE_SRC_TRAIN_LOSS_KERNEL_H_ #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore::kernel { class LossKernel : public LiteKernel { diff --git a/mindspore/lite/src/train/optimizer_kernel.h b/mindspore/lite/src/train/optimizer_kernel.h index af389fd058d..8bbbbc3cffb 100644 --- a/mindspore/lite/src/train/optimizer_kernel.h +++ b/mindspore/lite/src/train/optimizer_kernel.h @@ -21,7 +21,7 @@ #include #include #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "include/ms_tensor.h" #include "include/errorcode.h" using mindspore::lite::RET_ERROR; diff --git a/mindspore/lite/src/train/train_export.cc b/mindspore/lite/src/train/train_export.cc index db65dcd853d..f16b89b1517 100644 --- a/mindspore/lite/src/train/train_export.cc +++ b/mindspore/lite/src/train/train_export.cc @@ -29,7 +29,7 @@ #include "src/common/storage.h" #include "src/train/graph_fusion.h" #include "src/train/graph_dropout.h" -#include "src/weight_decoder.h" +#include "src/runtime/weight_decoder.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/src/train/train_export.h b/mindspore/lite/src/train/train_export.h index 98a3951d554..a690183bc6c 100644 --- a/mindspore/lite/src/train/train_export.h +++ b/mindspore/lite/src/train/train_export.h @@ -23,8 +23,8 @@ #include #include #include "schema/inner/model_generated.h" -#include "src/kernel_exec.h" -#include "src/lite_model.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/lite_model.h" #include "include/train/train_cfg.h" namespace mindspore { diff --git a/mindspore/lite/src/train/train_populate_parameter.cc b/mindspore/lite/src/train/train_populate_parameter.cc index e998086ba85..bda5d0a5d3e 100644 --- a/mindspore/lite/src/train/train_populate_parameter.cc +++ b/mindspore/lite/src/train/train_populate_parameter.cc @@ -15,8 +15,8 @@ */ #include "src/train/train_populate_parameter.h" #include -#include "src/ops/populate/populate_register.h" -#include "src/ops/populate/default_populate.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/populate/default_populate.h" #include "nnacl/strided_slice_parameter.h" #include "nnacl/arithmetic.h" #include "nnacl/conv_parameter.h" diff --git a/mindspore/lite/src/train/train_session.cc b/mindspore/lite/src/train/train_session.cc index 55dcb953ce0..42ee6586be2 100644 --- a/mindspore/lite/src/train/train_session.cc +++ b/mindspore/lite/src/train/train_session.cc @@ -26,10 +26,10 @@ #include #include #include "include/errorcode.h" -#include "src/lite_model.h" -#include "src/kernel_exec_util.h" +#include "src/runtime/lite_model.h" +#include "src/runtime/kernel_exec_util.h" #include "src/tensor.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/common/prim_util.h" #include "src/common/tensor_util.h" #include "src/common/utils.h" diff --git a/mindspore/lite/src/train/train_session.h b/mindspore/lite/src/train/train_session.h index ceb937098f2..f599a4683b3 100644 --- a/mindspore/lite/src/train/train_session.h +++ b/mindspore/lite/src/train/train_session.h @@ -23,7 +23,7 @@ #include #include "include/train/train_cfg.h" #include "include/train/train_session.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" /* Inheritance Diagram diff --git a/mindspore/lite/src/train/train_utils.cc b/mindspore/lite/src/train/train_utils.cc index d09826e207f..e832081e0fb 100644 --- a/mindspore/lite/src/train/train_utils.cc +++ b/mindspore/lite/src/train/train_utils.cc @@ -19,7 +19,7 @@ #include "include/errorcode.h" #include "include/ms_tensor.h" #include "src/common/utils.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #ifdef ENABLE_FP16 #include "src/runtime/kernel/cpu/fp16/fp16_op_handler.h" #endif diff --git a/mindspore/lite/src/train/train_utils.h b/mindspore/lite/src/train/train_utils.h index aad1b8d5c05..772bc40a292 100644 --- a/mindspore/lite/src/train/train_utils.h +++ b/mindspore/lite/src/train/train_utils.h @@ -20,7 +20,7 @@ #include #include "include/ms_tensor.h" #include "src/tensor.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" namespace mindspore { namespace kernel { diff --git a/mindspore/lite/src/train/transfer_session.cc b/mindspore/lite/src/train/transfer_session.cc index 5e355155a18..130e76ea65a 100644 --- a/mindspore/lite/src/train/transfer_session.cc +++ b/mindspore/lite/src/train/transfer_session.cc @@ -29,7 +29,7 @@ #include "src/train/loss_kernel.h" #include "src/train/optimizer_kernel.h" #include "src/train/train_populate_parameter.h" -#include "src/executor.h" +#include "src/runtime/executor.h" #include "src/train/train_export.h" #include "src/train/train_utils.h" diff --git a/mindspore/lite/src/train/transfer_session.h b/mindspore/lite/src/train/transfer_session.h index ab30d539944..25f7058285d 100644 --- a/mindspore/lite/src/train/transfer_session.h +++ b/mindspore/lite/src/train/transfer_session.h @@ -20,7 +20,7 @@ #include #include #include -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "src/train/train_session.h" /* diff --git a/mindspore/lite/test/CMakeLists.txt b/mindspore/lite/test/CMakeLists.txt index e43768632b8..58547df8806 100644 --- a/mindspore/lite/test/CMakeLists.txt +++ b/mindspore/lite/test/CMakeLists.txt @@ -74,7 +74,7 @@ if(MSLITE_GPU_BACKEND STREQUAL cuda) include_directories(${CCSRC_DIR}/plugin/device/gpu/kernel) include_directories(${CUDA_PATH}) file(GLOB_RECURSE TEST_GPU_UT_SRC - ${TEST_DIR}/ut/src/runtime/kernel/cuda/*.cc + ${TEST_DIR}/ut/src/extendrt/kernel/cuda/*.cc ) list(APPEND TEST_UT_SRC ${TEST_GPU_UT_SRC}) endif() @@ -202,7 +202,7 @@ if(MSLITE_ENABLE_CONVERTER AND (NOT MSLITE_ENABLE_RUNTIME_CONVERT)) cpu_ops_mid nnacl_mid cpu_kernel_mid - anf_exporter_mid + lite_exporter_mid mslite_converter_plugin graph_pass_mid fusion_mid diff --git a/mindspore/lite/test/common/common_test.h b/mindspore/lite/test/common/common_test.h index 819dcd276b0..54eba2dde59 100644 --- a/mindspore/lite/test/common/common_test.h +++ b/mindspore/lite/test/common/common_test.h @@ -24,7 +24,7 @@ #include #include "gtest/gtest.h" #include "include/api/format.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/test/st/graph_test.cc b/mindspore/lite/test/st/graph_test.cc index 6822f8c3a65..c0ae479dfea 100644 --- a/mindspore/lite/test/st/graph_test.cc +++ b/mindspore/lite/test/st/graph_test.cc @@ -18,8 +18,8 @@ #include "gtest/gtest.h" #include "common/common_test.h" #include "include/errorcode.h" -#include "src/lite_session.h" -#include "src/kernel_exec.h" +#include "src/runtime/lite_session.h" +#include "src/runtime/kernel_exec.h" #include "src/common/file_utils.h" #include "include/api/types.h" #include "include/api/graph.h" diff --git a/mindspore/lite/test/st/mindrt_parallel_runtime_test.cc b/mindspore/lite/test/st/mindrt_parallel_runtime_test.cc index e4588d1b808..4de6cf50372 100644 --- a/mindspore/lite/test/st/mindrt_parallel_runtime_test.cc +++ b/mindspore/lite/test/st/mindrt_parallel_runtime_test.cc @@ -16,9 +16,9 @@ #include "ut/src/runtime/kernel/opencl/common.h" #include "include/errorcode.h" -#include "src/mindrt_executor.h" -#include "src/lite_session.h" -#include "src/kernel_exec.h" +#include "src/runtime/mindrt_executor.h" +#include "src/runtime/lite_session.h" +#include "src/runtime/kernel_exec.h" class MindrtRuntimeTest : public mindspore::CommonTest { public: diff --git a/mindspore/lite/test/st/mindrt_parallel_test.cc b/mindspore/lite/test/st/mindrt_parallel_test.cc index 7b472849b6f..06aa0613a2c 100644 --- a/mindspore/lite/test/st/mindrt_parallel_test.cc +++ b/mindspore/lite/test/st/mindrt_parallel_test.cc @@ -20,9 +20,9 @@ #include "include/errorcode.h" #include "tools/converter/converter.h" #include "tools/benchmark/run_benchmark.h" -#include "src/mindrt_executor.h" -#include "src/lite_session.h" -#include "src/kernel_exec.h" +#include "src/runtime/mindrt_executor.h" +#include "src/runtime/lite_session.h" +#include "src/runtime/kernel_exec.h" #include "src/common/file_utils.h" namespace mindspore { diff --git a/mindspore/lite/test/st/mix_data_type_test.cc b/mindspore/lite/test/st/mix_data_type_test.cc index f99dfb60dc7..9e3a337f31a 100644 --- a/mindspore/lite/test/st/mix_data_type_test.cc +++ b/mindspore/lite/test/st/mix_data_type_test.cc @@ -19,10 +19,10 @@ #include "include/errorcode.h" #include "src/common/config_file.h" #include "schema/inner/model_generated.h" -#include "src/kernel_exec.h" -#include "src/lite_session.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/lite_session.h" #include "include/api/model.h" -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/model/model_impl.h" namespace mindspore { class MixDataTypeTest : public mindspore::CommonTest { diff --git a/mindspore/lite/test/st/multiple_device_test.cc b/mindspore/lite/test/st/multiple_device_test.cc index 40357d00a28..27c2d20e2dc 100644 --- a/mindspore/lite/test/st/multiple_device_test.cc +++ b/mindspore/lite/test/st/multiple_device_test.cc @@ -16,15 +16,15 @@ #include "common/common_test.h" #include "schema/inner/model_generated.h" -#include "src/lite_session.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/lite_session.h" +#include "src/runtime/sub_graph_kernel.h" #include "ir/dtype/type_id.h" #include "include/version.h" #include "include/model.h" #include "include/api/model.h" -#include "src/cxx_api/converters.h" -#include "src/cxx_api/model/model_impl.h" +#include "src/runtime/cxx_api/converters.h" +#include "src/runtime/cxx_api/model/model_impl.h" using mindspore::kernel::KernelExec; using mindspore::kernel::KernelKey; diff --git a/mindspore/lite/test/st/optimize_allocator_test.cc b/mindspore/lite/test/st/optimize_allocator_test.cc index 11aad971b77..e4908ef9823 100644 --- a/mindspore/lite/test/st/optimize_allocator_test.cc +++ b/mindspore/lite/test/st/optimize_allocator_test.cc @@ -17,12 +17,12 @@ #include "common/common_test.h" #include "gmock/gmock.h" #include "schema/inner/model_generated.h" -#include "src/sub_graph_kernel.h" +#include "src/runtime/sub_graph_kernel.h" #include "ir/dtype/type_id.h" #include "include/version.h" #include "include/model.h" #include "include/lite_session.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/test/st/sub_graph_test.cc b/mindspore/lite/test/st/sub_graph_test.cc index f2e6694f022..b744c2c8e36 100644 --- a/mindspore/lite/test/st/sub_graph_test.cc +++ b/mindspore/lite/test/st/sub_graph_test.cc @@ -25,7 +25,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "src/common/file_utils.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "tools/common/meta_graph_serializer.h" #include "include/version.h" diff --git a/mindspore/lite/test/ut/src/graph_test.cc b/mindspore/lite/test/ut/src/graph_test.cc index 3a3b75f978c..973defb80b1 100644 --- a/mindspore/lite/test/ut/src/graph_test.cc +++ b/mindspore/lite/test/ut/src/graph_test.cc @@ -24,7 +24,7 @@ #include "common/common_test.h" #include "src/common/log_adapter.h" #include "mindspore/lite/include/lite_session.h" -#include "mindspore/lite/src/executor.h" +#include "mindspore/lite/src/runtime/executor.h" #include "mindspore/lite/schema/inner/anf_ir_generated.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/infer_test.cc b/mindspore/lite/test/ut/src/infer_test.cc index 66fa44f771c..81a3398fd94 100644 --- a/mindspore/lite/test/ut/src/infer_test.cc +++ b/mindspore/lite/test/ut/src/infer_test.cc @@ -23,7 +23,7 @@ #include "include/context.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "src/common/file_utils.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/lite_mindrt_test.cc b/mindspore/lite/test/ut/src/lite_mindrt_test.cc index da47bf812ba..35db3536402 100644 --- a/mindspore/lite/test/ut/src/lite_mindrt_test.cc +++ b/mindspore/lite/test/ut/src/lite_mindrt_test.cc @@ -18,7 +18,7 @@ #include "actor/op_actor.h" #include "async/uuid_base.h" #include "async/future.h" -#include "src/lite_mindrt.h" +#include "src/runtime/lite_mindrt.h" #include "thread/hqueue.h" #include "thread/actor_threadpool.h" #include "common/common_test.h" diff --git a/mindspore/lite/test/ut/src/registry/registry_custom_op_test.cc b/mindspore/lite/test/ut/src/registry/registry_custom_op_test.cc index 7f21477d344..e8499d2b8b5 100644 --- a/mindspore/lite/test/ut/src/registry/registry_custom_op_test.cc +++ b/mindspore/lite/test/ut/src/registry/registry_custom_op_test.cc @@ -24,7 +24,7 @@ #include "include/context.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "include/registry/register_kernel_interface.h" #include "include/registry/register_kernel.h" diff --git a/mindspore/lite/test/ut/src/registry/registry_gpu_custom_op_test.cc b/mindspore/lite/test/ut/src/registry/registry_gpu_custom_op_test.cc index 5b4d985f459..a44d0d5b98d 100644 --- a/mindspore/lite/test/ut/src/registry/registry_gpu_custom_op_test.cc +++ b/mindspore/lite/test/ut/src/registry/registry_gpu_custom_op_test.cc @@ -24,7 +24,7 @@ #include "include/context.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "include/registry/register_kernel_interface.h" #include "include/registry/register_kernel.h" #include "include/registry/opencl_runtime_wrapper.h" diff --git a/mindspore/lite/test/ut/src/registry/registry_test.cc b/mindspore/lite/test/ut/src/registry/registry_test.cc index 147ceea34e1..57c955d0b32 100644 --- a/mindspore/lite/test/ut/src/registry/registry_test.cc +++ b/mindspore/lite/test/ut/src/registry/registry_test.cc @@ -23,7 +23,7 @@ #include "include/context.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "src/runtime/inner_allocator.h" #include "include/registry/register_kernel_interface.h" #include "include/registry/register_kernel.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc index 5265530d9c1..a09cab0d483 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/common/strided_slice_tests.cc @@ -17,7 +17,7 @@ #include #include "common/common_test.h" #include "nnacl/fp32/strided_slice_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "nnacl/strided_slice_parameter.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/reduce_fp16_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/reduce_fp16_tests.cc index c99b21e00df..7f8421ef2b0 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/reduce_fp16_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp16/reduce_fp16_tests.cc @@ -16,7 +16,7 @@ #include #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp16/reduce_fp16.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32-sparsity/matmul_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32-sparsity/matmul_fp32_tests.cc index fbdfc5836b2..29cb5d117cb 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32-sparsity/matmul_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32-sparsity/matmul_fp32_tests.cc @@ -23,7 +23,7 @@ #include "src/tensor.h" #include "securec/include/securec.h" #include "src/runtime/infer_manager.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" #include "src/runtime/kernel/cpu/fp32/matmul_fp32.h" #include "src/runtime/kernel/cpu/fp32_sparse/matmul_sparse_fp32.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 10eda45b205..dc326298413 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 @@ -17,8 +17,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/fp32/activation_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/batchnorm_fp32_tests.cc index 9c0c663ffa2..e448db0839b 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 @@ -17,8 +17,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/fp32/batchnorm_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { class TestBatchnormFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/constant_of_shape_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/constant_of_shape_fp32_test.cc index 5b08d5defde..848d507ca57 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/constant_of_shape_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/constant_of_shape_fp32_test.cc @@ -16,8 +16,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/base/constant_of_shape.h" -#include "src/tensor_category.h" -#include "src/kernel_exec.h" +#include "src/runtime/tensor_category.h" +#include "src/runtime/kernel_exec.h" namespace mindspore { class TestConstantOfShapeFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32_tests.cc index 31229b5d1ad..47107267d62 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/convolution_depthwise_fp32_tests.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "mindspore/lite/src/runtime/kernel/cpu/base/convolution_base.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestConvolutionDwFp32 : public mindspore::CommonTest { 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 731725bf39f..690f27b57ca 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 @@ -15,7 +15,7 @@ */ #include "common/common_test.h" #include "nnacl/fp32/crop_fp32.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/crop_fp32.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/cumsum_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/cumsum_tests.cc index bbc610926c0..3de21c6df49 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/cumsum_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/cumsum_tests.cc @@ -17,7 +17,7 @@ #include #include "common/common_test.h" #include "nnacl/cumsum_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestCumsum : public mindspore::CommonTest { 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 fbb4f948b59..78809c83dc5 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 @@ -21,7 +21,7 @@ #include "mindspore/lite/src/runtime/kernel/cpu/fp32/deconvolution_fp32.h" #include "nnacl/fp32/deconv_fp32.h" #include "nnacl/op_base.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" namespace mindspore { class TestDeConvolutionFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/detection_post_process_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/detection_post_process_test.cc index ef2971ff896..643fc8b8104 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/detection_post_process_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/detection_post_process_test.cc @@ -17,8 +17,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/detection_post_process_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" #include "src/common/file_utils.h" namespace mindspore { 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 204a128e1a0..d9000212e10 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 @@ -20,7 +20,7 @@ #include "src/common/file_utils.h" #include "common/common_test.h" #include "src/common/log_adapter.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" namespace mindspore { using mindspore::lite::Tensor; 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 8426401ae92..f4e195ddd7b 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 @@ -19,11 +19,11 @@ #include "common/common_test.h" #include "nnacl/fp32/matmul_fp32.h" #include "src/common/file_utils.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "src/common/log_adapter.h" #include "src/runtime/kernel/cpu/fp32/fullconnection_fp32.h" #include "src/runtime/infer_manager.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { using mindspore::lite::Tensor; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/l2norm_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/l2norm_fp32_test.cc index 2df82b020c7..148a0fb36b7 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/l2norm_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/l2norm_fp32_test.cc @@ -16,8 +16,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/l2_norm_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" namespace mindspore { class TestL2NormFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/logicalor_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/logicalor_fp32_test.cc index 346eb24ae7f..862c2d6335f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/logicalor_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/logicalor_fp32_test.cc @@ -17,8 +17,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/fp32/arithmetic_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lsh_projection_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lsh_projection_fp32_tests.cc index e0e2f321a3e..d11ce64bd50 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lsh_projection_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/lsh_projection_fp32_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/lsh_projection_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { 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 d6b8e3dc4e3..4561ad3d3d6 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 @@ -18,7 +18,7 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/fp32/lstm_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class LstmFp32 : public mindspore::CommonTest { 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 17c1e746322..a5a03cc4139 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 @@ -19,9 +19,9 @@ #include "mindspore/lite/src/runtime/kernel/cpu/fp32/matmul_fp32.h" #include "nnacl/fp32/pack_fp32.h" #include "nnacl/fp32/matmul_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" -#include "src/tensor_category.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/tensor_category.h" namespace mindspore { class TestMatMulFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/nllloss_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/nllloss_fp32_test.cc index 486be658489..48fadc1369e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/nllloss_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/nllloss_fp32_test.cc @@ -17,9 +17,9 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/nllloss_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" -#include "src/tensor_category.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/tensor_category.h" namespace mindspore { class TestNLLLossFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/non_max_suppression_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/non_max_suppression_fp32_tests.cc index f493ea6cb7f..552ba8a9e49 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/non_max_suppression_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/non_max_suppression_fp32_tests.cc @@ -17,8 +17,8 @@ #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/l2_norm_fp32.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/non_max_suppression_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" namespace mindspore { class TestNMSFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/one_hot_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/one_hot_fp32_test.cc index a1a4bfe7b00..77515841432 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/one_hot_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/one_hot_fp32_test.cc @@ -14,11 +14,11 @@ * limitations under the License. */ #include -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" #include "common/common_test.h" #include "nnacl/fp32/one_hot_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "schema/ops_generated.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/pad_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/pad_fp32_test.cc index fcc690bdd60..ff9da8f1ad2 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/pad_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/pad_fp32_test.cc @@ -14,11 +14,11 @@ * limitations under the License. */ #include -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" #include "common/common_test.h" #include "nnacl/pad_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "schema/ops_generated.h" using mindspore::schema::PaddingMode; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/power_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/power_fp32_tests.cc index 76ef59601b2..e7231aa85c4 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/power_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/power_fp32_tests.cc @@ -16,9 +16,9 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/power_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" -#include "src/tensor_category.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/tensor_category.h" namespace mindspore { class TestPowerFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/ragged_range_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/ragged_range_fp32_tests.cc index 20144585fbc..9473d71b841 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/ragged_range_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/ragged_range_fp32_tests.cc @@ -18,8 +18,8 @@ #include "common/common_test.h" #include "nnacl/fp32/ragged_range_fp32.h" #include "src/tensor.h" -#include "src/kernel_exec.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { class TestRaggedRangeFp32 : public mindspore::CommonTest { 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 0772c5f0be8..0bff61704b7 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 @@ -19,7 +19,7 @@ #include "nnacl/fp32/reduce_fp32.h" #include "schema/inner/model_generated.h" #include "src/tensor.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/src/runtime/inner_allocator.h" using mindspore::lite::Tensor; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_bilinear_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_bilinear_fp32_tests.cc index eacc92701b8..78ed347714e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_bilinear_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_bilinear_fp32_tests.cc @@ -15,8 +15,8 @@ */ #include #include "common/common_test.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" #include "nnacl/resize_parameter.h" #include "schema/ops_generated.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_nearest_neighbor_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_nearest_neighbor_fp32_tests.cc index e9ab6d6141d..f6126d4fa2b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_nearest_neighbor_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/resize_nearest_neighbor_fp32_tests.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" #include "nnacl/resize_parameter.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc index 8dd31ba76eb..2ad66867a9f 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/reverse_sequence_fp32_tests.cc @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "nnacl/fp32/reverse_sequence_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestReverseSequenceFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/roi_pooling_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/roi_pooling_fp32_tests.cc index 35c0033d36e..c3dc6376941 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/roi_pooling_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/roi_pooling_fp32_tests.cc @@ -16,8 +16,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32/roi_pooling_fp32.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" namespace mindspore { class TestROIPoolingFp32 : public mindspore::CommonTest { 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 b587904f3ba..c7d7e659a1f 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 @@ -14,11 +14,11 @@ * limitations under the License. */ #include -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" #include "common/common_test.h" #include "nnacl/pad_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "schema/ops_generated.h" #include "nnacl/fp32/scale_fp32.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scatter_nd_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scatter_nd_fp32_tests.cc index da577037bdf..0ed60764e76 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scatter_nd_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/scatter_nd_fp32_tests.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common_test.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/base/scatter_nd_base.h" namespace mindspore { 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 7a7a29de92e..0cd19669c84 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 @@ -18,7 +18,7 @@ #include "src/runtime/kernel/cpu/string/skip_gram.h" #include "nnacl/skip_gram_parameter.h" #include "src/common/file_utils.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "common/common_test.h" #include "src/common/log_adapter.h" #include "src/common/string_utils.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/softmax_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/softmax_tests.cc index f67200bbfc3..23555c678c7 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/softmax_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/softmax_tests.cc @@ -17,7 +17,7 @@ #include #include "common/common_test.h" #include "nnacl/softmax_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestSoftmaxFp32 : public mindspore::CommonTest { 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 64b9814dcb3..4784121a82a 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 @@ -18,8 +18,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/fp32/space_to_batch_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { 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 671f8e5faec..8166a218824 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 @@ -20,8 +20,8 @@ #include "common/common_test.h" #include "nnacl/space_to_depth_parameter.h" #include "nnacl/base/space_to_depth_base.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { 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 cc896f2dc16..490fddffa46 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 @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/fp32/sparse_to_dense_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strided_slice_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strided_slice_fp32_tests.cc index 53275ff6d61..d795bcc8837 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strided_slice_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/strided_slice_fp32_tests.cc @@ -20,8 +20,8 @@ #include "common/common_test.h" #include "mindspore/lite/src/common/utils.h" #include "nnacl/fp32/strided_slice_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { class TestStridedSliceFp32 : 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 965d03f9aa8..6ad813e37cb 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 "common/common_test.h" #include "nnacl/base/tile_base.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestTileFp32 : public mindspore::CommonTest { 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 12bf9225ef2..76b2022eb15 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 @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "nnacl/fp32/topk_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestTopKFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc index 864d06ac03e..6f6e1bf436b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/transpose_fp32_tests.cc @@ -20,8 +20,8 @@ #include "common/common_test.h" #include "nnacl/fp32/transpose_fp32.h" #include "nnacl/transpose.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/uniform_real_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/uniform_real_fp32_test.cc index bcff8e861f5..ff406ef0853 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/uniform_real_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/uniform_real_fp32_test.cc @@ -17,7 +17,7 @@ #include #include "common/common_test.h" #include "nnacl/random_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestUniformRealFp32 : public mindspore::CommonTest { 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 d43c2b5bb6a..423c07db987 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 @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "nnacl/fp32/unique_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestUniqueFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc index 5c83f17a06f..e45fc2963da 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32/unstack_fp32_tests.cc @@ -18,7 +18,7 @@ #include #include "common/common_test.h" #include "nnacl/base/unstack_base.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestUnstackFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/activation_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/activation_grad_fp32_tests.cc index 29533c29df5..d549e39487a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/activation_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/activation_grad_fp32_tests.cc @@ -21,9 +21,9 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/src/tensor.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32_grad/activation_grad.h" #include "nnacl/fp32_grad/activation_grad.h" 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 35ca484cefd..13412d20b33 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 @@ -23,7 +23,7 @@ #include "src/common/file_utils.h" #include "nnacl/fp32/reduce_fp32.h" #include "src/runtime/kernel/cpu/fp32_grad/arithmetic_grad.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bias_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bias_grad_fp32_tests.cc index a0f2a9a2aa2..cff79ab059d 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bias_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/bias_grad_fp32_tests.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "src/runtime/kernel/cpu/fp32_grad/bias_grad.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { 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 5dfa17303f3..381576e9635 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 @@ -21,7 +21,7 @@ #include "src/runtime/kernel/cpu/fp32_grad/bn_grad.h" #include "nnacl/fp32_grad/batch_norm.h" #include "nnacl/fp32/batchnorm_fp32.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc index eca48c49700..8127b339ca1 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/convolution_grad_fp32_tests.cc @@ -24,7 +24,7 @@ #include "mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_filter.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32_grad/convolution_grad_input.h" #include "nnacl/conv_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestConvolutionGradFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/deconvolution_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/deconvolution_grad_fp32_tests.cc index f232f3dcd85..25c01c242b9 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/deconvolution_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/deconvolution_grad_fp32_tests.cc @@ -21,7 +21,7 @@ #include "src/common/file_utils.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32_grad/deconvolution_grad_filter.h" #include "nnacl/conv_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestDeConvolutionGradFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/network_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/network_test.cc index 89ddbb52b43..b3a8bb1bb5e 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/network_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/network_test.cc @@ -31,7 +31,7 @@ #include "include/train/train_session.h" #include "src/common/log_adapter.h" #include "src/common/file_utils.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/cpu/fp32_grad/convolution.h" using mindspore::lite::RET_OK; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/nllloss_grad_fp32_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/nllloss_grad_fp32_test.cc index fbc947de753..214b6db4e84 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/nllloss_grad_fp32_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/nllloss_grad_fp32_test.cc @@ -17,9 +17,9 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32_grad/nllloss_grad.h" -#include "src/kernel_registry.h" -#include "src/kernel_exec.h" -#include "src/tensor_category.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/tensor_category.h" namespace mindspore { class TestNLLLossGradFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc index 9a1a7ee9174..71be15826bc 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/pooling_grad_fp32_tests.cc @@ -23,7 +23,7 @@ #include "src/common/file_utils.h" #include "nnacl/fp32_grad/pooling_grad.h" #include "src/runtime/kernel/cpu/fp32_grad/pooling_grad.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestPoolingGradFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_crossentropy_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_crossentropy_fp32_tests.cc index fcb38e7278d..87086421331 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_crossentropy_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_crossentropy_fp32_tests.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "src/common/file_utils.h" #include "src/runtime/kernel/cpu/fp32_grad/sparse_softmax_cross_entropy_with_logits.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_grad_fp32_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_grad_fp32_tests.cc index 64cb4ea6a2d..a51253e2d0d 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_grad_fp32_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/fp32_grad/softmax_grad_fp32_tests.cc @@ -24,7 +24,7 @@ #include "src/common/file_utils.h" #include "mindspore/lite/src/runtime/kernel/cpu/fp32_grad/softmax_grad.h" #include "nnacl/fp32_grad/softmax_grad.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestSoftmaxGradFp32 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/add_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/add_int8_tests.cc index 581342fedee..79def370f78 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/add_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/add_int8_tests.cc @@ -18,7 +18,7 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc index 9454ddbc397..17b35a59396 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/arithmetic_self_int8_tests.cc @@ -18,8 +18,8 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "nnacl/arithmetic_self_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc index 07cb2fd3a08..a4e103be197 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/batchnorm_int8_test.cc @@ -19,8 +19,8 @@ #include "common/common_test.h" #include "nnacl/batchnorm_parameter.h" #include "nnacl/int8/batchnorm_int8.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { class TestBatchnormInt8 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc index c5c87015aab..9bf5114b693 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/concat_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/concat_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/conv_1x1_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/conv_1x1_int8_tests.cc index 84f54abe18a..22db6e64d74 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/conv_1x1_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/conv_1x1_int8_tests.cc @@ -15,12 +15,12 @@ */ #include "src/common/log_adapter.h" #include "common/common_test.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "src/common/file_utils.h" #include "nnacl/int8/quantize.h" #include "nnacl/common_func.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/convolution_1x1_int8.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" namespace mindspore { using lite::Tensor; diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc index b407d12ce3e..16b7553852b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/crop_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/crop_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.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 6e21a77b9d7..056bbe0b0ec 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/deconv_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/deconv_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "src/common/file_utils.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "nnacl/pack.h" #include "nnacl/fp32/matmul_fp32.h" #include "nnacl/int8/deconv_int8.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc index 902ca631c01..896667d04c7 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/fullconnection_int8_tests.cc @@ -19,8 +19,8 @@ #include "mindspore/lite/src/runtime/kernel/cpu/int8/fullconnection_int8.h" #include "nnacl/common_func.h" #include "nnacl/int8/quantize.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { using lite::Tensor; 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 fbcb7783ad4..c5292d6589c 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 @@ -18,8 +18,8 @@ #include "common/common_test.h" #include "nnacl/fp32/gatherNd_fp32.h" #include "nnacl/int8/gatherNd_int8.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { class TestGatherNdInt8 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gather_int8_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gather_int8_test.cc index 3091672016c..2df6c4f7404 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gather_int8_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/gather_int8_test.cc @@ -18,8 +18,8 @@ #include "common/common_test.h" #include "nnacl/gather_parameter.h" #include "nnacl/int8/gather_int8.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { class TestGatherInt8 : public mindspore::CommonTest { 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 c52508211a8..1b648266fc3 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 @@ -21,7 +21,7 @@ #include "mindspore/lite/src/runtime/kernel/cpu/fp32/activation_fp32.h" #include "nnacl/fp32/activation_fp32.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/hswish_int8.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/l2_norm_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/l2_norm_int8_tests.cc index 989d8f99170..1ddcecc00f6 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/l2_norm_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/l2_norm_int8_tests.cc @@ -17,7 +17,7 @@ #include #include "schema/inner/model_generated.h" #include "common/common_test.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.h" #include "nnacl/l2_norm_parameter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc index a4919f77eed..f7bbfa715ab 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/matmul_int8_tests.cc @@ -21,8 +21,8 @@ #include "nnacl/int8/quantize.h" #include "nnacl/common_func.h" #include "nnacl/int8/matmul_int8.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { class TestMatmulInt8 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc index bc9a9320f14..010bb8b6c9b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/mul_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/mul_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc index a4912f466d9..d566e3cdfec 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/pad_int8_tests.cc @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "include/context.h" #include "src/tensor.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "common/common_test.h" #include "src/common/file_utils.h" #include "nnacl/pad_parameter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc index 87c5ca4aacc..ccefb0e8a84 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/power_int8_tests.cc @@ -20,7 +20,7 @@ #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/power_int8.h" #include "nnacl/power_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc index 58479206dcc..f44b1a77de2 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/prelu_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/int8/quantize.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc index 79ddf4635f3..7106c2ca861 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/quant_dtype_cast_tests.cc @@ -20,8 +20,8 @@ #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/base/quant_dtype_cast.h" #include "nnacl/int8/quant_dtype_cast_int8.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" namespace mindspore { 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 2debf2cfbee..a5ce9905b97 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 @@ -18,7 +18,7 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "src/tensor.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "nnacl/fp32/reduce_fp32.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/relux_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/relux_int8_tests.cc index aabb962219a..cd00f2120fb 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/relux_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/relux_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/relux_int8.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc index a0a82653897..df339b323ac 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/reshape_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/reshape_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_bilinear_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_bilinear_int8_tests.cc index ee3a6cf7b11..7953dd81748 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_bilinear_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_bilinear_int8_tests.cc @@ -19,7 +19,7 @@ #include "include/context.h" #include "src/tensor.h" #include "common/common_test.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/int8/resize_int8.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_nearest_neighbor_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_nearest_neighbor_int8_tests.cc index 311c5ff8606..052e677b076 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_nearest_neighbor_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/resize_nearest_neighbor_int8_tests.cc @@ -19,7 +19,7 @@ #include "include/context.h" #include "src/tensor.h" #include "common/common_test.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "nnacl/int8/resize_int8.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/scale_int8.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/scale_int8.cc index 11608057b53..d3efdaad89b 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/scale_int8.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/scale_int8.cc @@ -18,7 +18,7 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "src/tensor.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "nnacl/int8/scale_int8.h" namespace mindspore { 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 acad26a5e16..2a26213834c 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 @@ -18,7 +18,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "nnacl/fp32/activation_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/slice_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/slice_int8_tests.cc index a03d8553f30..5b69eac638a 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/slice_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/slice_int8_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/slice_int8.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc index 6948610ca8c..d2ef3a70f75 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/softmax_int8_tests.cc @@ -20,7 +20,7 @@ #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/softmax_int8.h" #include "nnacl/softmax_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { 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 3b57e592d65..78b7abb8b50 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 @@ -16,7 +16,7 @@ #include #include "common/common_test.h" #include "nnacl/fp32/space_to_batch_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class SpaceToBatchTestInt8 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc index eb0f0281cee..afae7e49a92 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/split_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/split_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc index bc95d6a81d3..b9bfbb0de14 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/squeeze_int8_tests.cc @@ -19,8 +19,8 @@ #include "src/common/log_adapter.h" #include "common/common_test.h" #include "nnacl/squeeze_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sub_int_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sub_int_tests.cc index af025d98a16..2629bbcff02 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sub_int_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/sub_int_tests.cc @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "mindspore/lite/src/runtime/kernel/cpu/int8/sub_int8.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "mindspore/lite/include/context.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 25edbe30edd..094ec504955 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 @@ -19,7 +19,7 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "nnacl/fp32/topk_fp32.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" namespace mindspore { class TestTopKInt8 : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc index 64fffb5da70..51bb50a502d 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/arm/int8/unsqueeze_int8_tests.cc @@ -18,8 +18,8 @@ #include "schema/inner/model_generated.h" #include "common/common_test.h" #include "nnacl/unsqueeze_parameter.h" -#include "mindspore/lite/src/kernel_registry.h" -#include "mindspore/lite/src/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" #include "mindspore/lite/src/tensor.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 7c73157166d..54d5b2a0de5 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 @@ -17,7 +17,7 @@ #include #include "src/runtime/kernel/cpu/string/skip_gram.h" #include "src/runtime/kernel/cpu/string/normalize.h" -#include "mindspore/lite/src/kernel_registry.h" +#include "mindspore/lite/src/runtime/kernel_registry.h" #include "nnacl/skip_gram_parameter.h" #include "src/common/file_utils.h" #include "common/common_test.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/cuda/batchtospace_tests.cc b/mindspore/lite/test/ut/src/runtime/kernel/cuda/batchtospace_tests.cc index 18e7c5f325c..8e93db1f4a6 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/cuda/batchtospace_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/cuda/batchtospace_tests.cc @@ -16,8 +16,8 @@ #include "common/common_test.h" #include "schema/ops_generated.h" -#include "src/runtime/kernel/cuda/batchtospace.h" -#include "ut/src/runtime/kernel/cuda/common.h" +#include "src/extendrt/kernel/cuda/batchtospace.h" +#include "ut/src/extendrt/kernel/cuda/common.h" #include "nnacl/batch_to_space.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.cc b/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.cc index 55e071aa840..56e565acea8 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.cc @@ -16,7 +16,7 @@ #include #include #include "ut/src/runtime/kernel/opencl/common.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/kernel/opencl/opencl_subgraph.h" #include "nnacl/conv_parameter.h" diff --git a/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h b/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h index 1c8a3dbcd30..74e19161e45 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h +++ b/mindspore/lite/test/ut/src/runtime/kernel/opencl/common.h @@ -26,7 +26,7 @@ #include "nnacl/op_base.h" #include "ir/dtype/type_id.h" #include "src/tensor.h" -#include "src/tensor_category.h" +#include "src/runtime/tensor_category.h" #include "src/common/file_utils.h" #include "common/common_test.h" #include "schema/ops_generated.h" diff --git a/mindspore/lite/test/ut/src/runtime/runtime_pass_tests.cc b/mindspore/lite/test/ut/src/runtime/runtime_pass_tests.cc index 80b54ee44ae..7e8c7a93f77 100644 --- a/mindspore/lite/test/ut/src/runtime/runtime_pass_tests.cc +++ b/mindspore/lite/test/ut/src/runtime/runtime_pass_tests.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include "common/common_test.h" -#include "src/kernel_exec.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/kernel_registry.h" #include "src/runtime/runtime_pass.h" #include "nnacl/conv_parameter.h" diff --git a/mindspore/lite/test/ut/src/scheduler_test.cc b/mindspore/lite/test/ut/src/scheduler_test.cc index dd9c5923bc9..bf10a9bd132 100644 --- a/mindspore/lite/test/ut/src/scheduler_test.cc +++ b/mindspore/lite/test/ut/src/scheduler_test.cc @@ -16,7 +16,7 @@ #include "common/common_test.h" #include "schema/inner/model_generated.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "ir/dtype/type_id.h" #include "include/version.h" diff --git a/mindspore/lite/test/ut/src/utils_test.cc b/mindspore/lite/test/ut/src/utils_test.cc index f0d82a247a2..8e472f920a6 100644 --- a/mindspore/lite/test/ut/src/utils_test.cc +++ b/mindspore/lite/test/ut/src/utils_test.cc @@ -23,8 +23,8 @@ #include "include/context.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" -#include "mindspore/lite/src/kernel_exec.h" -#include "mindspore/lite/src/kernel_exec_util.h" +#include "mindspore/lite/src/runtime/kernel_exec.h" +#include "mindspore/lite/src/runtime/kernel_exec_util.h" namespace mindspore { class UtilsTest : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/activation_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/activation_fusion_test.cc index a6cf820ba4b..b8904c6d5d9 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/activation_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/activation_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/add_concat_act_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/add_concat_act_fusion_test.cc index 5f889a02273..e09685d61da 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/add_concat_act_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/add_concat_act_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "tools/optimizer/common/gllo_utils.h" #include "test/common/import_from_meta_graphT.h" diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/constant_folding_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/constant_folding_fusion_test.cc index 31684f2bcc3..07790c39d87 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/constant_folding_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/constant_folding_fusion_test.cc @@ -25,7 +25,7 @@ #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" #include "tools/optimizer/const_fold/constant_folding_fusion.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc index bcd7bfec63e..59d396cc786 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_activation_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc index b7bfcb896e2..522ea594478 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_biasadd_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc index 9a0ef2cdf35..7d1fcdd33e7 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_bn_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc index b4235adcd46..4ebb1506024 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/conv_scale_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/matmul_mul_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/matmul_mul_fusion_test.cc index b1b2a2aa3d9..d968b4d6a77 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/matmul_mul_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/matmul_mul_fusion_test.cc @@ -24,7 +24,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/trans_matmul_fusion_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/trans_matmul_fusion_test.cc index 7cb5ada7c7a..ac8cc629b53 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/trans_matmul_fusion_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/trans_matmul_fusion_test.cc @@ -25,7 +25,7 @@ #include "include/errorcode.h" #include "src/common/log_adapter.h" #include "tools/converter/anf_transform.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "test/common/import_from_meta_graphT.h" namespace mindspore { diff --git a/mindspore/lite/tools/common/node_util.cc b/mindspore/lite/tools/common/node_util.cc index 187b0c0ab12..1d099d4eb10 100644 --- a/mindspore/lite/tools/common/node_util.cc +++ b/mindspore/lite/tools/common/node_util.cc @@ -18,7 +18,7 @@ #include #include #include -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/common.h" #include "src/common/log_adapter.h" #include "tools/common/graph_util.h" diff --git a/mindspore/lite/tools/converter/CMakeLists.txt b/mindspore/lite/tools/converter/CMakeLists.txt index 78764515fa0..a73ad521249 100644 --- a/mindspore/lite/tools/converter/CMakeLists.txt +++ b/mindspore/lite/tools/converter/CMakeLists.txt @@ -74,8 +74,8 @@ file(GLOB_RECURSE CONVERTER_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} if((NOT WIN32) AND MSLITE_ENABLE_DPICO_ATC_ADAPTER) add_subdirectory(adapter/dpico) endif() -add_subdirectory(../anf_exporter anf_exporter) -add_subdirectory(../mindir_serializer mindir_serializer) +add_subdirectory(../lite_exporter lite_exporter) +add_subdirectory(../mindir_exporter mindir_serializer) add_subdirectory(parser/caffe) add_subdirectory(parser/tflite) add_subdirectory(parser/onnx) @@ -105,10 +105,10 @@ if(MSLITE_ENABLE_ACL) endif() file(GLOB CXX_API_SRCS - ${SRC_DIR}/cxx_api/*.cc - ${SRC_DIR}/cxx_api/model/*.cc - ${SRC_DIR}/cxx_api/graph/*.cc - ${SRC_DIR}/cxx_api/tensor/*.cc) + ${SRC_DIR}/runtime/cxx_api/*.cc + ${SRC_DIR}/runtime/cxx_api/model/*.cc + ${SRC_DIR}/runtime/cxx_api/graph/*.cc + ${SRC_DIR}/runtime/cxx_api/tensor/*.cc) file(GLOB RUNTIME_PASS_SRCS ${SRC_DIR}/runtime/pass/*.cc) @@ -116,9 +116,9 @@ file(GLOB RUNTIME_PASS_SRCS set(LITE_SRC ${API_SRC} ${CXX_API_SRCS} ${RUNTIME_PASS_SRCS} - ${SRC_DIR}/ops/ops_def.cc - ${SRC_DIR}/ops/ops_utils.cc - ${SRC_DIR}/ops/anf_utils.cc + ${SRC_DIR}/common/ops/ops_def.cc + ${SRC_DIR}/common/ops/ops_utils.cc + ${SRC_DIR}/common/ops/anf_utils.cc ${SRC_DIR}/common/utils.cc ${SRC_DIR}/common/file_utils.cc ${SRC_DIR}/common/context_util.cc @@ -135,35 +135,35 @@ set(LITE_SRC ${API_SRC} ${SRC_DIR}/runtime/infer_manager.cc ${SRC_DIR}/runtime/runtime_shape_fusion_pass.cc ${SRC_DIR}/runtime/runtime_pass.cc - ${SRC_DIR}/inner_context.cc + ${SRC_DIR}/runtime/inner_context.cc ${SRC_DIR}/tensor.cc - ${SRC_DIR}/tensor_category.cc - ${SRC_DIR}/schema_tensor_wrapper.cc - ${SRC_DIR}/ms_tensor.cc + ${SRC_DIR}/runtime/tensor_category.cc + ${SRC_DIR}/runtime/schema_tensor_wrapper.cc + ${SRC_DIR}/runtime/ms_tensor.cc ${SRC_DIR}/tensorlist.cc - ${SRC_DIR}/kernel_registry.cc + ${SRC_DIR}/runtime/kernel_registry.cc ${SRC_DIR}/registry/register_kernel_impl.cc - ${SRC_DIR}/lite_kernel.cc - ${SRC_DIR}/kernel_exec.cc - ${SRC_DIR}/kernel_exec_util.cc - ${SRC_DIR}/scheduler.cc - ${SRC_DIR}/sub_graph_kernel.cc - ${SRC_DIR}/sub_graph_split.cc - ${SRC_DIR}/lite_session.cc - ${SRC_DIR}/executor.cc - ${SRC_DIR}/lite_model.cc + ${SRC_DIR}/runtime/lite_kernel.cc + ${SRC_DIR}/runtime/kernel_exec.cc + ${SRC_DIR}/runtime/kernel_exec_util.cc + ${SRC_DIR}/runtime/scheduler.cc + ${SRC_DIR}/runtime/sub_graph_kernel.cc + ${SRC_DIR}/runtime/sub_graph_split.cc + ${SRC_DIR}/runtime/lite_session.cc + ${SRC_DIR}/runtime/executor.cc + ${SRC_DIR}/runtime/lite_model.cc ${SRC_DIR}/errorcode.cc - ${SRC_DIR}/weight_decoder.cc - ${SRC_DIR}/pack_weight_manager.cc - ${SRC_DIR}/huffman_decode.cc - ${SRC_DIR}/delegate/tensorrt/distribution/distribution_base.cc + ${SRC_DIR}/runtime/weight_decoder.cc + ${SRC_DIR}/runtime/pack_weight_manager.cc + ${SRC_DIR}/runtime/huffman_decode.cc + ${SRC_DIR}/extendrt/delegate/tensorrt/distribution/distribution_base.cc ${SRC_DIR}/control_flow/control_flow_scheduler.cc ${SRC_DIR}/control_flow/control_subgraph_creator.cc ) set(MODEL_LOADER_FRAMEWORK_SRC ${MODEL_LOADER_FRAMEWORK_SRC} - ${SRC_DIR}/model_loader/model_loader.cc + ${SRC_DIR}/extendrt/mindir_loader/model_loader.cc ) if(MSLITE_ENABLE_CLOUD_FUSION_INFERENCE) @@ -174,16 +174,16 @@ string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) set(MINDIR_MODEL_SRC ${MINDIR_MODEL_SRC} - ${SRC_DIR}/model_loader/mindir_model/mindir_model.cc - ${SRC_DIR}/model_loader/mindir_model/mindir_model_util.cc - ${SRC_DIR}/model_loader/mindir_model/mindir_model_convertor.cc - ${SRC_DIR}/model_loader/mindir_model/mindir_model_loader.cc - ${SRC_DIR}/model_loader/mindir_model/kernel_mod_util.cc + ${SRC_DIR}/extendrt/mindir_loader/mindir_model/mindir_model.cc + ${SRC_DIR}/extendrt/mindir_loader/mindir_model/mindir_model_util.cc + ${SRC_DIR}/extendrt/mindir_loader/mindir_model/mindir_model_convertor.cc + ${SRC_DIR}/extendrt/mindir_loader/mindir_model/mindir_model_loader.cc + ${SRC_DIR}/extendrt/mindir_loader/mindir_model/kernel_mod_util.cc ) set(MINDIR_KERNEL_SRC ${MINDIR_KERNEL_SRC} - ${SRC_DIR}/model_loader/mindir_model/inner_kernel.cc) + ${SRC_DIR}/extendrt/mindir_loader/mindir_model/inner_kernel.cc) endif() set(LITE_SRC @@ -212,14 +212,14 @@ endif() if(MSLITE_ENABLE_SHARING_MODEL_WEIGHT) set(LITE_SRC ${LITE_SRC} - ${SRC_DIR}/pack_weight.cc + ${SRC_DIR}/runtime/pack_weight.cc ) endif() if(MSLITE_ENABLE_DYNAMIC_THREAD_DISTRIBUTE) set(LITE_SRC ${LITE_SRC} - ${SRC_DIR}/thread_cost_model.cc + ${SRC_DIR}/runtime/thread_cost_model.cc ) endif() @@ -247,8 +247,8 @@ if(MSLITE_ENABLE_MINDRT) set(LITE_SRC ${LITE_SRC} ${MINDRT_SRC} - ${SRC_DIR}/lite_mindrt.cc - ${SRC_DIR}/mindrt_executor.cc + ${SRC_DIR}/runtime/lite_mindrt.cc + ${SRC_DIR}/runtime/mindrt_executor.cc ${SRC_DIR}/control_flow/control_actor_creator.cc ) @@ -262,7 +262,7 @@ endif() if(MSLITE_GPU_BACKEND STREQUAL opencl) file(GLOB_RECURSE OPENCL_RUNTIME_SRC - ${SRC_DIR}/runtime/gpu/opencl/*.cc + ${SRC_DIR}/runtime/kernel/gpu/opencl/*.cc ) set(LITE_SRC ${LITE_SRC} @@ -336,7 +336,7 @@ target_link_libraries(converter_lite PRIVATE tf_parser_mid caffe_parser_mid onnx_parser_mid - anf_exporter_mid + lite_exporter_mid graph_pass_mid fusion_mid quantizer_mid diff --git a/mindspore/lite/tools/converter/adapter/acl/src/acl_model_process.cc b/mindspore/lite/tools/converter/adapter/acl/src/acl_model_process.cc index 16006473503..c21e4885680 100644 --- a/mindspore/lite/tools/converter/adapter/acl/src/acl_model_process.cc +++ b/mindspore/lite/tools/converter/adapter/acl/src/acl_model_process.cc @@ -15,7 +15,7 @@ */ #include "tools/converter/adapter/acl/src/acl_model_process.h" -#include "src/runtime/kernel/ascend/src/acl_env_guard.h" +#include "src/extendrt/kernel/ascend/src/acl_env_guard.h" #include "src/common/log_util.h" #include "acl/acl.h" #include "acl/acl_rt.h" diff --git a/mindspore/lite/tools/converter/converter.cc b/mindspore/lite/tools/converter/converter.cc index bbea7d7c187..eabfef38149 100644 --- a/mindspore/lite/tools/converter/converter.cc +++ b/mindspore/lite/tools/converter/converter.cc @@ -22,7 +22,7 @@ #include "tools/converter/converter_flags.h" #include "src/common/log_adapter.h" #include "tools/common/meta_graph_serializer.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "include/version.h" #include "common/graph_kernel/graph_kernel_flags.h" #include "tools/graph_kernel/converter/graph_kernel_optimization.h" @@ -40,7 +40,7 @@ #include "src/common/version_manager.h" #include "tools/common/tensor_util.h" #include "include/api/model.h" -#include "tools/mindir_serializer/mindir_serializer.h" +#include "tools/mindir_exporter/mindir_serializer.h" #include "src/common/primitive_t_utils.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/export_model.cc b/mindspore/lite/tools/converter/export_model.cc index 128506522a1..a767b8f7abd 100644 --- a/mindspore/lite/tools/converter/export_model.cc +++ b/mindspore/lite/tools/converter/export_model.cc @@ -26,7 +26,7 @@ #include "include/errorcode.h" #include "include/version.h" #include "ir/func_graph.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "tools/converter/graphdef_transform.h" #include "tools/converter/optimizer_manager.h" #include "tools/converter/parser/parser_utils.h" diff --git a/mindspore/lite/tools/converter/import/cast_op_adjust.cc b/mindspore/lite/tools/converter/import/cast_op_adjust.cc index f3f030c4583..65f2e68009c 100644 --- a/mindspore/lite/tools/converter/import/cast_op_adjust.cc +++ b/mindspore/lite/tools/converter/import/cast_op_adjust.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "tools/converter/import/cast_op_adjust.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "mindspore/lite/include/errorcode.h" namespace mindspore::lite { diff --git a/mindspore/lite/tools/converter/legacy_optimizer/graph/infershape_pass.cc b/mindspore/lite/tools/converter/legacy_optimizer/graph/infershape_pass.cc index f5997acade2..78e0c83584e 100644 --- a/mindspore/lite/tools/converter/legacy_optimizer/graph/infershape_pass.cc +++ b/mindspore/lite/tools/converter/legacy_optimizer/graph/infershape_pass.cc @@ -24,7 +24,7 @@ #include "src/tensor.h" #include "src/tensorlist.h" #include "src/common/prim_util.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/runtime/infer_manager.h" #include "src/common/primitive_t_utils.h" #include "tools/common/node_util.h" diff --git a/mindspore/lite/tools/converter/micro/coder/graph.cc b/mindspore/lite/tools/converter/micro/coder/graph.cc index 0d0ef342442..6b2648cb826 100644 --- a/mindspore/lite/tools/converter/micro/coder/graph.cc +++ b/mindspore/lite/tools/converter/micro/coder/graph.cc @@ -27,7 +27,7 @@ #include "schema/inner/model_generated.h" #include "securec/include/securec.h" #include "src/common/prim_util.h" -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" namespace mindspore::lite::micro { CoderGraph::~CoderGraph() { diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/base/conv2d_base_coder.cc b/mindspore/lite/tools/converter/micro/coder/opcoders/base/conv2d_base_coder.cc index 5e6c17f4fd1..0a769aff221 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/base/conv2d_base_coder.cc +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/base/conv2d_base_coder.cc @@ -20,7 +20,8 @@ #include "nnacl/fp32/winograd_utils.h" #include "nnacl/int8/quantize.h" #include "coder/log.h" -#include "src/weight_decoder.h" +#include "src/runtime/tensor_category.h" +#include "src/common/quant_utils.h" namespace mindspore::lite::micro { namespace { constexpr int kRoundUp = 2; diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/conv2d_delegate_fp32_coder.cc b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/conv2d_delegate_fp32_coder.cc index 3205a5b1435..a59b24d41bb 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/conv2d_delegate_fp32_coder.cc +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/conv2d_delegate_fp32_coder.cc @@ -16,7 +16,7 @@ #include "coder/opcoders/nnacl/fp32/conv2d_delegate_fp32_coder.h" #include "src/common/version_manager.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/winograd_utils.h" #include "nnacl/base/conv_common_base.h" #include "coder/opcoders/nnacl/fp32/convolution_fp32_coder.h" diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/resize_fp32_coder.h b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/resize_fp32_coder.h index 65eb1b63e69..b941b3ad714 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/resize_fp32_coder.h +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/fp32/resize_fp32_coder.h @@ -23,7 +23,7 @@ #include #include "include/errorcode.h" #include "nnacl/fp32/resize_fp32.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "src/runtime/kernel/cpu/fp32/resize_fp32.h" namespace mindspore::lite::micro::nnacl { diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/activation_int8_coder.cc b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/activation_int8_coder.cc index ef83ef02861..77aaecb0dcd 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/activation_int8_coder.cc +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/activation_int8_coder.cc @@ -16,7 +16,7 @@ #include "coder/opcoders/nnacl/int8/sigmoid_int8_coder.h" #include "coder/opcoders/nnacl/int8/relux_int8_coder.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "nnacl/fp32/activation_fp32.h" #include "schema/model_generated.h" #include "src/common/version_manager.h" diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/conv2d_int8_coder.cc b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/conv2d_int8_coder.cc index f0b7f0d138a..cf0e30a2371 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/conv2d_int8_coder.cc +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/nnacl/int8/conv2d_int8_coder.cc @@ -24,7 +24,7 @@ #include "coder/opcoders/nnacl/int8/convolution_depthwise_int8_coder.h" #include "coder/opcoders/serializers/nnacl_serializer/nnacl_int8_serializer.h" #include "src/runtime/kernel/cpu/base/convolution_base.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/version_manager.h" #include "coder/log.h" #include "coder/opcoders/file_collector.h" diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder.h b/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder.h index 5ce74ab6ff7..a2111ce4744 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder.h +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder.h @@ -24,7 +24,7 @@ #include "tools/converter/micro/coder/graph.h" #include "tools/converter/micro/coder/allocator/allocator.h" #include "include/errorcode.h" -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "src/common/version_manager.h" #include "securec/include/securec.h" #include "tools/converter/micro/coder/opcoders/op_coder_register.h" diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_builder.cc b/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_builder.cc index 7773796b489..e756f70a15b 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_builder.cc +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_builder.cc @@ -19,7 +19,7 @@ #include "tools/converter/micro/coder/allocator/allocator.h" #include "src/common/prim_util.h" #include "src/common/version_manager.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "tools/converter/micro/coder/opcoders/parallel.h" namespace mindspore::lite::micro { diff --git a/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_register.h b/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_register.h index 0b491795468..3dc7fd7a6e7 100644 --- a/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_register.h +++ b/mindspore/lite/tools/converter/micro/coder/opcoders/op_coder_register.h @@ -21,7 +21,7 @@ #include #include #include -#include "src/kernel_exec.h" +#include "src/runtime/kernel_exec.h" #include "include/model.h" #include "tools/converter/micro/coder/config.h" namespace mindspore::lite::micro { diff --git a/mindspore/lite/tools/converter/micro/coder/session.cc b/mindspore/lite/tools/converter/micro/coder/session.cc index e80bf6aa0e2..f7a8dd23f9f 100644 --- a/mindspore/lite/tools/converter/micro/coder/session.cc +++ b/mindspore/lite/tools/converter/micro/coder/session.cc @@ -28,11 +28,11 @@ #include "coder/opcoders/kernel_registry.h" #include "coder/utils/coder_utils.h" #include "coder/log.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/version_manager.h" #include "src/runtime/infer_manager.h" -#include "src/scheduler.h" -#include "src/lite_model.h" +#include "src/runtime/scheduler.h" +#include "src/runtime/lite_model.h" #include "include/errorcode.h" #include "include/model.h" #include "src/common/file_utils.h" diff --git a/mindspore/lite/tools/converter/parser/lstm_adjust_pass.cc b/mindspore/lite/tools/converter/parser/lstm_adjust_pass.cc index a984fb74248..f29a41573eb 100644 --- a/mindspore/lite/tools/converter/parser/lstm_adjust_pass.cc +++ b/mindspore/lite/tools/converter/parser/lstm_adjust_pass.cc @@ -19,7 +19,7 @@ #include "ops/reshape.h" #include "ops/transpose.h" #include "src/common/utils.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "tools/common/tensor_util.h" #include "utils/check_convert_utils.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/tools/converter/quantizer/cle_strategy.cc b/mindspore/lite/tools/converter/quantizer/cle_strategy.cc index c49c718958c..7d67225ab74 100644 --- a/mindspore/lite/tools/converter/quantizer/cle_strategy.cc +++ b/mindspore/lite/tools/converter/quantizer/cle_strategy.cc @@ -24,7 +24,7 @@ #include "tools/converter/quantizer/cle_pattern.h" #include "include/errorcode.h" #include "tools/optimizer/common/gllo_utils.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "ops/fusion/conv2d_fusion.h" #include "src/common/log_util.h" #include "tools/common/statistic_utils.h" diff --git a/mindspore/lite/tools/converter/quantizer/debug_info_manager.cc b/mindspore/lite/tools/converter/quantizer/debug_info_manager.cc index fec7926b0c2..f19925a1c37 100644 --- a/mindspore/lite/tools/converter/quantizer/debug_info_manager.cc +++ b/mindspore/lite/tools/converter/quantizer/debug_info_manager.cc @@ -19,13 +19,14 @@ #include #include #include "tools/converter/quantizer/debug_info_manager.h" -#include "src/weight_decoder.h" +#include "src/runtime/tensor_category.h" #include "src/common/log_adapter.h" #include "include/errorcode.h" #include "tools/converter/preprocess/image_preprocess.h" #include "tools/common/tensor_util.h" #include "tools/converter/quantizer/quantize_util.h" #include "src/common/file_utils.h" +#include "src/runtime/weight_decoder.h" #include "tools/common/string_util.h" namespace mindspore::lite { diff --git a/mindspore/lite/tools/converter/quantizer/fse_decoder.h b/mindspore/lite/tools/converter/quantizer/fse_decoder.h index 5010d269c44..28e29c8c6b1 100644 --- a/mindspore/lite/tools/converter/quantizer/fse_decoder.h +++ b/mindspore/lite/tools/converter/quantizer/fse_decoder.h @@ -20,7 +20,7 @@ #include #include "tools/converter/quantizer/fse_bit_stream.h" #include "src/tensor.h" -#include "src/lite_model.h" +#include "src/runtime/lite_model.h" namespace mindspore::lite::quant { class FSEDecoder { diff --git a/mindspore/lite/tools/converter/quantizer/full_quant_quantizer.cc b/mindspore/lite/tools/converter/quantizer/full_quant_quantizer.cc index 2076387569d..95300b229a8 100644 --- a/mindspore/lite/tools/converter/quantizer/full_quant_quantizer.cc +++ b/mindspore/lite/tools/converter/quantizer/full_quant_quantizer.cc @@ -36,7 +36,7 @@ #include "nnacl/op_base.h" #include "src/common/log_util.h" #include "tools/converter/quantizer/bias_correction_strategy.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" using std::string; using std::vector; diff --git a/mindspore/lite/tools/converter/quantizer/huffman_encode.cc b/mindspore/lite/tools/converter/quantizer/huffman_encode.cc index aabea5f618b..b958f66382d 100644 --- a/mindspore/lite/tools/converter/quantizer/huffman_encode.cc +++ b/mindspore/lite/tools/converter/quantizer/huffman_encode.cc @@ -16,7 +16,7 @@ #define USE_DEPRECATED_API #include "tools/converter/quantizer/huffman_encode.h" -#include "src/weight_decoder.h" +#include "src/runtime/tensor_category.h" #include "tools/converter/quantizer/quantize_util.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/quantizer/quant_helper/quant_node_helper.cc b/mindspore/lite/tools/converter/quantizer/quant_helper/quant_node_helper.cc index 4ad4c07ce32..ef04d99ee68 100644 --- a/mindspore/lite/tools/converter/quantizer/quant_helper/quant_node_helper.cc +++ b/mindspore/lite/tools/converter/quantizer/quant_helper/quant_node_helper.cc @@ -27,8 +27,8 @@ #include "tools/converter/quantizer/quant_helper/only_need_inputs_quant_type_determiner.h" #include "tools/converter/quantizer/quant_helper/quant_dtype_cast_quant_param_propogator.h" #include "tools/converter/quantizer/quant_helper/matmul_quant_type_determiner.h" -#include "src/kernel_exec.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/kernel_registry.h" namespace mindspore::lite { void QuantNodeBase::UpdateQuantParamsNum(const schema::MetaGraphT &graph, const schema::CNodeT &node) { diff --git a/mindspore/lite/tools/converter/quantizer/quantization_optimizer.cc b/mindspore/lite/tools/converter/quantizer/quantization_optimizer.cc index aa23c17ca4b..92ba7d24c92 100644 --- a/mindspore/lite/tools/converter/quantizer/quantization_optimizer.cc +++ b/mindspore/lite/tools/converter/quantizer/quantization_optimizer.cc @@ -22,7 +22,7 @@ #include #include #include -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "base/base.h" #include "tools/converter/quantizer/quantize_util.h" #include "tools/converter/quantizer/weight_quantizer.h" @@ -30,7 +30,7 @@ #include "tools/converter/quantizer/debug_info_manager.h" #include "tools/converter/quantizer/parameter_tunner.h" #include "tools/converter/quantizer/dynamic_quantizer.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "tools/converter/quantizer/cle_strategy.h" namespace mindspore::lite::quant { diff --git a/mindspore/lite/tools/converter/quantizer/quantize_util.cc b/mindspore/lite/tools/converter/quantizer/quantize_util.cc index ec6c45aa2eb..cdaf09be5c1 100644 --- a/mindspore/lite/tools/converter/quantizer/quantize_util.cc +++ b/mindspore/lite/tools/converter/quantizer/quantize_util.cc @@ -28,7 +28,7 @@ #include "ops/fusion/conv2d_transpose_fusion.h" #include "ops/gather.h" #include "tools/converter/ops/ops_def.h" -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include "tools/converter/quantizer/bitpacking.h" #include "src/common/utils.h" #include "tools/common/tensor_util.h" diff --git a/mindspore/lite/tools/converter/quantizer/quantize_util.h b/mindspore/lite/tools/converter/quantizer/quantize_util.h index 66f2871369b..ca476e0dd73 100644 --- a/mindspore/lite/tools/converter/quantizer/quantize_util.h +++ b/mindspore/lite/tools/converter/quantizer/quantize_util.h @@ -49,7 +49,7 @@ #include "tools/converter/quantizer/huffman_encode.h" #include "tools/converter/quantizer/bitpacking.h" #include "tools/converter/quantizer/mixed_bit_weight_quantizer.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "tools/converter/graphdef_transform.h" #include "src/common/file_utils.h" #include "src/common/quant_utils.h" diff --git a/mindspore/lite/tools/converter/quantizer/weight_quantizer.h b/mindspore/lite/tools/converter/quantizer/weight_quantizer.h index 2724e85fafa..b393b5e1e7b 100644 --- a/mindspore/lite/tools/converter/quantizer/weight_quantizer.h +++ b/mindspore/lite/tools/converter/quantizer/weight_quantizer.h @@ -35,7 +35,7 @@ #include "include/model.h" #include "base/base.h" #include "abstract/dshape.h" -#include "src/lite_session.h" +#include "src/runtime/lite_session.h" #include "src/common/quant_utils.h" namespace mindspore::lite::quant { diff --git a/mindspore/lite/tools/converter/registry/CMakeLists.txt b/mindspore/lite/tools/converter/registry/CMakeLists.txt index 8e20b82244e..84e54c52fb1 100644 --- a/mindspore/lite/tools/converter/registry/CMakeLists.txt +++ b/mindspore/lite/tools/converter/registry/CMakeLists.txt @@ -4,17 +4,17 @@ file(GLOB CONVERT_REG_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cc) file(GLOB KERNEL_REG_SRC ${KERNEL_REG_DIR}/*.cc) set(REG_SRC ${CONVERT_REG_SRC} ${KERNEL_REG_SRC} - ${KERNEL_REG_DIR}/../cxx_api/context.cc - ${KERNEL_REG_DIR}/../cxx_api/types.cc - ${KERNEL_REG_DIR}/../cxx_api/tensor/tensor_impl.cc - ${KERNEL_REG_DIR}/../cxx_api/tensor_utils.cc - ${KERNEL_REG_DIR}/../ms_tensor.cc + ${KERNEL_REG_DIR}/../runtime/cxx_api/context.cc + ${KERNEL_REG_DIR}/../runtime/cxx_api/types.cc + ${KERNEL_REG_DIR}/../runtime/cxx_api/tensor/tensor_impl.cc + ${KERNEL_REG_DIR}/../runtime/cxx_api/tensor_utils.cc + ${KERNEL_REG_DIR}/../runtime/ms_tensor.cc ${KERNEL_REG_DIR}/../tensor.cc ${KERNEL_REG_DIR}/../runtime/inner_allocator.cc ${KERNEL_REG_DIR}/../common/string_util.cc ${KERNEL_REG_DIR}/../common/lite_utils.cc ${KERNEL_REG_DIR}/../common/utils.cc - ${KERNEL_REG_DIR}/../delegate/tensorrt/distribution/distribution_base.cc + ${KERNEL_REG_DIR}/../extendrt/delegate/tensorrt/distribution/distribution_base.cc ${CORE_DIR}/utils/log_adapter.cc ${CORE_DIR}/utils/status.cc ${CONVERTER_DIR}/converter_context.cc diff --git a/mindspore/lite/tools/cropper/build_cropper_config.sh b/mindspore/lite/tools/cropper/build_cropper_config.sh index 560cc2354a6..16c57f37340 100644 --- a/mindspore/lite/tools/cropper/build_cropper_config.sh +++ b/mindspore/lite/tools/cropper/build_cropper_config.sh @@ -160,7 +160,7 @@ getCommonFile() { mindspore/lite/src/runtime/infer_manager.h mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.h mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.h - mindspore/lite/src/ops/populate/populate_register.h + mindspore/lite/src/common/ops/populate/populate_register.h mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/op_base.h mindspore/core/ir/dtype/type_id.h mindspore/core/utils/overload.h @@ -183,11 +183,11 @@ getCommonFile() { done cxx_api_files=() - while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/graph/*.cc) - while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/model/*.cc) - while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/tensor/*.cc) - while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/*.cc) - while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/c_api/*.cc) + while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/graph/*.cc) + while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/model/*.cc) + while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/tensor/*.cc) + while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/*.cc) + while IFS='' read -r line; do cxx_api_files+=("$line"); done < <(ls mindspore/lite/src/runtime/c_api/*.cc) mindrt_files=() while IFS='' read -r line; do mindrt_files+=("$line"); done < <(ls mindspore/core/mindrt/src/*.cc) while IFS='' read -r line; do mindrt_files+=("$line"); done < <(ls mindspore/core/mindrt/src/async/*.cc) @@ -207,8 +207,8 @@ getCommonFile() { others_files_c=( mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.c mindspore/lite/src/runtime/infer_manager.cc - mindspore/lite/src/ops/populate/populate_register.cc - mindspore/lite/src/ops/populate/custom_populate.cc + mindspore/lite/src/common/ops/populate/populate_register.cc + mindspore/lite/src/common/ops/populate/custom_populate.cc mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.c mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_fusion_infer.c mindspore/lite/src/runtime/kernel/cpu/fp32/shape_fusion_fp32.cc @@ -217,9 +217,9 @@ getCommonFile() { # save train files train_files=() while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/train/*.cc) - while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/callback/*.cc) - while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/metrics/*.cc) - while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/cxx_api/train/*.cc) + while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/callback/*.cc) + while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/metrics/*.cc) + while IFS='' read -r line; do train_files+=("$line"); done < <(ls mindspore/lite/src/runtime/cxx_api/train/*.cc) others_train_files=( mindspore/lite/tools/common/storage.cc ) @@ -302,8 +302,8 @@ generateOpsList getCommonFile wait sleep 1 -# get src/ops -getOpsFile "REG_POPULATE\(PrimitiveType_" "mindspore/lite/src/ops/populate" "prototype" & +# get src/common/ops +getOpsFile "REG_POPULATE\(PrimitiveType_" "mindspore/lite/src/common/ops/populate" "prototype" & getOpsFile "REG_INFER\(.*?, PrimType_" "mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer" "prototype" & # support for cpu getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat32, PrimitiveType_" "mindspore/lite/src/runtime/kernel/cpu" "kNumberTypeFloat32" & @@ -325,7 +325,7 @@ chmod 444 ${CPU_TRAIN_MAPPING_OUTPUT_FILE} # support for gpu opencl_files=() while IFS='' read -r line; do opencl_files+=("$line"); done < <(ls mindspore/lite/src/runtime/kernel/opencl/*.cc) -while IFS='' read -r line; do opencl_files+=("$line"); done < <(ls mindspore/lite/src/runtime/gpu/opencl/*.cc) +while IFS='' read -r line; do opencl_files+=("$line"); done < <(ls mindspore/lite/src/runtime/kernel/gpu/opencl/*.cc) opencl_others_files=( "mindspore/lite/src/runtime/kernel/opencl/kernel/fusion_eltwise.cc" "mindspore/lite/src/runtime/kernel/opencl/kernel/to_format.cc" @@ -350,9 +350,9 @@ chmod 444 ${GPU_MAPPING_OUTPUT_FILE} # support for npu npu_files=() -while IFS='' read -r line; do npu_files+=("$line"); done < <(ls mindspore/lite/src/delegate/npu/*.cc) -while IFS='' read -r line; do npu_files+=("$line"); done < <(ls mindspore/lite/src/delegate/npu/op/*.cc) -while IFS='' read -r line; do npu_files+=("$line"); done < <(ls mindspore/lite/src/delegate/npu/pass/*.cc) +while IFS='' read -r line; do npu_files+=("$line"); done < <(ls mindspore/lite/src/runtime/delegate/npu/*.cc) +while IFS='' read -r line; do npu_files+=("$line"); done < <(ls mindspore/lite/src/runtime/delegate/npu/op/*.cc) +while IFS='' read -r line; do npu_files+=("$line"); done < <(ls mindspore/lite/src/runtime/delegate/npu/pass/*.cc) # shellcheck disable=SC2068 for file in ${npu_files[@]}; do diff --git a/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.cc b/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.cc index 649766f2640..3ce803fb2ef 100644 --- a/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.cc +++ b/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.cc @@ -18,9 +18,10 @@ #include #include #include +#include #include "src/tensor.h" #include "src/common/utils.h" -#include "src/kernel_registry.h" +#include "src/runtime/kernel_registry.h" #include "schema/model_generated.h" namespace mindspore::kernel { diff --git a/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.h b/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.h index 59933f62b66..9f0e0096447 100644 --- a/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.h +++ b/mindspore/lite/tools/graph_kernel/runtime/akg_kernel.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_GRAPH_KERNEL_RUNTIME_AKG_KERNEL_H_ #include #include -#include "src/lite_kernel.h" +#include "src/runtime/lite_kernel.h" #include "nnacl/custom_parameter.h" namespace mindspore::kernel { diff --git a/mindspore/lite/tools/anf_exporter/CMakeLists.txt b/mindspore/lite/tools/lite_exporter/CMakeLists.txt similarity index 66% rename from mindspore/lite/tools/anf_exporter/CMakeLists.txt rename to mindspore/lite/tools/lite_exporter/CMakeLists.txt index a62b493744b..347816557b7 100644 --- a/mindspore/lite/tools/anf_exporter/CMakeLists.txt +++ b/mindspore/lite/tools/lite_exporter/CMakeLists.txt @@ -2,9 +2,9 @@ file(GLOB_RECURSE ANF_EXPORTER_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cc ) set_property(SOURCE ${ANF_EXPORTER_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_LITE) -add_library(anf_exporter_mid OBJECT +add_library(lite_exporter_mid OBJECT ${ANF_EXPORTER_SRC_LIST} ) -add_dependencies(anf_exporter_mid fbs_src) -add_dependencies(anf_exporter_mid fbs_inner_src) +add_dependencies(lite_exporter_mid fbs_src) +add_dependencies(lite_exporter_mid fbs_inner_src) diff --git a/mindspore/lite/tools/anf_exporter/anf_exporter.cc b/mindspore/lite/tools/lite_exporter/anf_exporter.cc similarity index 99% rename from mindspore/lite/tools/anf_exporter/anf_exporter.cc rename to mindspore/lite/tools/lite_exporter/anf_exporter.cc index 5fe6f23fd11..3e20d8bb36c 100644 --- a/mindspore/lite/tools/anf_exporter/anf_exporter.cc +++ b/mindspore/lite/tools/lite_exporter/anf_exporter.cc @@ -15,7 +15,7 @@ */ #define USE_DEPRECATED_API -#include "tools/anf_exporter/anf_exporter.h" +#include "tools/lite_exporter/anf_exporter.h" #include #include #include @@ -41,8 +41,9 @@ #include "src/common/utils.h" #include "tools/common/graph_util.h" #include "tools/common/meta_graph_utils.h" -#include "src/ops/anf_utils.h" -#include "src/weight_decoder.h" +#include "src/common/ops/anf_utils.h" +#include "src/runtime/tensor_category.h" +#include "src/runtime/weight_decoder.h" #include "tools/common/node_util.h" #include "src/common/log_util.h" #include "tools/converter/converter_context.h" @@ -1002,7 +1003,7 @@ CNodePtr AnfExporter::CreatePartialCnode(const FuncGraphPtr &fg, const AnfNodePt } schema::MetaGraphT *Export(const FuncGraphPtr &func_graph, bool keep_graph, bool copy_primitive, bool train_flag) { - AnfExporter anf_exporter; - return anf_exporter.Export(func_graph, keep_graph, copy_primitive, train_flag); + AnfExporter lite_exporter; + return lite_exporter.Export(func_graph, keep_graph, copy_primitive, train_flag); } } // namespace mindspore::lite diff --git a/mindspore/lite/tools/anf_exporter/anf_exporter.h b/mindspore/lite/tools/lite_exporter/anf_exporter.h similarity index 99% rename from mindspore/lite/tools/anf_exporter/anf_exporter.h rename to mindspore/lite/tools/lite_exporter/anf_exporter.h index 4547bd3fbf1..cfbcb31f3c8 100644 --- a/mindspore/lite/tools/anf_exporter/anf_exporter.h +++ b/mindspore/lite/tools/lite_exporter/anf_exporter.h @@ -27,7 +27,7 @@ #include "schema/inner/model_generated.h" #include "ops/primitive_c.h" #include "ir/func_graph.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "tools/converter/converter_context.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/anf_exporter/fetch_content.cc b/mindspore/lite/tools/lite_exporter/fetch_content.cc similarity index 99% rename from mindspore/lite/tools/anf_exporter/fetch_content.cc rename to mindspore/lite/tools/lite_exporter/fetch_content.cc index 958fed8d345..708fac42c1a 100644 --- a/mindspore/lite/tools/anf_exporter/fetch_content.cc +++ b/mindspore/lite/tools/lite_exporter/fetch_content.cc @@ -15,7 +15,7 @@ */ #define USE_DEPRECATED_API -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include #include #include @@ -29,8 +29,8 @@ #include "tools/optimizer/common/format_utils.h" #include "nnacl/op_base.h" #include "tools/common/node_util.h" -#include "src/ops/anf_utils.h" -#include "src/ops/populate/populate_register.h" +#include "src/common/ops/anf_utils.h" +#include "src/common/ops/populate/populate_register.h" #include "src/common/primitive_t_utils.h" #include "mindapi/base/format.h" #include "ops/op_utils.h" diff --git a/mindspore/lite/tools/anf_exporter/fetch_content.h b/mindspore/lite/tools/lite_exporter/fetch_content.h similarity index 100% rename from mindspore/lite/tools/anf_exporter/fetch_content.h rename to mindspore/lite/tools/lite_exporter/fetch_content.h diff --git a/mindspore/lite/tools/mindir_serializer/CMakeLists.txt b/mindspore/lite/tools/mindir_exporter/CMakeLists.txt similarity index 100% rename from mindspore/lite/tools/mindir_serializer/CMakeLists.txt rename to mindspore/lite/tools/mindir_exporter/CMakeLists.txt diff --git a/mindspore/lite/tools/mindir_serializer/mindir_serializer.cc b/mindspore/lite/tools/mindir_exporter/mindir_serializer.cc similarity index 99% rename from mindspore/lite/tools/mindir_serializer/mindir_serializer.cc rename to mindspore/lite/tools/mindir_exporter/mindir_serializer.cc index e0db7882aad..a906cefa204 100644 --- a/mindspore/lite/tools/mindir_serializer/mindir_serializer.cc +++ b/mindspore/lite/tools/mindir_exporter/mindir_serializer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "tools/mindir_serializer/mindir_serializer.h" +#include "tools/mindir_exporter/mindir_serializer.h" #include #include #include diff --git a/mindspore/lite/tools/mindir_serializer/mindir_serializer.h b/mindspore/lite/tools/mindir_exporter/mindir_serializer.h similarity index 100% rename from mindspore/lite/tools/mindir_serializer/mindir_serializer.h rename to mindspore/lite/tools/mindir_exporter/mindir_serializer.h diff --git a/mindspore/lite/tools/optimizer/common/format_utils.cc b/mindspore/lite/tools/optimizer/common/format_utils.cc index d9501183854..44e082e0e25 100644 --- a/mindspore/lite/tools/optimizer/common/format_utils.cc +++ b/mindspore/lite/tools/optimizer/common/format_utils.cc @@ -65,7 +65,7 @@ #include "ops/space_to_depth.h" #include "ops/split.h" #include "ops/strided_slice.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "nnacl/op_base.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc b/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc index 39ec948197c..e6ae913d75d 100644 --- a/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc +++ b/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc @@ -26,12 +26,12 @@ #include "tools/common/node_util.h" #include "tools/common/tensor_util.h" #include "src/common/context_util.h" -#include "src/ops/populate/populate_register.h" -#include "src/kernel_exec.h" -#include "src/kernel_registry.h" -#include "src/inner_context.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/runtime/kernel_exec.h" +#include "src/runtime/kernel_registry.h" +#include "src/runtime/inner_context.h" #include "src/tensor.h" -#include "src/ops/anf_utils.h" +#include "src/common/ops/anf_utils.h" #include "src/runtime/infer_manager.h" #include "tools/optimizer/graph/lite_tensor_extractor.h" diff --git a/mindspore/lite/tools/optimizer/const_fold/fold_utils.h b/mindspore/lite/tools/optimizer/const_fold/fold_utils.h index eff97e1efbf..19b34284695 100644 --- a/mindspore/lite/tools/optimizer/const_fold/fold_utils.h +++ b/mindspore/lite/tools/optimizer/const_fold/fold_utils.h @@ -21,7 +21,7 @@ #include "ir/anf.h" #include "include/api/context.h" #include "include/registry/converter_context.h" -#include "src/inner_context.h" +#include "src/runtime/inner_context.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc index 63618e14dcc..371db6d3325 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.cc @@ -18,7 +18,7 @@ #include #include #include -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "tools/optimizer/common/gllo_utils.h" #include "securec/include/securec.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/tools/optimizer/fusion/groupnorm_fusion.cc b/mindspore/lite/tools/optimizer/fusion/groupnorm_fusion.cc index 1b6caf14d9b..38624dd63f1 100644 --- a/mindspore/lite/tools/optimizer/fusion/groupnorm_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/groupnorm_fusion.cc @@ -23,7 +23,7 @@ #include "tools/optimizer/common/gllo_utils.h" #include "securec/include/securec.h" #include "nnacl/op_base.h" -#include "src/ops/ops_utils.h" +#include "src/common/ops/ops_utils.h" #include "ops/op_utils.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.cc b/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.cc index e3f1e60ddfe..efb858b43a7 100644 --- a/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.cc @@ -24,7 +24,7 @@ #include "ops/fusion/mul_fusion.h" #include "ops/fusion/scale_fusion.h" #include "ops/op_utils.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "tools/optimizer/common/gllo_utils.h" namespace mindspore::opt { diff --git a/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc b/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc index d7288eb3229..d6fcc52f36f 100644 --- a/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/norm_fusion.cc @@ -25,7 +25,7 @@ #include "tools/optimizer/common/gllo_utils.h" #include "securec/include/securec.h" #include "nnacl/op_base.h" -#include "src/ops/anf_utils.h" +#include "src/common/ops/anf_utils.h" #include "ops/op_utils.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.cc b/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.cc index ece1a403903..b35b7d2d400 100644 --- a/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.cc +++ b/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.cc @@ -20,7 +20,7 @@ #include #include "ops/op_utils.h" #include "tools/optimizer/common/gllo_utils.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "nnacl/op_base.h" namespace mindspore::opt { diff --git a/mindspore/lite/tools/optimizer/graph/lite_tensor_extractor.h b/mindspore/lite/tools/optimizer/graph/lite_tensor_extractor.h index fab0a9c89a7..a5996315f3f 100644 --- a/mindspore/lite/tools/optimizer/graph/lite_tensor_extractor.h +++ b/mindspore/lite/tools/optimizer/graph/lite_tensor_extractor.h @@ -21,7 +21,7 @@ #include "include/registry/converter_context.h" #include "ir/anf.h" #include "src/tensor.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/graph/node_infershape.cc b/mindspore/lite/tools/optimizer/graph/node_infershape.cc index eb6de64e0e1..f7d6243a361 100644 --- a/mindspore/lite/tools/optimizer/graph/node_infershape.cc +++ b/mindspore/lite/tools/optimizer/graph/node_infershape.cc @@ -23,8 +23,8 @@ #include "tools/common/node_util.h" #include "tools/common/tensor_util.h" #include "src/common/utils.h" -#include "src/ops/populate/populate_register.h" -#include "src/ops/anf_utils.h" +#include "src/common/ops/populate/populate_register.h" +#include "src/common/ops/anf_utils.h" #include "src/runtime/infer_manager.h" #include "src/tensorlist.h" #include "src/registry/kernel_interface_registry.h" diff --git a/mindspore/lite/tools/optimizer/graph/node_infershape.h b/mindspore/lite/tools/optimizer/graph/node_infershape.h index bd3607115fc..052d6a42d24 100644 --- a/mindspore/lite/tools/optimizer/graph/node_infershape.h +++ b/mindspore/lite/tools/optimizer/graph/node_infershape.h @@ -23,7 +23,7 @@ #include #include "schema/inner/model_generated.h" #include "src/tensor.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/format_utils.h" diff --git a/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.cc b/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.cc index 0e938f51439..6a010eb9e26 100644 --- a/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.cc +++ b/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.cc @@ -20,7 +20,7 @@ #include #include #include "include/errorcode.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "ops/make_tuple.h" #include "ops/depend.h" #include "ops/fusion/pad_fusion.h" diff --git a/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h b/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h index 7416e7af373..a9b4aa59bea 100644 --- a/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h +++ b/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h @@ -21,7 +21,7 @@ #include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" using mindspore::converter::FmkType; namespace mindspore::opt { diff --git a/mindspore/lite/tools/optimizer/graph/transpose_strategy.cc b/mindspore/lite/tools/optimizer/graph/transpose_strategy.cc index 65d118f8f8f..29a3f810a0b 100644 --- a/mindspore/lite/tools/optimizer/graph/transpose_strategy.cc +++ b/mindspore/lite/tools/optimizer/graph/transpose_strategy.cc @@ -27,7 +27,7 @@ #include "ops/fusion/activation.h" #include "ops/fusion/slice_fusion.h" #include "ops/op_utils.h" -#include "tools/anf_exporter/fetch_content.h" +#include "tools/lite_exporter/fetch_content.h" #include "nnacl/op_base.h" namespace mindspore { diff --git a/mindspore/lite/tools/schema_gen/CMakeLists.txt b/mindspore/lite/tools/schema_gen/CMakeLists.txt index 92cbc1727b9..fc079eb49fe 100644 --- a/mindspore/lite/tools/schema_gen/CMakeLists.txt +++ b/mindspore/lite/tools/schema_gen/CMakeLists.txt @@ -6,7 +6,7 @@ set(COMMON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/file_utils.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/utils.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/log.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../src/ops/ops_def.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/ops/ops_def.cc ) add_executable(schema_gen ${CMAKE_CURRENT_SOURCE_DIR}/main.cc diff --git a/mindspore/lite/tools/schema_gen/schema_gen.cc b/mindspore/lite/tools/schema_gen/schema_gen.cc index 667fc9ad086..f1e9694d1cd 100644 --- a/mindspore/lite/tools/schema_gen/schema_gen.cc +++ b/mindspore/lite/tools/schema_gen/schema_gen.cc @@ -20,7 +20,7 @@ #include #include #include "include/errorcode.h" -#include "src/ops/schema_register.h" +#include "src/common/ops/schema_register.h" #include "src/common/log_adapter.h" #include "src/common/file_utils.h"