From 43c79eb85338ba21df3453b9fa8be1bde623c316 Mon Sep 17 00:00:00 2001 From: liubuyu Date: Tue, 14 Jul 2020 12:56:33 +0800 Subject: [PATCH] mindspore path adjust --- mindspore/ccsrc/CMakeLists.txt | 65 ++++--- .../kernel_compiler}/CMakeLists.txt | 2 +- .../aicpu/aicpu_kernel_build.cc | 16 +- .../aicpu/aicpu_kernel_build.h | 2 +- .../aicpu/aicpu_kernel_metadata.cc | 10 +- .../aicpu/aicpu_kernel_metadata.h | 2 +- .../aicpu/aicpu_kernel_mod.cc | 6 +- .../kernel_compiler}/aicpu/aicpu_kernel_mod.h | 4 +- .../kernel_compiler}/aicpu/aicpu_util.cc | 4 +- .../kernel_compiler}/aicpu/aicpu_util.h | 2 +- .../kernel_compiler}/aicpu/proto/attr.proto | 0 .../aicpu/proto/node_def.proto | 0 .../kernel_compiler}/aicpu/proto/tensor.proto | 0 .../aicpu/proto/tensor_shape.proto | 0 .../kernel_compiler}/aicpu/proto/types.proto | 0 .../akg/akg_kernel_attrs_process.cc | 6 +- .../akg/akg_kernel_attrs_process.h | 2 +- .../kernel_compiler}/akg/akg_kernel_build.cc | 6 +- .../kernel_compiler}/akg/akg_kernel_build.h | 6 +- .../akg/akg_kernel_metadata.cc | 8 +- .../akg/akg_kernel_metadata.h | 2 +- .../akg/ascend/akg_ascend_kernel_build.cc | 14 +- .../akg/ascend/akg_ascend_kernel_build.h | 4 +- .../akg/ascend/akg_ascend_kernel_mod.cc | 2 +- .../akg/ascend/akg_ascend_kernel_mod.h | 4 +- .../akg/gpu/akg_gpu_kernel_build.cc | 8 +- .../akg/gpu/akg_gpu_kernel_build.h | 2 +- .../akg/gpu/akg_gpu_kernel_mod.cc | 2 +- .../akg/gpu/akg_gpu_kernel_mod.h | 2 +- .../kernel_compiler}/ascend_kernel_mod.h | 2 +- .../kernel_compiler}/common_utils.cc | 6 +- .../kernel_compiler}/common_utils.h | 6 +- .../kernel_compiler}/cpu/addn_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/addn_cpu_kernel.h | 4 +- .../cpu/allgather_cpu_kernel.cc | 6 +- .../cpu/allgather_cpu_kernel.h | 4 +- .../cpu/apply_momentum_cpu_kernel.cc | 6 +- .../cpu/apply_momentum_cpu_kernel.h | 2 +- .../kernel_compiler}/cpu/argmax_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/argmax_cpu_kernel.h | 4 +- .../cpu/bias_add_cpu_kernel.cc | 2 +- .../cpu/bias_add_cpu_kernel.h | 4 +- .../cpu/bias_add_grad_cpu_kernel.cc | 2 +- .../cpu/bias_add_grad_cpu_kernel.h | 4 +- .../kernel_compiler}/cpu/concat_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/concat_cpu_kernel.h | 4 +- .../kernel_compiler}/cpu/cpu_kernel.cc | 2 +- .../kernel_compiler}/cpu/cpu_kernel.h | 4 +- .../cpu/cpu_kernel_factory.cc | 4 +- .../kernel_compiler}/cpu/cpu_kernel_factory.h | 4 +- .../kernel_compiler}/cpu/debug_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/debug_cpu_kernel.h | 4 +- .../embedding_look_up_comm_grad_cpu_kernel.cc | 6 +- .../embedding_look_up_comm_grad_cpu_kernel.h | 4 +- .../cpu/embedding_look_up_cpu_kernel.cc | 6 +- .../cpu/embedding_look_up_cpu_kernel.h | 4 +- .../cpu/equal_count_cpu_kernel.cc | 4 +- .../cpu/equal_count_cpu_kernel.h | 4 +- .../kernel_compiler}/cpu/gather_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/gather_cpu_kernel.h | 4 +- .../cpu/mkldnn/conv2d_cpu_kernel.cc | 6 +- .../cpu/mkldnn/conv2d_cpu_kernel.h | 2 +- .../mkldnn/conv2d_grad_filter_cpu_kernel.cc | 6 +- .../mkldnn/conv2d_grad_filter_cpu_kernel.h | 2 +- .../mkldnn/conv2d_grad_input_cpu_kernel.cc | 6 +- .../cpu/mkldnn/conv2d_grad_input_cpu_kernel.h | 2 +- .../cpu/mkldnn/lstm_cpu_kernel.cc | 6 +- .../cpu/mkldnn/lstm_cpu_kernel.h | 2 +- .../cpu/mkldnn/lstm_grad_cpu_kernel.cc | 6 +- .../cpu/mkldnn/lstm_grad_cpu_kernel.h | 2 +- .../cpu/mkldnn/matmul_cpu_kernel.cc | 6 +- .../cpu/mkldnn/matmul_cpu_kernel.h | 2 +- .../cpu/mkldnn/mkl_cpu_kernel.cc | 4 +- .../cpu/mkldnn/mkl_cpu_kernel.h | 4 +- .../cpu/mkldnn/mkl_kernel_engine.cc | 2 +- .../cpu/mkldnn/mkl_kernel_engine.h | 0 .../cpu/mkldnn/mul_cpu_kernel.cc | 6 +- .../cpu/mkldnn/mul_cpu_kernel.h | 2 +- .../cpu/mkldnn/pooling_cpu_kernel.cc | 6 +- .../cpu/mkldnn/pooling_cpu_kernel.h | 2 +- .../cpu/mkldnn/pooling_grad_cpu_kernel.cc | 6 +- .../cpu/mkldnn/pooling_grad_cpu_kernel.h | 2 +- .../cpu/mkldnn/relu_cpu_kernel.cc | 6 +- .../cpu/mkldnn/relu_cpu_kernel.h | 2 +- .../cpu/mkldnn/relu_grad_cpu_kernel.cc | 6 +- .../cpu/mkldnn/relu_grad_cpu_kernel.h | 2 +- .../cpu/mkldnn/softmax_cpu_kernel.cc | 6 +- .../cpu/mkldnn/softmax_cpu_kernel.h | 2 +- ...ax_cross_entropy_with_logits_cpu_kernel.cc | 6 +- ...max_cross_entropy_with_logits_cpu_kernel.h | 2 +- ...ax_cross_entropy_with_logits_cpu_kernel.cc | 6 +- ...max_cross_entropy_with_logits_cpu_kernel.h | 2 +- .../cpu/one_hot_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/one_hot_cpu_kernel.h | 4 +- .../cpu/ps/apply_momentum_ps_kernel.cc | 2 +- .../cpu/ps/apply_momentum_ps_kernel.h | 4 +- .../cpu/ps/embedding_look_up_proxy_kernel.cc | 4 +- .../cpu/ps/embedding_look_up_proxy_kernel.h | 4 +- .../cpu/ps/embedding_look_up_ps_kernel.cc | 6 +- .../cpu/ps/embedding_look_up_ps_kernel.h | 4 +- .../kernel_compiler}/cpu/ps/pserver_kernel.cc | 4 +- .../kernel_compiler}/cpu/ps/pserver_kernel.h | 4 +- .../kernel_compiler}/cpu/ps/pull_kernel.cc | 2 +- .../kernel_compiler}/cpu/ps/pull_kernel.h | 8 +- .../kernel_compiler}/cpu/ps/push_kernel.cc | 2 +- .../kernel_compiler}/cpu/ps/push_kernel.h | 8 +- .../cpu/ps/sparse_apply_adam_ps_kernel.cc | 8 +- .../cpu/ps/sparse_apply_adam_ps_kernel.h | 4 +- .../cpu/ps/sparse_apply_ftrl_ps_kernel.cc | 4 +- .../cpu/ps/sparse_apply_ftrl_ps_kernel.h | 4 +- .../kernel_compiler}/cpu/reduce_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/reduce_cpu_kernel.h | 4 +- .../cpu/reduce_scatter_cpu_kernel.cc | 6 +- .../cpu/reduce_scatter_cpu_kernel.h | 4 +- .../cpu/reshape_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/reshape_cpu_kernel.h | 4 +- .../kernel_compiler}/cpu/slice_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/slice_cpu_kernel.h | 4 +- .../cpu/slice_grad_cpu_kernel.cc | 4 +- .../cpu/slice_grad_cpu_kernel.h | 4 +- .../cpu/sparse_apply_adam_cpu_kernel.cc | 6 +- .../cpu/sparse_apply_adam_cpu_kernel.h | 4 +- .../cpu/sparse_apply_ftrl_cpu_kernel.cc | 6 +- .../cpu/sparse_apply_ftrl_cpu_kernel.h | 4 +- .../cpu/sparse_apply_lazy_adam_cpu_kernel.cc | 6 +- .../cpu/sparse_apply_lazy_adam_cpu_kernel.h | 4 +- ...parse_apply_proximal_adagrad_cpu_kernel.cc | 6 +- ...sparse_apply_proximal_adagrad_cpu_kernel.h | 4 +- .../kernel_compiler}/cpu/sub_cpu_kernel.cc | 4 +- .../kernel_compiler}/cpu/sub_cpu_kernel.h | 4 +- .../cpu/transpose_cpu_kernel.cc | 4 +- .../cpu/transpose_cpu_kernel.h | 4 +- .../gpu/arrays/argmax_gpu_kernel.cc | 2 +- .../gpu/arrays/argmax_gpu_kernel.h | 6 +- .../gpu/arrays/argmaxwithvalue_gpu_kernel.cc | 2 +- .../gpu/arrays/argmaxwithvalue_gpu_kernel.h | 6 +- .../gpu/arrays/array_reduce_gpu_kernel.cc | 2 +- .../gpu/arrays/array_reduce_gpu_kernel.h | 6 +- .../gpu/arrays/concatv2_gpu_kernel.cc | 2 +- .../gpu/arrays/concatv2_gpu_kernel.h | 6 +- .../gpu/arrays/gather_gpu_kernel.cc | 2 +- .../gpu/arrays/gather_gpu_kernel.h | 6 +- .../gpu/arrays/one_hot_gpu_kernel.cc | 2 +- .../gpu/arrays/one_hot_gpu_kernel.h | 6 +- .../gpu/arrays/select_gpu_kernel.cc | 2 +- .../gpu/arrays/select_gpu_kernel.h | 6 +- .../gpu/arrays/slice_gpu_kernel.cc | 2 +- .../gpu/arrays/slice_gpu_kernel.h | 6 +- .../gpu/arrays/slice_grad_gpu_kernel.cc | 2 +- .../gpu/arrays/slice_grad_gpu_kernel.h | 6 +- .../gpu/arrays/transpose_gpu_kernel.cc | 2 +- .../gpu/arrays/transpose_gpu_kernel.h | 6 +- .../arrays/unsorted_segment_sum_gpu_kernel.cc | 2 +- .../arrays/unsorted_segment_sum_gpu_kernel.h | 6 +- .../gpu/control/recv_gpu_kernel.cc | 2 +- .../gpu/control/recv_gpu_kernel.h | 4 +- .../gpu/control/send_gpu_kernel.cc | 2 +- .../gpu/control/send_gpu_kernel.h | 4 +- .../gpu/cuda_impl/adam_impl.cu | 2 +- .../gpu/cuda_impl/adam_impl.cuh | 2 +- .../gpu/cuda_impl/adam_weight_decay_impl.cu | 2 +- .../gpu/cuda_impl/adam_weight_decay_impl.cuh | 0 .../gpu/cuda_impl/argmax_impl.cu | 2 +- .../gpu/cuda_impl/argmax_impl.cuh | 0 .../gpu/cuda_impl/argmaxwithvalue_impl.cu | 2 +- .../gpu/cuda_impl/argmaxwithvalue_impl.cuh | 0 .../gpu/cuda_impl/assign_add_impl.cu | 2 +- .../gpu/cuda_impl/assign_add_impl.cuh | 0 .../gpu/cuda_impl/batchnorm_fold2_impl.cu | 0 .../gpu/cuda_impl/batchnorm_fold2_impl.cuh | 2 +- .../gpu/cuda_impl/batchnorm_fold_impl.cu | 2 +- .../gpu/cuda_impl/batchnorm_fold_impl.cuh | 0 .../gpu/cuda_impl/broadcast_grad_impl.cu | 4 +- .../gpu/cuda_impl/broadcast_grad_impl.cuh | 2 +- .../gpu/cuda_impl/broadcast_impl.cu | 4 +- .../gpu/cuda_impl/broadcast_impl.cuh | 2 +- .../gpu/cuda_impl/concatv2_impl.cu | 2 +- .../gpu/cuda_impl/concatv2_impl.cuh | 2 +- .../gpu/cuda_impl/correction_mul_impl.cu | 2 +- .../gpu/cuda_impl/correction_mul_impl.cuh | 0 .../gpu/cuda_impl/cross_entropy_impl.cu | 0 .../gpu/cuda_impl/cross_entropy_impl.cuh | 2 +- .../gpu/cuda_impl/dropout_impl.cu | 0 .../gpu/cuda_impl/dropout_impl.cuh | 2 +- .../gpu/cuda_impl/equalcount_impl.cu | 2 +- .../gpu/cuda_impl/equalcount_impl.cuh | 0 .../cuda_impl/fake_quant_perchannel_impl.cu | 0 .../cuda_impl/fake_quant_perchannel_impl.cuh | 2 +- .../gpu/cuda_impl/fake_quant_perlayer_impl.cu | 0 .../cuda_impl/fake_quant_perlayer_impl.cuh | 2 +- .../gpu/cuda_impl/float_status_impl.cu | 2 +- .../gpu/cuda_impl/float_status_impl.cuh | 2 +- .../gpu/cuda_impl/ftrl_impl.cu | 2 +- .../gpu/cuda_impl/ftrl_impl.cuh | 2 +- .../kernel_compiler}/gpu/cuda_impl/gather.cu | 4 +- .../kernel_compiler}/gpu/cuda_impl/gather.cuh | 0 .../gpu/cuda_impl/gelu_impl.cu | 4 +- .../gpu/cuda_impl/gelu_impl.cuh | 2 +- .../gpu/cuda_impl/layer_norm_grad_impl.cu | 4 +- .../gpu/cuda_impl/layer_norm_grad_impl.cuh | 2 +- .../gpu/cuda_impl/layer_norm_impl.cu | 2 +- .../gpu/cuda_impl/layer_norm_impl.cuh | 2 +- .../gpu/cuda_impl/minmax_update_impl.cu | 2 +- .../gpu/cuda_impl/minmax_update_impl.cuh | 2 +- .../gpu/cuda_impl/momentum_impl.cu | 0 .../gpu/cuda_impl/momentum_impl.cuh | 2 +- .../gpu/cuda_impl/one_hot_impl.cu | 2 +- .../gpu/cuda_impl/one_hot_impl.cuh | 0 .../gpu/cuda_impl/pad_impl.cu | 2 +- .../gpu/cuda_impl/pad_impl.cuh | 2 +- .../gpu/cuda_impl/random_op_impl.cu | 0 .../gpu/cuda_impl/random_op_impl.cuh | 2 +- .../gpu/cuda_impl/rmsprop_impl.cu | 4 +- .../gpu/cuda_impl/rmsprop_impl.cuh | 2 +- .../gpu/cuda_impl/select_impl.cu | 2 +- .../gpu/cuda_impl/select_impl.cuh | 2 +- ...oid_cross_entropy_with_logits_grad_impl.cu | 2 +- ...id_cross_entropy_with_logits_grad_impl.cuh | 2 +- .../sigmoid_cross_entropy_with_logits_impl.cu | 2 +- ...sigmoid_cross_entropy_with_logits_impl.cuh | 2 +- .../gpu/cuda_impl/slice_impl.cu | 2 +- .../gpu/cuda_impl/slice_impl.cuh | 2 +- .../gpu/cuda_impl/smooth_l1_loss_impl.cu | 2 +- .../gpu/cuda_impl/smooth_l1_loss_impl.cuh | 0 .../sparse_cross_entropy_cuda_impl.cu | 0 .../sparse_cross_entropy_cuda_impl.cuh | 2 +- .../gpu/cuda_impl/transpose_impl.cu | 2 +- .../gpu/cuda_impl/transpose_impl.cuh | 0 .../gpu/cuda_impl/unary_op_impl.cu | 0 .../gpu/cuda_impl/unary_op_impl.cuh | 2 +- .../gpu/cuda_impl/unsorted_segment_sum.cu | 2 +- .../gpu/cuda_impl/unsorted_segment_sum.cuh | 2 +- .../gpu/data/dataset_init_kernel.cc | 8 +- .../gpu/data/dataset_init_kernel.h | 4 +- .../gpu/data/dataset_iterator_kernel.cc | 8 +- .../gpu/data/dataset_iterator_kernel.h | 4 +- .../gpu/data/dataset_utils.cc | 2 +- .../kernel_compiler}/gpu/data/dataset_utils.h | 0 .../kernel_compiler}/gpu/gpu_kernel.h | 10 +- .../gpu/gpu_kernel_factory.cc | 8 +- .../kernel_compiler}/gpu/gpu_kernel_factory.h | 6 +- .../kernel_compiler}/gpu/kernel_constants.h | 0 .../gpu/math/addn_gpu_kernel.cc | 2 +- .../gpu/math/addn_gpu_kernel.h | 10 +- .../gpu/math/assign_add_gpu_kernel.cc | 2 +- .../gpu/math/assign_add_gpu_kernel.h | 6 +- .../gpu/math/bias_add_gpu_kernel.cc | 2 +- .../gpu/math/bias_add_gpu_kernel.h | 6 +- .../gpu/math/broadcast_gpu_kernel.cc | 2 +- .../gpu/math/broadcast_gpu_kernel.h | 8 +- .../gpu/math/broadcast_grad_gpu_kernel.cc | 2 +- .../gpu/math/broadcast_grad_gpu_kernel.h | 8 +- .../gpu/math/equalcount_gpu_kernel.cc | 2 +- .../gpu/math/equalcount_gpu_kernel.h | 6 +- .../gpu/math/float_status_gpu_kernel.cc | 2 +- .../gpu/math/float_status_gpu_kernel.h | 6 +- .../gpu/math/matmul_gpu_kernel.cc | 2 +- .../gpu/math/matmul_gpu_kernel.h | 6 +- .../gpu/math/random_op_gpu_kernel.cc | 2 +- .../gpu/math/random_op_gpu_kernel.h | 6 +- .../gpu/math/unary_op_gpu_kernel.cc | 2 +- .../gpu/math/unary_op_gpu_kernel.h | 6 +- .../gpu/nccl/nccl_gpu_kernel.cc | 2 +- .../gpu/nccl/nccl_gpu_kernel.h | 8 +- .../gpu/nn/activation_gpu_kernel.cc | 2 +- .../gpu/nn/activation_gpu_kernel.h | 6 +- .../gpu/nn/activation_grad_kernel.cc | 2 +- .../gpu/nn/activation_grad_kernel.h | 6 +- .../gpu/nn/adam_gpu_kernel.cc | 2 +- .../kernel_compiler}/gpu/nn/adam_gpu_kernel.h | 6 +- .../gpu/nn/bias_add_grad_gpu_kenel.cc | 2 +- .../gpu/nn/bias_add_grad_gpu_kenel.h | 6 +- .../gpu/nn/conv2d_gpu_kernel.cc | 2 +- .../gpu/nn/conv2d_gpu_kernel.h | 8 +- .../gpu/nn/conv2d_grad_filter_gpu_kernel.cc | 2 +- .../gpu/nn/conv2d_grad_filter_gpu_kernel.h | 8 +- .../gpu/nn/conv2d_grad_input_gpu_kernel.cc | 2 +- .../gpu/nn/conv2d_grad_input_gpu_kernel.h | 8 +- .../gpu/nn/ctcloss_gpu_kernel.cc | 2 +- .../gpu/nn/ctcloss_gpu_kernel.h | 6 +- .../gpu/nn/dropout_gpu_kernel.cc | 2 +- .../gpu/nn/dropout_gpu_kernel.h | 6 +- .../gpu/nn/dropout_grad_kernel.cc | 2 +- .../gpu/nn/dropout_grad_kernel.h | 6 +- .../gpu/nn/flatten_gpu_kernel.cc | 2 +- .../gpu/nn/flatten_gpu_kernel.h | 4 +- .../gpu/nn/flatten_grad_gpu_kernel.cc | 2 +- .../gpu/nn/flatten_grad_gpu_kernel.h | 4 +- .../gpu/nn/ftrl_gpu_kernel.cc | 2 +- .../kernel_compiler}/gpu/nn/ftrl_gpu_kernel.h | 6 +- .../gpu/nn/fused_adam_weight_decay.cc | 2 +- .../gpu/nn/fused_adam_weight_decay.h | 8 +- .../gpu/nn/fused_batch_norm_gpu_kernel.cc | 2 +- .../gpu/nn/fused_batch_norm_gpu_kernel.h | 6 +- .../gpu/nn/fused_batchnorm_grad_gpu_kernel.cc | 2 +- .../gpu/nn/fused_batchnorm_grad_gpu_kernel.h | 6 +- .../gpu/nn/gelu_grad_kernel.cc | 2 +- .../gpu/nn/gelu_grad_kernel.h | 8 +- .../kernel_compiler}/gpu/nn/gelu_kernel.cc | 2 +- .../kernel_compiler}/gpu/nn/gelu_kernel.h | 8 +- .../gpu/nn/layer_norm_gpu_kernel.cc | 2 +- .../gpu/nn/layer_norm_gpu_kernel.h | 6 +- .../gpu/nn/layer_norm_grad_gpu_kernel.cc | 2 +- .../gpu/nn/layer_norm_grad_gpu_kernel.h | 6 +- .../gpu/nn/lstm_gpu_kernel.cc | 2 +- .../kernel_compiler}/gpu/nn/lstm_gpu_kernel.h | 6 +- .../gpu/nn/lstm_grad_data_gpu_kernel.cc | 2 +- .../gpu/nn/lstm_grad_data_gpu_kernel.h | 6 +- .../gpu/nn/lstm_grad_weight_gpu_kernel.cc | 2 +- .../gpu/nn/lstm_grad_weight_gpu_kernel.h | 6 +- .../gpu/nn/momentum_gpu_kernel.cc | 2 +- .../gpu/nn/momentum_gpu_kernel.h | 6 +- .../gpu/nn/pooling_gpu_kernel.cc | 2 +- .../gpu/nn/pooling_gpu_kernel.h | 8 +- .../gpu/nn/pooling_grad_gpu_kernel.cc | 2 +- .../gpu/nn/pooling_grad_gpu_kernel.h | 8 +- .../gpu/nn/rmsprop_gpu_kernel.cc | 2 +- .../gpu/nn/rmsprop_gpu_kernel.h | 6 +- ...id_cross_entropy_with_logits_gpu_kernel.cc | 2 +- ...oid_cross_entropy_with_logits_gpu_kernel.h | 6 +- ...oss_entropy_with_logits_grad_gpu_kernel.cc | 2 +- ...ross_entropy_with_logits_grad_gpu_kernel.h | 6 +- .../gpu/nn/smooth_l1_loss_gpu_kernel.cc | 2 +- .../gpu/nn/smooth_l1_loss_gpu_kernel.h | 6 +- .../gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc | 2 +- .../gpu/nn/smooth_l1_loss_grad_gpu_kernel.h | 6 +- ...ax_cross_entropy_with_logits_gpu_kernel.cc | 2 +- ...max_cross_entropy_with_logits_gpu_kernel.h | 8 +- .../gpu/nn/softmax_gpu_kernel.cc | 2 +- .../gpu/nn/softmax_gpu_kernel.h | 8 +- .../gpu/nn/softmax_grad_gpu_kernel.cc | 2 +- .../gpu/nn/softmax_grad_gpu_kernel.h | 8 +- ...ax_cross_entropy_with_logits_gpu_kernel.cc | 2 +- ...max_cross_entropy_with_logits_gpu_kernel.h | 8 +- .../gpu/other/assign_gpu_kernel.cc | 2 +- .../gpu/other/assign_gpu_kernel.h | 4 +- .../gpu/quant/batchnorm_fold2_gpu_kernel.cc | 2 +- .../gpu/quant/batchnorm_fold2_gpu_kernel.h | 6 +- .../quant/batchnorm_fold2_grad_gpu_kernel.cc | 2 +- .../quant/batchnorm_fold2_grad_gpu_kernel.h | 6 +- .../gpu/quant/batchnorm_fold_gpu_kernel.cc | 2 +- .../gpu/quant/batchnorm_fold_gpu_kernel.h | 8 +- .../quant/batchnorm_fold_grad_gpu_kernel.cc | 2 +- .../quant/batchnorm_fold_grad_gpu_kernel.h | 6 +- .../gpu/quant/correction_mul_gpu_kernel.cc | 2 +- .../gpu/quant/correction_mul_gpu_kernel.h | 6 +- .../quant/correction_mul_grad_gpu_kernel.cc | 4 +- .../quant/correction_mul_grad_gpu_kernel.h | 6 +- .../quant/fake_quant_perchannel_gpu_kernel.cc | 4 +- .../quant/fake_quant_perchannel_gpu_kernel.h | 4 +- .../fake_quant_perchannel_grad_gpu_kernel.cc | 4 +- .../fake_quant_perchannel_grad_gpu_kernel.h | 4 +- .../quant/fake_quant_perlayer_gpu_kernel.cc | 4 +- .../quant/fake_quant_perlayer_gpu_kernel.h | 4 +- .../fake_quant_perlayer_grad_gpu_kernel.cc | 4 +- .../fake_quant_perlayer_grad_gpu_kernel.h | 4 +- .../minmax_update_perchannel_gpu_kernel.cc | 4 +- .../minmax_update_perchannel_gpu_kernel.h | 4 +- .../minmax_update_perlayer_gpu_kernel.cc | 4 +- .../quant/minmax_update_perlayer_gpu_kernel.h | 4 +- .../kernel_compiler}/hccl/hccl_kernel.cc | 6 +- .../kernel_compiler}/hccl/hccl_kernel.h | 4 +- .../hccl/hccl_kernel_build.cc | 6 +- .../kernel_compiler}/hccl/hccl_kernel_build.h | 2 +- .../hccl/hccl_kernel_metadata.cc | 6 +- .../hccl/hccl_kernel_metadata.h | 2 +- .../hccl/hcom_all_broadcast.cc | 2 +- .../hccl/hcom_all_broadcast.h | 2 +- .../kernel_compiler}/hccl/hcom_all_gather.cc | 2 +- .../kernel_compiler}/hccl/hcom_all_gather.h | 2 +- .../kernel_compiler}/hccl/hcom_all_reduce.cc | 2 +- .../kernel_compiler}/hccl/hcom_all_reduce.h | 2 +- .../hccl/hcom_all_reduce_scatter.cc | 2 +- .../hccl/hcom_all_reduce_scatter.h | 2 +- .../kernel_compiler}/hccl/hcom_util.cc | 6 +- .../kernel_compiler}/hccl/hcom_util.h | 0 .../kernel_compiler}/kash/kernel_pack.cc | 7 +- .../kernel_compiler}/kernel.h | 0 .../kernel_compiler}/kernel_build_info.cc | 2 +- .../kernel_compiler}/kernel_build_info.h | 2 +- .../kernel_compiler}/kernel_fusion.cc | 10 +- .../kernel_compiler}/kernel_fusion.h | 2 +- .../kernel_compiler}/kernel_query.cc | 14 +- .../kernel_compiler}/kernel_query.h | 4 +- .../kernel_compiler}/oplib/opinfo.h | 2 +- .../kernel_compiler}/oplib/oplib.cc | 2 +- .../kernel_compiler}/oplib/oplib.h | 2 +- .../kernel_compiler}/oplib/oploader.h | 2 +- .../kernel_compiler}/rts/assign.cc | 2 +- .../kernel_compiler}/rts/assign.h | 4 +- .../kernel_compiler}/rts/label_goto.cc | 4 +- .../kernel_compiler}/rts/label_goto.h | 4 +- .../kernel_compiler}/rts/label_set.cc | 4 +- .../kernel_compiler}/rts/label_set.h | 4 +- .../kernel_compiler}/rts/label_switch.cc | 4 +- .../kernel_compiler}/rts/label_switch.h | 4 +- .../kernel_compiler}/rts/memcpy_async.cc | 4 +- .../kernel_compiler}/rts/memcpy_async.h | 4 +- .../rts/profiling_kernel_mod.cc | 6 +- .../rts/profiling_kernel_mod.h | 2 +- .../kernel_compiler}/rts/recv.cc | 6 +- .../kernel_compiler}/rts/recv.h | 4 +- .../kernel_compiler}/rts/rt_kernel.cc | 2 +- .../kernel_compiler}/rts/rt_kernel.h | 4 +- .../kernel_compiler}/rts/rt_kernel_build.cc | 6 +- .../kernel_compiler}/rts/rt_kernel_build.h | 2 +- .../kernel_compiler}/rts/rt_kernel_info.cc | 4 +- .../kernel_compiler}/rts/rt_kernel_info.h | 4 +- .../kernel_compiler}/rts/send.cc | 4 +- .../kernel_compiler}/rts/send.h | 4 +- .../kernel_compiler}/rts/stream_active.cc | 4 +- .../kernel_compiler}/rts/stream_active.h | 4 +- .../kernel_compiler}/rts/stream_switch.cc | 4 +- .../kernel_compiler}/rts/stream_switch.h | 4 +- .../kernel_compiler}/task_stream.h | 0 .../kernel_compiler}/tbe/tbe_adapter.cc | 6 +- .../kernel_compiler}/tbe/tbe_adapter.h | 2 +- .../kernel_compiler}/tbe/tbe_convert_utils.cc | 4 +- .../kernel_compiler}/tbe/tbe_convert_utils.h | 2 +- .../kernel_compiler}/tbe/tbe_kernel_build.cc | 16 +- .../kernel_compiler}/tbe/tbe_kernel_build.h | 6 +- .../kernel_compiler}/tbe/tbe_kernel_mod.cc | 2 +- .../kernel_compiler}/tbe/tbe_kernel_mod.h | 4 +- .../tbe/tbe_kernel_parallel_build.cc | 16 +- .../tbe/tbe_kernel_parallel_build.h | 2 +- .../tbe/tbe_kernel_select/common_utils.h | 0 .../tbe_kernel_broadcast_selecter.cc | 6 +- .../tbe_kernel_broadcast_selecter.h | 2 +- .../tbe_kernel_reduce_selecter.cc | 8 +- .../tbe_kernel_reduce_selecter.h | 2 +- .../tbe_kernel_select/tbe_kernel_select.cc | 22 +-- .../tbe/tbe_kernel_select/tbe_kernel_select.h | 6 +- .../kernel_compiler}/tbe/tbe_python_funcs.cc | 4 +- .../kernel_compiler}/tbe/tbe_python_funcs.h | 0 .../kernel_compiler}/tbe/tbe_utils.cc | 12 +- .../kernel_compiler}/tbe/tbe_utils.h | 4 +- .../optimizer}/CMakeLists.txt | 2 +- .../ascend/ascend_backend_optimization.cc | 160 ++++++++--------- .../ascend/ascend_backend_optimization.h | 2 +- .../optimizer}/ascend/ascend_helper.cc | 16 +- .../optimizer}/ascend/ascend_helper.h | 8 +- .../bnupdate_eltwise_eltwise_fusion_pass.cc | 10 +- .../bnupdate_eltwise_eltwise_fusion_pass.h | 12 +- .../bnupdate_eltwise_fusion_pass.cc | 10 +- .../bnupdate_eltwise_fusion_pass.h | 12 +- ...v2dbackprop_eltwise_eltwise_fusion_pass.cc | 10 +- ...nv2dbackprop_eltwise_eltwise_fusion_pass.h | 12 +- .../conv2dbackprop_eltwise_fusion_pass.cc | 10 +- .../conv2dbackprop_eltwise_fusion_pass.h | 12 +- .../conv_bnreduce_fusion_pass.cc | 10 +- .../buffer_fusion/conv_bnreduce_fusion_pass.h | 12 +- .../conv_double_in_fusion_pass.cc | 10 +- .../conv_double_in_fusion_pass.h | 12 +- .../conv_single_in_fusion_pass.cc | 10 +- .../conv_single_in_fusion_pass.h | 12 +- .../depthwiseconv_eltwise_fusion_pass.cc | 10 +- .../depthwiseconv_eltwise_fusion_pass.h | 12 +- .../buffer_fusion/eltwise_fusion_pass.cc | 10 +- .../buffer_fusion/eltwise_fusion_pass.h | 12 +- .../ascend/buffer_fusion/fusion_base_pass.cc | 6 +- .../ascend/buffer_fusion/fusion_base_pass.h | 10 +- .../matmul_eltwise_fusion_pass.cc | 10 +- .../matmul_eltwise_fusion_pass.h | 12 +- .../buffer_fusion/multi_output_fusion_pass.cc | 10 +- .../buffer_fusion/multi_output_fusion_pass.h | 12 +- .../reduce_eltwise_fusion_pass.cc | 10 +- .../reduce_eltwise_fusion_pass.h | 12 +- .../segment_eltwise_fusion_pass.cc | 10 +- .../segment_eltwise_fusion_pass.h | 12 +- ...ridedread_conv_stridedwrite_fusion_pass.cc | 10 +- ...tridedread_conv_stridedwrite_fusion_pass.h | 12 +- .../ascend/buffer_fusion/ub_pattern_fusion.cc | 10 +- .../ascend/buffer_fusion/ub_pattern_fusion.h | 12 +- .../enhancer/getnext_memcpy_elimination.cc | 6 +- .../enhancer/getnext_memcpy_elimination.h | 2 +- .../insert_memcpy_async_for_getnext.cc | 8 +- .../insert_memcpy_async_for_getnext.h | 2 +- .../insert_memcpy_async_for_hccl_op.cc | 8 +- .../insert_memcpy_async_for_hccl_op.h | 4 +- .../enhancer/insert_pad_for_nms_with_mask.cc | 14 +- .../enhancer/insert_pad_for_nms_with_mask.h | 4 +- .../chang_axis_of_reduce_kernel.cc | 6 +- .../format_type/chang_axis_of_reduce_kernel.h | 2 +- .../ascend/format_type/check_consistency.cc | 6 +- .../ascend/format_type/check_consistency.h | 2 +- .../convert_unsupported_transnode_to_aicpu.cc | 8 +- .../convert_unsupported_transnode_to_aicpu.h | 4 +- .../format_type/deal_ref_trans_and_cast.cc | 10 +- .../format_type/deal_ref_trans_and_cast.h | 6 +- .../ascend/format_type/insert_cast.cc | 18 +- .../ascend/format_type/insert_cast.h | 4 +- .../ascend/format_type/insert_trans_op.cc | 10 +- .../ascend/format_type/insert_trans_op.h | 6 +- .../format_type/insert_transdata_for_runop.cc | 10 +- .../format_type/insert_transdata_for_runop.h | 6 +- .../ascend/format_type/merge_cast_to_op.cc | 6 +- .../ascend/format_type/merge_cast_to_op.h | 6 +- .../ascend/format_type/modify_ops_attrs.cc | 10 +- .../ascend/format_type/modify_ops_attrs.h | 2 +- .../rectify_do_mask_kernel_info.cc | 10 +- .../format_type/rectify_do_mask_kernel_info.h | 4 +- .../format_type/remove_no_use_reshape_op.cc | 10 +- .../format_type/remove_no_use_reshape_op.h | 2 +- .../ascend/ir_fission/addn_fission.cc | 4 +- .../ascend/ir_fission/addn_fission.h | 2 +- .../ir_fission/batch_norm_bert_fission.cc | 6 +- .../ir_fission/batch_norm_bert_fission.h | 2 +- .../batch_norm_grad_infer_fission.cc | 6 +- .../batch_norm_grad_infer_fission.h | 2 +- .../ir_fission/batch_norm_grad_split.cc | 8 +- .../ascend/ir_fission/batch_norm_grad_split.h | 4 +- .../ascend/ir_fission/bn_grad_split.cc | 8 +- .../ascend/ir_fission/bn_grad_split.h | 4 +- .../optimizer}/ascend/ir_fission/bn_split.cc | 8 +- .../optimizer}/ascend/ir_fission/bn_split.h | 4 +- .../ascend/ir_fission/lars_v2_fission.cc | 6 +- .../ascend/ir_fission/lars_v2_fission.h | 2 +- .../ir_fission/layer_norm_grad_split.cc | 6 +- .../ascend/ir_fission/layer_norm_grad_split.h | 6 +- .../ir_fission/single_batch_norm_fission.cc | 6 +- .../ir_fission/single_batch_norm_fission.h | 2 +- .../ascend/ir_fission/split_fission.cc | 4 +- .../ascend/ir_fission/split_fission.h | 2 +- .../ascend/ir_fission/topk_split.cc | 12 +- .../optimizer}/ascend/ir_fission/topk_split.h | 4 +- .../ascend/ir_fission/transdata_split.cc | 6 +- .../ascend/ir_fission/transdata_split.h | 8 +- .../ascend/ir_fusion/adam_apply_one_fusion.cc | 4 +- .../ascend/ir_fusion/adam_apply_one_fusion.h | 2 +- .../adam_apply_one_with_decay_rule.cc | 6 +- .../adam_apply_one_with_decay_rule.h | 2 +- .../ascend/ir_fusion/add_input_to_output.cc | 8 +- .../ascend/ir_fusion/add_input_to_output.h | 4 +- .../ascend/ir_fusion/batchnorm_to_bninfer.cc | 8 +- .../ascend/ir_fusion/batchnorm_to_bninfer.h | 2 +- .../ir_fusion/batchnormgrad_to_bninfergrad.cc | 8 +- .../ir_fusion/batchnormgrad_to_bninfergrad.h | 2 +- .../clip_by_norm_no_div_square_sum_fusion.cc | 4 +- .../clip_by_norm_no_div_square_sum_fusion.h | 2 +- .../ascend/ir_fusion/clip_by_value_fusion.cc | 6 +- .../ascend/ir_fusion/clip_by_value_fusion.h | 2 +- .../ir_fusion/confusion_mul_grad_fusion.cc | 6 +- .../ir_fusion/confusion_mul_grad_fusion.h | 2 +- .../ir_fusion/confusion_softmax_grad_rule.cc | 6 +- .../ir_fusion/confusion_softmax_grad_rule.h | 2 +- .../ascend/ir_fusion/derelu_fusion.cc | 6 +- .../ascend/ir_fusion/derelu_fusion.h | 2 +- .../ir_fusion/fused_batch_norm_fusion.cc | 6 +- .../ir_fusion/fused_batch_norm_fusion.h | 2 +- .../ir_fusion/input_to_output_registry.cc | 4 +- .../ir_fusion/input_to_output_registry.h | 0 .../ascend/ir_fusion/lamb_next_mv_rule.cc | 8 +- .../ascend/ir_fusion/lamb_next_mv_rule.h | 6 +- .../ir_fusion/lamb_next_mv_with_decay_rule.cc | 6 +- .../ir_fusion/lamb_next_mv_with_decay_rule.h | 4 +- .../lamb_next_mv_with_decay_v1_rule.cc | 6 +- .../lamb_next_mv_with_decay_v1_rule.h | 4 +- .../ascend/ir_fusion/lamb_next_right_rule.cc | 4 +- .../ascend/ir_fusion/lamb_next_right_rule.h | 2 +- .../lamb_update_with_lr_rule_fusion.cc | 4 +- .../lamb_update_with_lr_rule_fusion.h | 2 +- .../ir_fusion/lamb_update_with_lr_v2.cc | 4 +- .../ascend/ir_fusion/lamb_update_with_lr_v2.h | 6 +- .../layer_norm_beta_gamma_backprop_fusion.cc | 4 +- .../layer_norm_beta_gamma_backprop_fusion.h | 6 +- .../ascend/ir_fusion/matmul_biasadd_fusion.cc | 6 +- .../ascend/ir_fusion/matmul_biasadd_fusion.h | 2 +- .../ir_fusion/momentum_lossscale_fusion.cc | 6 +- .../ir_fusion/momentum_lossscale_fusion.h | 2 +- .../ascend/ir_fusion/mul_add_fusion.cc | 8 +- .../ascend/ir_fusion/mul_add_fusion.h | 2 +- .../ascend/ir_fusion/mul_addn_fusion.cc | 8 +- .../ascend/ir_fusion/mul_addn_fusion.h | 2 +- .../ir_fusion/parameter_and_transop_fusion.cc | 14 +- .../ir_fusion/parameter_and_transop_fusion.h | 2 +- .../ir_fusion/refresh_parameter_format.cc | 14 +- .../ir_fusion/refresh_parameter_format.h | 2 +- .../ascend/ir_fusion/remove_reshape_pair.cc | 6 +- .../ascend/ir_fusion/remove_reshape_pair.h | 6 +- .../ir_fusion/reshape_transpose_fusion.cc | 8 +- .../ir_fusion/reshape_transpose_fusion.h | 6 +- .../ir_fusion/softmax_grad_ext_fusion.cc | 6 +- .../ir_fusion/softmax_grad_ext_fusion.h | 2 +- .../ascend/ir_fusion/square_sum_fusion.cc | 10 +- .../ascend/ir_fusion/square_sum_fusion.h | 2 +- .../ir_fusion/transpose_reshape_fusion.cc | 8 +- .../ir_fusion/transpose_reshape_fusion.h | 6 +- .../ir_fusion/transpose_transdata_fusion.cc | 6 +- .../ir_fusion/transpose_transdata_fusion.h | 8 +- .../common/common_backend_optimization.cc | 14 +- .../common/common_backend_optimization.h | 2 +- .../optimizer}/common/fusion_id_allocator.cc | 4 +- .../optimizer}/common/fusion_id_allocator.h | 0 .../optimizer}/common/helper.cc | 8 +- .../optimizer}/common/helper.h | 4 +- .../optimizer}/common/node_pass.cc | 4 +- .../optimizer}/common/node_pass.h | 2 +- .../optimizer}/common/optimizer.cc | 6 +- .../optimizer}/common/optimizer.h | 6 +- .../optimizer}/common/pass.h | 2 +- .../optimizer}/common/pass_manager.cc | 2 +- .../optimizer}/common/pass_manager.h | 4 +- .../optimizer}/common/pattern_engine.cc | 4 +- .../optimizer}/common/pattern_engine.h | 2 +- .../optimizer}/common/visit.cc | 4 +- .../optimizer}/common/visit.h | 0 .../optimizer}/gpu/adam_fusion.cc | 6 +- .../optimizer}/gpu/adam_fusion.h | 2 +- .../gpu/adam_weight_decay_fusion.cc | 6 +- .../optimizer}/gpu/adam_weight_decay_fusion.h | 2 +- .../optimizer}/mem_reuse/kernel_refcount.cc | 2 +- .../optimizer}/mem_reuse/kernel_refcount.h | 0 .../optimizer}/mem_reuse/mem_copy_manager.h | 4 +- .../mem_reuse/mem_dynamic_allocator.cc | 2 +- .../mem_reuse/mem_dynamic_allocator.h | 0 .../optimizer}/mem_reuse/mem_reuse.cc | 6 +- .../optimizer}/mem_reuse/mem_reuse.h | 8 +- .../mem_reuse/mem_reuse_allocator.cc | 8 +- .../mem_reuse/mem_reuse_allocator.h | 4 +- .../optimizer}/mem_reuse/mem_reuse_checker.cc | 2 +- .../optimizer}/mem_reuse/mem_reuse_checker.h | 10 +- .../optimizer}/mem_reuse/mem_swap_manager.cc | 6 +- .../optimizer}/mem_reuse/mem_swap_manager.h | 2 +- .../optimizer}/pass/add_atomic_clean.cc | 8 +- .../optimizer}/pass/add_atomic_clean.h | 2 +- .../pass/common_subexpression_elimination.cc | 4 +- .../pass/common_subexpression_elimination.h | 4 +- .../pass/communication_op_fusion.cc | 12 +- .../optimizer}/pass/communication_op_fusion.h | 2 +- .../pass/const_input_to_attr_registry.cc | 4 +- .../pass/const_input_to_attr_registry.h | 0 .../pass/const_to_attr_strided_slice_grad.cc | 6 +- .../pass/const_to_attr_strided_slice_grad.h | 2 +- .../pass/convert_const_input_to_attr.cc | 12 +- .../pass/convert_const_input_to_attr.h | 2 +- .../convert_const_input_to_tensor_input.cc | 12 +- .../convert_const_input_to_tensor_input.h | 2 +- .../convert_tuple_input_to_dynamic_input.cc | 12 +- .../convert_tuple_input_to_dynamic_input.h | 2 +- .../pass/convert_tuple_output_to_maketuple.cc | 8 +- .../pass/convert_tuple_output_to_maketuple.h | 2 +- .../optimizer}/pass/eliminate_redundant_op.cc | 10 +- .../optimizer}/pass/eliminate_redundant_op.h | 4 +- .../optimizer}/pass/erase_visit_attr.cc | 8 +- .../optimizer}/pass/erase_visit_attr.h | 2 +- .../optimizer}/pass/fuse_basic.cc | 10 +- .../optimizer}/pass/fuse_basic.h | 4 +- .../optimizer}/pass/fuse_graph_kernel.cc | 8 +- .../optimizer}/pass/fuse_graph_kernel.h | 4 +- .../optimizer}/pass/getitem_tuple.cc | 6 +- .../optimizer}/pass/getitem_tuple.h | 2 +- .../optimizer}/pass/optimize_dependence.cc | 10 +- .../optimizer}/pass/optimize_dependence.h | 2 +- .../optimizer}/pass/replace_node_by_proxy.cc | 8 +- .../optimizer}/pass/replace_node_by_proxy.h | 4 +- .../{ => backend}/session/CMakeLists.txt | 2 +- .../session/anf_runtime_algorithm.cc | 14 +- .../session/anf_runtime_algorithm.h | 10 +- .../session/ascend_control_parser.cc | 6 +- .../session/ascend_control_parser.h | 2 +- .../session/ascend_inference_session.cc | 10 +- .../session/ascend_inference_session.h | 10 +- .../{ => backend}/session/ascend_session.cc | 32 ++-- .../{ => backend}/session/ascend_session.h | 10 +- .../{ => backend}/session/cpu_session.cc | 12 +- .../ccsrc/{ => backend}/session/cpu_session.h | 8 +- .../{ => backend}/session/gpu_session.cc | 26 +-- .../ccsrc/{ => backend}/session/gpu_session.h | 6 +- .../{ => backend}/session/kernel_graph.cc | 14 +- .../{ => backend}/session/kernel_graph.h | 2 +- .../ccsrc/{ => backend}/session/session.cc | 12 +- .../ccsrc/{ => backend}/session/session.h | 2 +- .../{ => backend}/session/session_basic.cc | 18 +- .../{ => backend}/session/session_basic.h | 8 +- .../{ => backend}/session/session_context.cc | 2 +- .../{ => backend}/session/session_context.h | 2 +- .../{ => backend}/session/session_factory.cc | 2 +- .../{ => backend}/session/session_factory.h | 2 +- mindspore/ccsrc/common.h | 10 +- mindspore/ccsrc/common/trans.cc | 6 +- mindspore/ccsrc/common/trans.h | 2 +- mindspore/ccsrc/dataset/core/client.h | 61 ------- .../ccsrc/dataset/include/utils/log_adapter.h | 1 - .../ccsrc/dataset/include/utils/overload.h | 1 - mindspore/ccsrc/debug/anf_ir_dump.cc | 4 +- mindspore/ccsrc/debug/anf_ir_utils.cc | 10 +- mindspore/ccsrc/debug/anf_ir_utils.h | 6 +- mindspore/ccsrc/debug/debugger/debugger.cc | 4 +- mindspore/ccsrc/debug/debugger/debugger.h | 2 +- mindspore/ccsrc/debug/draw.cc | 2 +- mindspore/ccsrc/debug/draw.h | 2 +- mindspore/ccsrc/debug/trace.cc | 4 +- mindspore/ccsrc/debug/trace.h | 2 +- .../{ => frontend}/operator/CMakeLists.txt | 2 +- .../operator/cc_implementations.cc | 2 +- .../operator/cc_implementations.h | 0 .../operator/composite/composite.cc | 8 +- .../operator/composite/composite.h | 12 +- .../operator/composite/do_signature.cc | 6 +- .../operator/composite/do_signature.h | 2 +- .../composite/list_append_operation.cc | 4 +- .../composite/list_append_operation.h | 0 .../{ => frontend}/operator/composite/map.cc | 6 +- .../{ => frontend}/operator/composite/map.h | 2 +- .../operator/composite/multitype_funcgraph.cc | 8 +- .../operator/composite/multitype_funcgraph.h | 2 +- .../operator/composite/unpack_call.cc | 6 +- .../operator/composite/unpack_call.h | 2 +- .../operator/composite/zip_operation.cc | 6 +- .../operator/composite/zip_operation.h | 2 +- .../ccsrc/{ => frontend}/operator/ops.cc | 2 +- mindspore/ccsrc/{ => frontend}/operator/ops.h | 0 .../{ => frontend}/operator/ops_extends.cc | 6 +- .../{ => frontend}/operator/prim_arrays.cc | 6 +- .../{ => frontend}/operator/prim_debug.cc | 4 +- .../{ => frontend}/operator/prim_maths.cc | 4 +- .../ccsrc/{ => frontend}/operator/prim_nn.cc | 4 +- .../{ => frontend}/operator/prim_others.cc | 4 +- .../{ => frontend}/operator/prim_statement.cc | 4 +- .../operator/prim_structures.cc | 4 +- .../operator/prim_to_function.cc | 2 +- .../operator/prim_to_function.h | 0 .../{ => frontend}/optimizer/CMakeLists.txt | 2 +- .../{ => frontend}/optimizer/ad/adjoint.cc | 4 +- .../{ => frontend}/optimizer/ad/adjoint.h | 2 +- .../{ => frontend}/optimizer/ad/dfunctor.cc | 14 +- .../{ => frontend}/optimizer/ad/dfunctor.h | 6 +- .../ccsrc/{ => frontend}/optimizer/ad/grad.cc | 4 +- .../ccsrc/{ => frontend}/optimizer/ad/grad.h | 2 +- .../{ => frontend}/optimizer/ad/kprim.cc | 12 +- .../ccsrc/{ => frontend}/optimizer/clean.cc | 4 +- .../ccsrc/{ => frontend}/optimizer/clean.h | 2 +- .../optimizer/control_depend.cc | 4 +- .../{ => frontend}/optimizer/control_depend.h | 0 .../ccsrc/{ => frontend}/optimizer/cse.cc | 2 +- .../ccsrc/{ => frontend}/optimizer/cse.h | 2 +- .../optimizer/graph_kernel_reuse.cc | 2 +- .../optimizer/graph_kernel_reuse.h | 5 +- .../ccsrc/{ => frontend}/optimizer/irpass.cc | 54 +++--- .../ccsrc/{ => frontend}/optimizer/irpass.h | 4 +- .../optimizer/irpass/arithmetic_simplify.cc | 10 +- .../optimizer/irpass/arithmetic_simplify.h | 8 +- .../optimizer/irpass/branch_culling.cc | 4 +- .../optimizer/irpass/branch_culling.h | 4 +- .../optimizer/irpass/cast_eliminate.cc | 12 +- .../optimizer/irpass/cast_eliminate.h | 4 +- .../{ => frontend}/optimizer/irpass/convert.h | 6 +- .../optimizer/irpass/env_item_eliminate.h | 6 +- .../optimizer/irpass/grad_var_prepare.cc | 10 +- .../optimizer/irpass/grad_var_prepare.h | 8 +- .../optimizer/irpass/gradient_eliminate.cc | 2 +- .../optimizer/irpass/gradient_eliminate.h | 8 +- .../optimizer/irpass/incorporate_call.h | 6 +- .../optimizer/irpass/incorporate_getitem.h | 6 +- .../irpass/indexed_slices_eliminate.h | 6 +- .../{ => frontend}/optimizer/irpass/inline.h | 6 +- .../optimizer/irpass/item_tuple_eliminate.h | 6 +- .../optimizer/irpass/mark_interface_fusion.h | 10 +- .../optimizer/irpass/merge_addn.h | 6 +- .../optimizer/irpass/minmax_grad.h | 6 +- .../optimizer/irpass/param_replace.h | 8 +- .../optimizer/irpass/partial_eliminate.h | 6 +- .../optimizer/irpass/prim_eliminate.h | 4 +- .../optimizer/irpass/reduce_eliminate.h | 6 +- .../optimizer/irpass/ref_eliminate.h | 4 +- .../optimizer/irpass/reshape_eliminate.h | 6 +- .../optimizer/irpass/special_op_eliminate.h | 8 +- .../optimizer/irpass/specialize_transform.h | 6 +- .../optimizer/irpass/symbol_resolver.h | 10 +- .../optimizer/irpass/tile_eliminate.h | 6 +- .../optimizer/irpass/transpose_eliminate.h | 6 +- .../ccsrc/{ => frontend}/optimizer/opt.cc | 4 +- .../ccsrc/{ => frontend}/optimizer/opt.h | 2 +- .../{ => frontend}/optimizer/optimizer.h | 6 +- .../{ => frontend}/optimizer/pass_group.cc | 2 +- .../{ => frontend}/optimizer/pass_group.h | 2 +- .../ccsrc/{ => frontend}/optimizer/py_pass.cc | 6 +- .../ccsrc/{ => frontend}/optimizer/py_pass.h | 0 .../optimizer/py_pass_manager.cc | 4 +- .../optimizer/py_pass_manager.h | 6 +- .../{ => frontend}/parallel/CMakeLists.txt | 2 +- .../allreduce_fusion/allreduce_fusion.cc | 10 +- .../allreduce_fusion/allreduce_fusion.h | 4 +- .../allreduce_fusion/allreduce_graph.cc | 4 +- .../allreduce_fusion/allreduce_graph.h | 4 +- .../allreduce_fusion/allreduce_node.cc | 4 +- .../allreduce_fusion/allreduce_node.h | 2 +- .../allreduce_fusion/step_allreduce_fusion.cc | 12 +- .../allreduce_fusion/step_allreduce_fusion.h | 2 +- .../parallel/auto_parallel/costmodel.cc | 4 +- .../parallel/auto_parallel/costmodel.h | 4 +- .../auto_parallel/dp_algo_costmodel.cc | 2 +- .../auto_parallel/dp_algo_costmodel.h | 4 +- .../parallel/auto_parallel/edge_costmodel.cc | 8 +- .../parallel/auto_parallel/edge_costmodel.h | 8 +- .../parallel/auto_parallel/graph_costmodel.cc | 6 +- .../parallel/auto_parallel/graph_costmodel.h | 10 +- .../auto_parallel/operator_costmodel.cc | 6 +- .../auto_parallel/operator_costmodel.h | 4 +- .../auto_parallel/rec_core/rec_cost.cc | 2 +- .../auto_parallel/rec_core/rec_cost.h | 4 +- .../rec_core/rec_generate_strategy.cc | 10 +- .../rec_core/rec_generate_strategy.h | 4 +- .../auto_parallel/rec_core/rec_graph.h | 4 +- .../auto_parallel/rec_core/rec_parse_graph.cc | 8 +- .../auto_parallel/rec_core/rec_parse_graph.h | 4 +- .../auto_parallel/rec_core/rec_partition.cc | 4 +- .../auto_parallel/rec_core/rec_partition.h | 8 +- .../auto_parallel/rec_core/rec_strategy.h | 0 .../auto_parallel/rec_core/rec_tensor.h | 2 +- .../ccsrc/{ => frontend}/parallel/context.cc | 4 +- .../ccsrc/{ => frontend}/parallel/context.h | 4 +- .../parallel/costmodel_context.cc | 6 +- .../parallel/costmodel_context.h | 0 .../ccsrc/{ => frontend}/parallel/device.h | 2 +- .../{ => frontend}/parallel/device_manager.cc | 4 +- .../{ => frontend}/parallel/device_manager.h | 10 +- .../{ => frontend}/parallel/device_matrix.cc | 6 +- .../{ => frontend}/parallel/device_matrix.h | 2 +- .../{ => frontend}/parallel/dynamic_creator.h | 4 +- .../parallel/graph_util/generate_graph.cc | 2 +- .../parallel/graph_util/generate_graph.h | 6 +- .../parallel/graph_util/get_parallel_info.cc | 10 +- .../parallel/graph_util/get_parallel_info.h | 0 .../parallel/graph_util/graph_info.cc | 2 +- .../parallel/graph_util/graph_info.h | 0 .../parallel/graph_util/node_info.cc | 4 +- .../parallel/graph_util/node_info.h | 0 .../{ => frontend}/parallel/group_manager.cc | 6 +- .../{ => frontend}/parallel/group_manager.h | 4 +- .../{ => frontend}/parallel/node_check.cc | 4 +- .../{ => frontend}/parallel/node_check.h | 0 .../parallel/ops_info/activation_info.cc | 8 +- .../parallel/ops_info/activation_info.h | 6 +- .../parallel/ops_info/arithmetic_info.cc | 8 +- .../parallel/ops_info/arithmetic_info.h | 6 +- .../parallel/ops_info/batch_parallel_info.cc | 8 +- .../parallel/ops_info/batch_parallel_info.h | 4 +- .../parallel/ops_info/bias_add_info.cc | 8 +- .../parallel/ops_info/bias_add_info.h | 6 +- .../ops_info/comparison_function_info.h | 6 +- .../parallel/ops_info/dropout_do_mask_info.cc | 12 +- .../parallel/ops_info/dropout_do_mask_info.h | 6 +- .../ops_info/elementary_function_info.h | 6 +- .../parallel/ops_info/gather_v2_info.cc | 10 +- .../parallel/ops_info/gather_v2_info.h | 6 +- .../parallel/ops_info/gather_v2_p_info.cc | 6 +- .../parallel/ops_info/gather_v2_p_info.h | 6 +- .../parallel/ops_info/get_next_info.cc | 10 +- .../parallel/ops_info/get_next_info.h | 6 +- .../parallel/ops_info/l2_normalize_info.cc | 8 +- .../parallel/ops_info/l2_normalize_info.h | 6 +- .../parallel/ops_info/layer_norm_info.cc | 6 +- .../parallel/ops_info/layer_norm_info.h | 6 +- .../parallel/ops_info/loss_info.cc | 8 +- .../parallel/ops_info/loss_info.h | 6 +- .../parallel/ops_info/matmul_info.cc | 10 +- .../parallel/ops_info/matmul_info.h | 6 +- .../parallel/ops_info/onehot_info.cc | 10 +- .../parallel/ops_info/onehot_info.h | 6 +- .../parallel/ops_info/operator_info.cc | 8 +- .../parallel/ops_info/operator_info.h | 16 +- .../parallel/ops_info/ops_info_head_files.h | 41 +++++ .../parallel/ops_info/ops_utils.h | 0 .../parallel/ops_info/prelu_info.cc | 8 +- .../parallel/ops_info/prelu_info.h | 4 +- .../parallel/ops_info/reduce_method_info.cc | 8 +- .../parallel/ops_info/reduce_method_info.h | 6 +- .../parallel/ops_info/reshape_info.cc | 10 +- .../parallel/ops_info/reshape_info.h | 4 +- .../parallel/ops_info/tmp_identity_info.cc | 2 +- .../parallel/ops_info/tmp_identity_info.h | 6 +- .../parallel/ops_info/transpose_info.cc | 8 +- .../parallel/ops_info/transpose_info.h | 4 +- .../parallel/ops_info/virtual_dataset_info.cc | 10 +- .../parallel/ops_info/virtual_dataset_info.h | 4 +- .../ccsrc/{ => frontend}/parallel/ps/common.h | 0 .../parallel/ps/optimizer_info.cc | 2 +- .../parallel/ps/optimizer_info.h | 4 +- .../parallel/ps/optimizer_info_builder.cc | 2 +- .../parallel/ps/optimizer_info_builder.h | 6 +- .../parallel/ps/parameter_server.h | 32 ++-- .../{ => frontend}/parallel/ps/scheduler.cc | 2 +- .../{ => frontend}/parallel/ps/scheduler.h | 0 .../ccsrc/{ => frontend}/parallel/ps/util.cc | 4 +- .../ccsrc/{ => frontend}/parallel/ps/util.h | 2 +- .../ccsrc/{ => frontend}/parallel/ps/worker.h | 6 +- .../{ => frontend}/parallel/ps/worker_proxy.h | 2 +- .../ccsrc/{ => frontend}/parallel/status.h | 0 .../parallel/step_auto_parallel.cc | 32 ++-- .../parallel/step_auto_parallel.h | 6 +- .../{ => frontend}/parallel/step_parallel.cc | 28 +-- .../{ => frontend}/parallel/step_parallel.h | 6 +- .../ccsrc/{ => frontend}/parallel/strategy.h | 2 +- .../parallel_strategy_checkpoint.cc | 2 +- .../parallel_strategy_checkpoint.h | 6 +- .../parallel/tensor_layout/arrangement.cc | 6 +- .../parallel/tensor_layout/arrangement.h | 4 +- .../parallel/tensor_layout/array.cc | 4 +- .../parallel/tensor_layout/array.h | 2 +- .../tensor_layout/construct_operator.cc | 2 +- .../tensor_layout/construct_operator.h | 4 +- .../parallel/tensor_layout/layout_transfer.cc | 4 +- .../parallel/tensor_layout/layout_transfer.h | 4 +- .../parallel/tensor_layout/map.cc | 6 +- .../parallel/tensor_layout/map.h | 6 +- .../redistribution_layout_transfer.cc | 8 +- .../redistribution_layout_transfer.h | 6 +- .../redistribution_operator_infer.cc | 4 +- .../redistribution_operator_infer.h | 4 +- .../tensor_layout/reshape_layout_transfer.cc | 6 +- .../tensor_layout/reshape_layout_transfer.h | 4 +- .../parallel/tensor_layout/shape_util.cc | 4 +- .../parallel/tensor_layout/shape_util.h | 2 +- .../parallel/tensor_layout/tensor_info.h | 6 +- .../parallel/tensor_layout/tensor_layout.cc | 10 +- .../parallel/tensor_layout/tensor_layout.h | 8 +- .../tensor_layout/tensor_redistribution.cc | 6 +- .../tensor_layout/tensor_redistribution.h | 10 +- .../{ => minddata}/dataset/CMakeLists.txt | 8 +- .../{ => minddata}/dataset/api/CMakeLists.txt | 0 .../{ => minddata}/dataset/api/datasets.cc | 34 ++-- .../{ => minddata}/dataset/api/de_pipeline.cc | 50 +++--- .../{ => minddata}/dataset/api/de_pipeline.h | 6 +- .../{ => minddata}/dataset/api/iterator.cc | 6 +- .../dataset/api/python_bindings.cc | 162 +++++++++--------- .../{ => minddata}/dataset/api/samplers.cc | 16 +- .../{ => minddata}/dataset/api/transforms.cc | 28 +-- .../dataset/core/CMakeLists.txt | 0 .../{ => minddata}/dataset/core/client.cc | 10 +- .../ccsrc/minddata/dataset/core/client.h | 61 +++++++ .../dataset/core/config_manager.cc | 4 +- .../dataset/core/config_manager.h | 6 +- .../{ => minddata}/dataset/core/constants.h | 0 .../{ => minddata}/dataset/core/cv_tensor.cc | 6 +- .../{ => minddata}/dataset/core/cv_tensor.h | 6 +- .../{ => minddata}/dataset/core/data_type.cc | 4 +- .../{ => minddata}/dataset/core/data_type.h | 4 +- .../{ => minddata}/dataset/core/example.proto | 0 .../{ => minddata}/dataset/core/feature.proto | 0 .../dataset/core/global_context.cc | 14 +- .../dataset/core/global_context.h | 6 +- .../dataset/core/pybind_support.h | 0 .../{ => minddata}/dataset/core/tensor.cc | 12 +- .../{ => minddata}/dataset/core/tensor.h | 8 +- .../{ => minddata}/dataset/core/tensor_row.cc | 2 +- .../{ => minddata}/dataset/core/tensor_row.h | 2 +- .../dataset/core/tensor_shape.cc | 4 +- .../dataset/core/tensor_shape.h | 8 +- .../dataset/engine/CMakeLists.txt | 0 .../dataset/engine/cache/CMakeLists.txt | 0 .../dataset/engine/cache/cache_client.cc | 6 +- .../dataset/engine/cache/cache_client.h | 6 +- .../dataset/engine/cache/cache_request.cc | 2 +- .../dataset/engine/cache/cache_request.h | 6 +- .../dataset/engine/cache/cache_server.cc | 8 +- .../dataset/engine/cache/cache_server.h | 20 +-- .../dataset/engine/cache/cache_service.cc | 4 +- .../dataset/engine/cache/cache_service.h | 18 +- .../dataset/engine/cache/de_tensor.fbs | 0 .../{ => minddata}/dataset/engine/connector.h | 8 +- .../dataset/engine/data_buffer.cc | 8 +- .../dataset/engine/data_buffer.h | 10 +- .../dataset/engine/data_schema.cc | 6 +- .../dataset/engine/data_schema.h | 8 +- .../dataset/engine/dataset_iterator.cc | 16 +- .../dataset/engine/dataset_iterator.h | 10 +- .../dataset/engine/datasetops/CMakeLists.txt | 0 .../dataset/engine/datasetops/barrier_op.cc | 12 +- .../dataset/engine/datasetops/barrier_op.h | 8 +- .../dataset/engine/datasetops/batch_op.cc | 12 +- .../dataset/engine/datasetops/batch_op.h | 10 +- .../datasetops/bucket_batch_by_length_op.cc | 18 +- .../datasetops/bucket_batch_by_length_op.h | 12 +- .../engine/datasetops/build_vocab_op.cc | 4 +- .../engine/datasetops/build_vocab_op.h | 12 +- .../engine/datasetops/cache_base_op.cc | 4 +- .../dataset/engine/datasetops/cache_base_op.h | 20 +-- .../engine/datasetops/cache_lookup_op.cc | 12 +- .../engine/datasetops/cache_lookup_op.h | 2 +- .../engine/datasetops/cache_merge_op.cc | 14 +- .../engine/datasetops/cache_merge_op.h | 12 +- .../dataset/engine/datasetops/cache_op.cc | 18 +- .../dataset/engine/datasetops/cache_op.h | 2 +- .../dataset/engine/datasetops/concat_op.cc | 10 +- .../dataset/engine/datasetops/concat_op.h | 2 +- .../dataset/engine/datasetops/dataset_op.cc | 14 +- .../dataset/engine/datasetops/dataset_op.h | 6 +- .../engine/datasetops/device_queue_op.cc | 20 +-- .../engine/datasetops/device_queue_op.h | 8 +- .../dataset/engine/datasetops/filter_op.cc | 22 +-- .../dataset/engine/datasetops/filter_op.h | 6 +- .../dataset/engine/datasetops/map_op.cc | 24 +-- .../dataset/engine/datasetops/map_op.h | 6 +- .../dataset/engine/datasetops/parallel_op.cc | 12 +- .../dataset/engine/datasetops/parallel_op.h | 6 +- .../dataset/engine/datasetops/pipeline_op.cc | 2 +- .../dataset/engine/datasetops/pipeline_op.h | 2 +- .../dataset/engine/datasetops/project_op.cc | 10 +- .../dataset/engine/datasetops/project_op.h | 2 +- .../dataset/engine/datasetops/rename_op.cc | 14 +- .../dataset/engine/datasetops/rename_op.h | 6 +- .../dataset/engine/datasetops/repeat_op.cc | 10 +- .../dataset/engine/datasetops/repeat_op.h | 2 +- .../dataset/engine/datasetops/shuffle_op.cc | 16 +- .../dataset/engine/datasetops/shuffle_op.h | 10 +- .../dataset/engine/datasetops/skip_op.cc | 12 +- .../dataset/engine/datasetops/skip_op.h | 2 +- .../engine/datasetops/source/CMakeLists.txt | 0 .../engine/datasetops/source/celeba_op.cc | 16 +- .../engine/datasetops/source/celeba_op.h | 12 +- .../engine/datasetops/source/cifar_op.cc | 14 +- .../engine/datasetops/source/cifar_op.h | 22 +-- .../engine/datasetops/source/clue_op.cc | 14 +- .../engine/datasetops/source/clue_op.h | 6 +- .../engine/datasetops/source/coco_op.cc | 14 +- .../engine/datasetops/source/coco_op.h | 22 +-- .../engine/datasetops/source/generator_op.cc | 14 +- .../engine/datasetops/source/generator_op.h | 10 +- .../datasetops/source/image_folder_op.cc | 14 +- .../datasetops/source/image_folder_op.h | 24 +-- .../engine/datasetops/source/io_block.cc | 2 +- .../engine/datasetops/source/io_block.h | 4 +- .../engine/datasetops/source/manifest_op.cc | 14 +- .../engine/datasetops/source/manifest_op.h | 22 +-- .../engine/datasetops/source/mindrecord_op.cc | 18 +- .../engine/datasetops/source/mindrecord_op.h | 20 +-- .../engine/datasetops/source/mnist_op.cc | 14 +- .../engine/datasetops/source/mnist_op.h | 20 +-- .../datasetops/source/random_data_op.cc | 14 +- .../engine/datasetops/source/random_data_op.h | 12 +- .../datasetops/source/sampler/CMakeLists.txt | 0 .../source/sampler/distributed_sampler.cc | 6 +- .../source/sampler/distributed_sampler.h | 2 +- .../datasetops/source/sampler/pk_sampler.cc | 4 +- .../datasetops/source/sampler/pk_sampler.h | 2 +- .../source/sampler/python_sampler.cc | 2 +- .../source/sampler/python_sampler.h | 2 +- .../source/sampler/random_sampler.cc | 4 +- .../source/sampler/random_sampler.h | 2 +- .../datasetops/source/sampler/sampler.cc | 2 +- .../datasetops/source/sampler/sampler.h | 8 +- .../source/sampler/sequential_sampler.cc | 2 +- .../source/sampler/sequential_sampler.h | 2 +- .../source/sampler/subset_random_sampler.cc | 8 +- .../source/sampler/subset_random_sampler.h | 2 +- .../source/sampler/weighted_random_sampler.cc | 6 +- .../source/sampler/weighted_random_sampler.h | 2 +- .../engine/datasetops/source/text_file_op.cc | 14 +- .../engine/datasetops/source/text_file_op.h | 16 +- .../engine/datasetops/source/tf_reader_op.cc | 32 ++-- .../engine/datasetops/source/tf_reader_op.h | 12 +- .../engine/datasetops/source/voc_op.cc | 14 +- .../dataset/engine/datasetops/source/voc_op.h | 22 +-- .../dataset/engine/datasetops/take_op.cc | 12 +- .../dataset/engine/datasetops/take_op.h | 2 +- .../dataset/engine/datasetops/zip_op.cc | 14 +- .../dataset/engine/datasetops/zip_op.h | 8 +- .../dataset/engine/db_connector.h | 6 +- .../dataset/engine/execution_tree.cc | 22 +-- .../dataset/engine/execution_tree.h | 6 +- .../dataset/engine/gnn/CMakeLists.txt | 0 .../{ => minddata}/dataset/engine/gnn/edge.h | 6 +- .../dataset/engine/gnn/feature.cc | 2 +- .../dataset/engine/gnn/feature.h | 4 +- .../dataset/engine/gnn/graph.cc | 6 +- .../{ => minddata}/dataset/engine/gnn/graph.h | 14 +- .../dataset/engine/gnn/graph_loader.cc | 10 +- .../dataset/engine/gnn/graph_loader.h | 16 +- .../dataset/engine/gnn/local_edge.cc | 2 +- .../dataset/engine/gnn/local_edge.h | 8 +- .../dataset/engine/gnn/local_node.cc | 6 +- .../dataset/engine/gnn/local_node.h | 6 +- .../{ => minddata}/dataset/engine/gnn/node.h | 4 +- .../dataset/engine/jagged_connector.h | 8 +- .../dataset/engine/opt/CMakeLists.txt | 0 .../opt/optional/tensor_op_fusion_pass.cc | 8 +- .../opt/optional/tensor_op_fusion_pass.h | 2 +- .../{ => minddata}/dataset/engine/opt/pass.cc | 54 +++--- .../{ => minddata}/dataset/engine/opt/pass.h | 4 +- .../dataset/engine/opt/post/repeat_pass.cc | 10 +- .../dataset/engine/opt/post/repeat_pass.h | 2 +- .../dataset/engine/opt/pre/cache_pass.cc | 28 +-- .../dataset/engine/opt/pre/cache_pass.h | 2 +- .../engine/opt/pre/cache_transform_pass.cc | 14 +- .../engine/opt/pre/cache_transform_pass.h | 2 +- .../dataset/engine/opt/pre/removal_nodes.cc | 6 +- .../dataset/engine/opt/pre/removal_nodes.h | 4 +- .../dataset/engine/opt/pre/removal_pass.cc | 6 +- .../dataset/engine/opt/pre/removal_pass.h | 2 +- .../dataset/engine/opt/util/printer_pass.cc | 2 +- .../dataset/engine/opt/util/printer_pass.h | 2 +- .../dataset/engine/perf/CMakeLists.txt | 0 .../dataset/engine/perf/connector_size.cc | 8 +- .../dataset/engine/perf/connector_size.h | 4 +- .../engine/perf/connector_throughput.cc | 6 +- .../engine/perf/connector_throughput.h | 10 +- .../dataset/engine/perf/cyclic_array.h | 2 +- .../engine/perf/dataset_iterator_tracing.cc | 4 +- .../engine/perf/dataset_iterator_tracing.h | 2 +- .../engine/perf/device_queue_tracing.cc | 4 +- .../engine/perf/device_queue_tracing.h | 2 +- .../dataset/engine/perf/monitor.cc | 6 +- .../dataset/engine/perf/monitor.h | 4 +- .../dataset/engine/perf/perf_data.h | 2 +- .../dataset/engine/perf/profiling.cc | 14 +- .../dataset/engine/perf/profiling.h | 2 +- .../dataset/engine/tdt/CMakeLists.txt | 0 .../dataset/engine/tdt/tdt_plugin.cc | 4 +- .../dataset/engine/tdt/tdt_plugin.h | 6 +- .../dataset/include/dataset/core/constants.h | 0 .../dataset/include/dataset/core/data_type.h | 0 .../include/dataset/core/tensor_shape.h | 0 .../dataset/include/dataset/util/status.h | 0 .../{ => minddata}/dataset/include/datasets.h | 6 +- .../{ => minddata}/dataset/include/iterator.h | 2 +- .../{ => minddata}/dataset/include/samplers.h | 0 .../{ => minddata}/dataset/include/status.h | 0 .../{ => minddata}/dataset/include/tensor.h | 0 .../dataset/include/transforms.h | 2 +- .../dataset/include/utils/log_adapter.h | 1 + .../minddata/dataset/include/utils/overload.h | 1 + .../dataset/kernels/CMakeLists.txt | 0 .../dataset/kernels/data/CMakeLists.txt | 0 .../dataset/kernels/data/concatenate_op.cc | 8 +- .../dataset/kernels/data/concatenate_op.h | 4 +- .../dataset/kernels/data/data_utils.cc | 16 +- .../dataset/kernels/data/data_utils.h | 10 +- .../dataset/kernels/data/duplicate_op.cc | 6 +- .../dataset/kernels/data/duplicate_op.h | 4 +- .../dataset/kernels/data/fill_op.cc | 8 +- .../dataset/kernels/data/fill_op.h | 4 +- .../dataset/kernels/data/mask_op.cc | 6 +- .../dataset/kernels/data/mask_op.h | 8 +- .../dataset/kernels/data/one_hot_op.cc | 8 +- .../dataset/kernels/data/one_hot_op.h | 4 +- .../dataset/kernels/data/pad_end_op.cc | 8 +- .../dataset/kernels/data/pad_end_op.h | 4 +- .../dataset/kernels/data/slice_op.cc | 6 +- .../dataset/kernels/data/slice_op.h | 4 +- .../dataset/kernels/data/to_float16_op.cc | 8 +- .../dataset/kernels/data/to_float16_op.h | 4 +- .../dataset/kernels/data/type_cast_op.cc | 8 +- .../dataset/kernels/data/type_cast_op.h | 4 +- .../dataset/kernels/image/CMakeLists.txt | 0 .../kernels/image/bounding_box_augment_op.cc | 8 +- .../kernels/image/bounding_box_augment_op.h | 8 +- .../dataset/kernels/image/center_crop_op.cc | 8 +- .../dataset/kernels/image/center_crop_op.h | 6 +- .../dataset/kernels/image/cut_out_op.cc | 12 +- .../dataset/kernels/image/cut_out_op.h | 8 +- .../dataset/kernels/image/decode_op.cc | 6 +- .../dataset/kernels/image/decode_op.h | 6 +- .../dataset/kernels/image/hwc_to_chw_op.cc | 6 +- .../dataset/kernels/image/hwc_to_chw_op.h | 6 +- .../dataset/kernels/image/image_utils.cc | 12 +- .../dataset/kernels/image/image_utils.h | 6 +- .../dataset/kernels/image/normalize_op.cc | 8 +- .../dataset/kernels/image/normalize_op.h | 8 +- .../dataset/kernels/image/pad_op.cc | 8 +- .../dataset/kernels/image/pad_op.h | 8 +- .../kernels/image/random_color_adjust_op.cc | 10 +- .../kernels/image/random_color_adjust_op.h | 6 +- .../image/random_crop_and_resize_op.cc | 8 +- .../kernels/image/random_crop_and_resize_op.h | 8 +- .../random_crop_and_resize_with_bbox_op.cc | 8 +- .../random_crop_and_resize_with_bbox_op.h | 2 +- .../image/random_crop_decode_resize_op.cc | 8 +- .../image/random_crop_decode_resize_op.h | 12 +- .../dataset/kernels/image/random_crop_op.cc | 8 +- .../dataset/kernels/image/random_crop_op.h | 8 +- .../kernels/image/random_crop_with_bbox_op.cc | 8 +- .../kernels/image/random_crop_with_bbox_op.h | 2 +- .../image/random_horizontal_flip_op.cc | 6 +- .../kernels/image/random_horizontal_flip_op.h | 8 +- .../random_horizontal_flip_with_bbox_op.cc | 8 +- .../random_horizontal_flip_with_bbox_op.h | 8 +- .../dataset/kernels/image/random_resize_op.cc | 10 +- .../dataset/kernels/image/random_resize_op.h | 10 +- .../image/random_resize_with_bbox_op.cc | 6 +- .../image/random_resize_with_bbox_op.h | 12 +- .../kernels/image/random_rotation_op.cc | 10 +- .../kernels/image/random_rotation_op.h | 8 +- .../kernels/image/random_vertical_flip_op.cc | 6 +- .../kernels/image/random_vertical_flip_op.h | 8 +- .../random_vertical_flip_with_bbox_op.cc | 6 +- .../image/random_vertical_flip_with_bbox_op.h | 8 +- .../dataset/kernels/image/rescale_op.cc | 6 +- .../dataset/kernels/image/rescale_op.h | 6 +- .../kernels/image/resize_bilinear_op.cc | 4 +- .../kernels/image/resize_bilinear_op.h | 8 +- .../dataset/kernels/image/resize_op.cc | 6 +- .../dataset/kernels/image/resize_op.h | 8 +- .../kernels/image/resize_with_bbox_op.cc | 16 +- .../kernels/image/resize_with_bbox_op.h | 10 +- .../dataset/kernels/image/uniform_aug_op.cc | 4 +- .../dataset/kernels/image/uniform_aug_op.h | 6 +- .../{ => minddata}/dataset/kernels/no_op.h | 4 +- .../dataset/kernels/py_func_op.cc | 8 +- .../dataset/kernels/py_func_op.h | 4 +- .../dataset/kernels/tensor_op.cc | 2 +- .../dataset/kernels/tensor_op.h | 6 +- .../dataset/text/CMakeLists.txt | 0 .../dataset/text/kernels/CMakeLists.txt | 0 .../text/kernels/basic_tokenizer_op.cc | 2 +- .../dataset/text/kernels/basic_tokenizer_op.h | 14 +- .../dataset/text/kernels/bert_tokenizer_op.cc | 2 +- .../dataset/text/kernels/bert_tokenizer_op.h | 10 +- .../dataset/text/kernels/case_fold_op.cc | 2 +- .../dataset/text/kernels/case_fold_op.h | 6 +- .../text/kernels/jieba_tokenizer_op.cc | 4 +- .../dataset/text/kernels/jieba_tokenizer_op.h | 4 +- .../dataset/text/kernels/lookup_op.cc | 2 +- .../dataset/text/kernels/lookup_op.h | 8 +- .../dataset/text/kernels/ngram_op.cc | 2 +- .../dataset/text/kernels/ngram_op.h | 6 +- .../dataset/text/kernels/normalize_utf8_op.cc | 2 +- .../dataset/text/kernels/normalize_utf8_op.h | 6 +- .../dataset/text/kernels/regex_replace_op.cc | 2 +- .../dataset/text/kernels/regex_replace_op.h | 6 +- .../text/kernels/regex_tokenizer_op.cc | 2 +- .../dataset/text/kernels/regex_tokenizer_op.h | 6 +- .../dataset/text/kernels/to_number_op.cc | 12 +- .../dataset/text/kernels/to_number_op.h | 8 +- .../text/kernels/truncate_sequence_pair_op.cc | 8 +- .../text/kernels/truncate_sequence_pair_op.h | 8 +- .../text/kernels/unicode_char_tokenizer_op.cc | 2 +- .../text/kernels/unicode_char_tokenizer_op.h | 6 +- .../kernels/unicode_script_tokenizer_op.cc | 2 +- .../kernels/unicode_script_tokenizer_op.h | 6 +- .../text/kernels/whitespace_tokenizer_op.cc | 2 +- .../text/kernels/whitespace_tokenizer_op.h | 6 +- .../text/kernels/wordpiece_tokenizer_op.cc | 2 +- .../text/kernels/wordpiece_tokenizer_op.h | 8 +- .../{ => minddata}/dataset/text/vocab.cc | 2 +- .../ccsrc/{ => minddata}/dataset/text/vocab.h | 2 +- .../{ => minddata}/dataset/util/.gitignore | 0 .../dataset/util/CMakeLists.txt | 0 .../{ => minddata}/dataset/util/README.md | 0 .../{ => minddata}/dataset/util/allocator.h | 2 +- .../{ => minddata}/dataset/util/arena.cc | 4 +- .../ccsrc/{ => minddata}/dataset/util/arena.h | 4 +- .../{ => minddata}/dataset/util/auto_index.h | 4 +- .../ccsrc/{ => minddata}/dataset/util/bit.h | 0 .../ccsrc/{ => minddata}/dataset/util/btree.h | 12 +- .../dataset/util/btree_impl.tpp | 0 .../dataset/util/btree_iterator.tpp | 0 .../{ => minddata}/dataset/util/buddy.cc | 6 +- .../ccsrc/{ => minddata}/dataset/util/buddy.h | 2 +- .../{ => minddata}/dataset/util/cache_pool.cc | 4 +- .../{ => minddata}/dataset/util/cache_pool.h | 10 +- .../dataset/util/circular_pool.cc | 4 +- .../dataset/util/circular_pool.h | 6 +- .../{ => minddata}/dataset/util/cond_var.cc | 6 +- .../{ => minddata}/dataset/util/cond_var.h | 6 +- .../dataset/util/intrp_resource.h | 2 +- .../dataset/util/intrp_service.cc | 6 +- .../dataset/util/intrp_service.h | 10 +- .../ccsrc/{ => minddata}/dataset/util/list.h | 0 .../ccsrc/{ => minddata}/dataset/util/lock.cc | 2 +- .../ccsrc/{ => minddata}/dataset/util/lock.h | 0 .../dataset/util/memory_pool.cc | 2 +- .../{ => minddata}/dataset/util/memory_pool.h | 2 +- .../ccsrc/{ => minddata}/dataset/util/path.cc | 2 +- .../ccsrc/{ => minddata}/dataset/util/path.h | 2 +- .../ccsrc/{ => minddata}/dataset/util/queue.h | 8 +- .../{ => minddata}/dataset/util/random.h | 4 +- .../{ => minddata}/dataset/util/semaphore.cc | 4 +- .../{ => minddata}/dataset/util/semaphore.h | 2 +- .../{ => minddata}/dataset/util/service.cc | 2 +- .../{ => minddata}/dataset/util/service.h | 4 +- .../{ => minddata}/dataset/util/services.cc | 10 +- .../{ => minddata}/dataset/util/services.h | 6 +- .../dataset/util/sig_handler.cc | 4 +- .../{ => minddata}/dataset/util/sig_handler.h | 0 .../{ => minddata}/dataset/util/slice.cc | 2 +- .../ccsrc/{ => minddata}/dataset/util/slice.h | 4 +- .../{ => minddata}/dataset/util/status.cc | 4 +- .../{ => minddata}/dataset/util/status.h | 0 .../dataset/util/storage_container.cc | 6 +- .../dataset/util/storage_container.h | 10 +- .../dataset/util/storage_manager.cc | 6 +- .../dataset/util/storage_manager.h | 16 +- .../{ => minddata}/dataset/util/system_pool.h | 4 +- .../ccsrc/{ => minddata}/dataset/util/task.cc | 4 +- .../ccsrc/{ => minddata}/dataset/util/task.h | 10 +- .../dataset/util/task_manager.cc | 2 +- .../dataset/util/task_manager.h | 12 +- .../ccsrc/{ => minddata}/dataset/util/treap.h | 0 .../{ => minddata}/dataset/util/wait_post.cc | 4 +- .../{ => minddata}/dataset/util/wait_post.h | 4 +- .../{ => minddata}/mindrecord/CMakeLists.txt | 0 .../mindrecord/common/shard_error.cc | 2 +- .../mindrecord/common/shard_pybind.cc | 12 +- .../mindrecord/common/shard_utils.cc | 2 +- .../mindrecord/include/common/shard_pybind.h | 2 +- .../mindrecord/include/common/shard_utils.h | 2 +- .../mindrecord/include/shard_category.h | 2 +- .../mindrecord/include/shard_column.h | 2 +- .../include/shard_distributed_sample.h | 6 +- .../mindrecord/include/shard_error.h | 0 .../mindrecord/include/shard_header.h | 12 +- .../mindrecord/include/shard_index.h | 6 +- .../include/shard_index_generator.h | 2 +- .../mindrecord/include/shard_operator.h | 2 +- .../mindrecord/include/shard_page.h | 2 +- .../mindrecord/include/shard_pk_sample.h | 6 +- .../mindrecord/include/shard_reader.h | 20 +-- .../mindrecord/include/shard_sample.h | 4 +- .../mindrecord/include/shard_schema.h | 6 +- .../mindrecord/include/shard_segment.h | 2 +- .../include/shard_sequential_sample.h | 2 +- .../mindrecord/include/shard_shuffle.h | 2 +- .../mindrecord/include/shard_statistics.h | 6 +- .../mindrecord/include/shard_task.h | 2 +- .../mindrecord/include/shard_writer.h | 10 +- .../mindrecord/io/shard_index_generator.cc | 2 +- .../mindrecord/io/shard_reader.cc | 4 +- .../mindrecord/io/shard_segment.cc | 4 +- .../mindrecord/io/shard_writer.cc | 4 +- .../mindrecord/meta/shard_category.cc | 2 +- .../mindrecord/meta/shard_column.cc | 6 +- .../meta/shard_distributed_sample.cc | 2 +- .../mindrecord/meta/shard_header.cc | 6 +- .../mindrecord/meta/shard_index.cc | 2 +- .../mindrecord/meta/shard_page.cc | 2 +- .../mindrecord/meta/shard_pk_sample.cc | 2 +- .../mindrecord/meta/shard_sample.cc | 2 +- .../mindrecord/meta/shard_schema.cc | 2 +- .../meta/shard_sequential_sample.cc | 2 +- .../mindrecord/meta/shard_shuffle.cc | 2 +- .../mindrecord/meta/shard_statistics.cc | 2 +- .../mindrecord/meta/shard_task.cc | 4 +- .../parallel/ops_info/ops_info_head_files.h | 41 ----- .../ccsrc/pipeline/{ => jit}/CMakeLists.txt | 2 +- mindspore/ccsrc/pipeline/{ => jit}/action.cc | 24 +-- mindspore/ccsrc/pipeline/{ => jit}/action.h | 2 +- mindspore/ccsrc/pipeline/{ => jit}/base.h | 2 +- mindspore/ccsrc/pipeline/{ => jit}/init.cc | 22 +-- .../{ => jit}/parse/data_converter.cc | 12 +- .../pipeline/{ => jit}/parse/data_converter.h | 4 +- .../{ => jit}/parse/function_block.cc | 8 +- .../pipeline/{ => jit}/parse/function_block.h | 2 +- .../ccsrc/pipeline/{ => jit}/parse/parse.cc | 8 +- .../ccsrc/pipeline/{ => jit}/parse/parse.h | 6 +- .../pipeline/{ => jit}/parse/parse_base.h | 0 .../{ => jit}/parse/python_adapter.cc | 2 +- .../pipeline/{ => jit}/parse/python_adapter.h | 2 +- .../ccsrc/pipeline/{ => jit}/parse/resolve.cc | 14 +- .../ccsrc/pipeline/{ => jit}/parse/resolve.h | 4 +- mindspore/ccsrc/pipeline/{ => jit}/pass.cc | 28 +-- mindspore/ccsrc/pipeline/{ => jit}/pass.h | 2 +- .../ccsrc/pipeline/{ => jit}/pipeline.cc | 24 +-- mindspore/ccsrc/pipeline/{ => jit}/pipeline.h | 4 +- .../ccsrc/pipeline/{ => jit}/pipeline_ge.cc | 10 +- .../ccsrc/pipeline/{ => jit}/pipeline_ge.h | 4 +- .../{ => jit}/remove_value_node_dup.cc | 4 +- .../{ => jit}/remove_value_node_dup.h | 0 .../ccsrc/pipeline/{ => jit}/resource.cc | 12 +- mindspore/ccsrc/pipeline/{ => jit}/resource.h | 4 +- .../static_analysis/abstract_function.cc | 4 +- .../static_analysis/abstract_function.h | 0 .../{ => jit}/static_analysis/evaluator.cc | 2 +- .../{ => jit}/static_analysis/evaluator.h | 2 +- .../{ => jit}/static_analysis/prim.cc | 16 +- .../pipeline/{ => jit}/static_analysis/prim.h | 2 +- .../static_analysis/program_specialize.cc | 8 +- .../static_analysis/program_specialize.h | 2 +- .../static_analysis/static_analysis.cc | 10 +- .../static_analysis/static_analysis.h | 4 +- .../ccsrc/pipeline/{ => jit}/validator.cc | 4 +- .../ccsrc/pipeline/{ => jit}/validator.h | 2 +- .../{ => pipeline}/pynative/CMakeLists.txt | 2 +- .../ccsrc/{ => pipeline}/pynative/base.h | 0 .../pynative/pynative_execute.cc | 38 ++-- .../pynative/pynative_execute.h | 6 +- .../pynative/pynative_execute_ge.cc | 10 +- .../pynative/pynative_execute_ge.h | 8 +- .../converter/attr_utils/convert_util.h | 2 +- .../ccsrc/predict/converter/kernel2ms.cc | 2 +- mindspore/ccsrc/predict/converter/kernel2ms.h | 2 +- .../converter/lite_model/op_attr_packer.h | 2 +- mindspore/ccsrc/predict/predict.h | 2 +- .../ccsrc/{ => runtime}/device/CMakeLists.txt | 2 +- .../device/ascend/ascend_device_address.cc | 8 +- .../device/ascend/ascend_device_address.h | 4 +- .../device/ascend/ascend_kernel_runtime.cc | 28 +-- .../device/ascend/ascend_kernel_runtime.h | 8 +- .../device/ascend/ascend_label_assign.cc | 4 +- .../device/ascend/ascend_label_assign.h | 2 +- .../device/ascend/ascend_memory_manager.cc | 4 +- .../device/ascend/ascend_memory_manager.h | 2 +- .../device/ascend/ascend_memory_pool.cc | 4 +- .../device/ascend/ascend_memory_pool.h | 2 +- .../device/ascend/ascend_stream_assign.cc | 8 +- .../device/ascend/ascend_stream_assign.h | 2 +- .../device/ascend/dump/data_dumper.cc | 6 +- .../device/ascend/dump/data_dumper.h | 2 +- .../device/ascend/dump/ge_dump.h | 0 .../device/ascend/dump/proto/ge_dtype.proto | 0 .../ascend/dump/proto/op_mapping_info.proto | 0 .../device/ascend/kernel_build_ascend.cc | 28 +-- .../device/ascend/kernel_build_ascend.h | 2 +- .../device/ascend/kernel_select_ascend.cc | 16 +- .../device/ascend/kernel_select_ascend.h | 2 +- .../ascend/kernel_select_graph_kernel.cc | 12 +- .../device/ascend/profiling/plugin_impl.cc | 2 +- .../device/ascend/profiling/plugin_impl.h | 0 .../ascend/profiling/profiling_engine_impl.cc | 4 +- .../ascend/profiling/profiling_engine_impl.h | 0 .../ascend/profiling/profiling_manager.cc | 6 +- .../ascend/profiling/profiling_manager.h | 0 .../ascend/profiling/profiling_utils.cc | 14 +- .../device/ascend/profiling/profiling_utils.h | 4 +- .../profiling/reporter/desc_reporter.cc | 4 +- .../ascend/profiling/reporter/desc_reporter.h | 4 +- .../profiling/reporter/graph_desc_reporter.cc | 4 +- .../profiling/reporter/graph_desc_reporter.h | 2 +- .../profiling/reporter/point_reporter.cc | 2 +- .../profiling/reporter/point_reporter.h | 2 +- .../profiling/reporter/profiling_desc.cc | 2 +- .../profiling/reporter/profiling_desc.h | 0 .../profiling/reporter/task_desc_reporter.cc | 6 +- .../profiling/reporter/task_desc_reporter.h | 2 +- .../{ => runtime}/device/ascend/readme.md | 0 .../device/ascend/tasksink/runtime_utils.cc | 2 +- .../device/ascend/tasksink/runtime_utils.h | 0 .../device/ascend/tasksink/task_generator.cc | 8 +- .../device/ascend/tasksink/task_generator.h | 4 +- .../device/convert_tensor_utils.cc | 2 +- .../device/convert_tensor_utils.h | 0 .../device/cpu/cpu_device_address.cc | 4 +- .../device/cpu/cpu_device_address.h | 2 +- .../device/cpu/cpu_kernel_runtime.cc | 12 +- .../device/cpu/cpu_kernel_runtime.h | 10 +- .../device/cpu/cpu_resource_manager.cc | 4 +- .../device/cpu/cpu_resource_manager.h | 8 +- .../device/cpu/cpu_simple_mem_plan.cc | 4 +- .../device/cpu/cpu_simple_mem_plan.h | 4 +- .../device/cpu/kernel_select_cpu.cc | 4 +- .../device/cpu/kernel_select_cpu.h | 0 .../device/cpu/mpi/mpi_adapter.cc | 2 +- .../device/cpu/mpi/mpi_adapter.h | 0 .../ccsrc/{ => runtime}/device/cpu/readme.md | 0 .../{ => runtime}/device/device_address.h | 0 .../device/gpu/blocking_queue.cc | 4 +- .../{ => runtime}/device/gpu/blocking_queue.h | 0 .../{ => runtime}/device/gpu/cuda_common.h | 2 +- .../{ => runtime}/device/gpu/cuda_driver.cc | 2 +- .../{ => runtime}/device/gpu/cuda_driver.h | 0 .../gpu/distribution/collective_common.h | 0 .../gpu/distribution/collective_fake_init.cc | 2 +- .../gpu/distribution/collective_fake_init.h | 0 .../gpu/distribution/collective_init.cc | 2 +- .../device/gpu/distribution/collective_init.h | 0 .../gpu/distribution/collective_wrapper.cc | 4 +- .../device/gpu/distribution/mpi_wrapper.cc | 4 +- .../device/gpu/distribution/mpi_wrapper.h | 2 +- .../device/gpu/distribution/nccl_wrapper.cc | 2 +- .../device/gpu/distribution/nccl_wrapper.h | 2 +- .../device/gpu/gpu_buffer_mgr.cc | 2 +- .../{ => runtime}/device/gpu/gpu_buffer_mgr.h | 2 +- .../{ => runtime}/device/gpu/gpu_common.h | 0 .../device/gpu/gpu_device_address.cc | 6 +- .../device/gpu/gpu_device_address.h | 2 +- .../device/gpu/gpu_device_manager.cc | 6 +- .../device/gpu/gpu_device_manager.h | 4 +- .../device/gpu/gpu_kernel_build.cc | 14 +- .../device/gpu/gpu_kernel_build.h | 2 +- .../device/gpu/gpu_kernel_runtime.cc | 24 +-- .../device/gpu/gpu_kernel_runtime.h | 6 +- .../device/gpu/gpu_memory_allocator.cc | 4 +- .../device/gpu/gpu_memory_allocator.h | 4 +- .../device/gpu/gpu_memory_copy_manager.cc | 8 +- .../device/gpu/gpu_memory_copy_manager.h | 8 +- .../device/gpu/gpu_memory_manager.cc | 4 +- .../device/gpu/gpu_memory_manager.h | 2 +- .../device/gpu/gpu_stream_assign.cc | 8 +- .../device/gpu/gpu_stream_assign.h | 4 +- .../device/gpu/kernel_info_setter.cc | 16 +- .../device/gpu/kernel_info_setter.h | 0 .../device/gpu/mpi/mpi_initializer.cc | 2 +- .../device/gpu/mpi/mpi_initializer.h | 0 .../ccsrc/{ => runtime}/device/gpu/readme.md | 0 .../{ => runtime}/device/kernel_adjust.cc | 12 +- .../{ => runtime}/device/kernel_adjust.h | 10 +- .../ccsrc/{ => runtime}/device/kernel_info.cc | 2 +- .../ccsrc/{ => runtime}/device/kernel_info.h | 6 +- .../{ => runtime}/device/kernel_runtime.cc | 14 +- .../{ => runtime}/device/kernel_runtime.h | 10 +- .../device/kernel_runtime_manager.cc | 2 +- .../device/kernel_runtime_manager.h | 2 +- .../{ => runtime}/device/memory_manager.cc | 4 +- .../{ => runtime}/device/memory_manager.h | 4 +- .../transform/{ => graph_ir}/CMakeLists.txt | 4 +- .../ccsrc/transform/{ => graph_ir}/all_ops.h | 0 .../ccsrc/transform/{ => graph_ir}/convert.cc | 4 +- .../ccsrc/transform/{ => graph_ir}/convert.h | 6 +- .../{ => graph_ir}/df_graph_manager.cc | 6 +- .../{ => graph_ir}/df_graph_manager.h | 2 +- .../transform/{ => graph_ir}/graph_builder.cc | 2 +- .../transform/{ => graph_ir}/graph_builder.h | 4 +- .../transform/{ => graph_ir}/graph_runner.cc | 2 +- .../transform/{ => graph_ir}/graph_runner.h | 6 +- .../transform/{ => graph_ir}/op_adapter.h | 2 +- .../{ => graph_ir}/op_adapter_base.h | 6 +- .../{ => graph_ir}/op_adapter_util.cc | 4 +- .../{ => graph_ir}/op_adapter_util.h | 2 +- .../transform/{ => graph_ir}/op_declare.cc | 4 +- .../transform/{ => graph_ir}/op_declare.h | 2 +- .../ccsrc/transform/{ => graph_ir}/types.h | 0 .../ccsrc/transform/{ => graph_ir}/util.cc | 2 +- .../ccsrc/transform/{ => graph_ir}/util.h | 2 +- .../ccsrc/{ => transform}/onnx/CMakeLists.txt | 2 +- .../ccsrc/{ => transform}/onnx/ir_exporter.cc | 2 +- .../{ => transform}/onnx/onnx_exporter.cc | 2 +- mindspore/ccsrc/utils/callbacks.cc | 4 +- mindspore/ccsrc/utils/callbacks_ge.cc | 8 +- mindspore/ccsrc/utils/callbacks_ge.h | 4 +- mindspore/ccsrc/utils/context/ms_context.cc | 2 +- mindspore/ccsrc/utils/convert_utils.cc | 4 +- mindspore/ccsrc/utils/graph_utils_extends.cc | 4 +- .../ccsrc/utils/load_onnx/anf_model_parser.cc | 2 +- mindspore/ccsrc/utils/primitive_utils.cc | 2 +- mindspore/ccsrc/utils/tensorprint_utils.cc | 2 +- mindspore/ccsrc/vm/backend.cc | 2 +- mindspore/ccsrc/vm/backend.h | 2 +- mindspore/ccsrc/vm/segment_runner.cc | 2 +- mindspore/ccsrc/vm/transform.cc | 2 +- mindspore/ccsrc/vm/transform.h | 2 +- mindspore/ccsrc/vm/vm.cc | 2 +- mindspore/ccsrc/vm/vmimpl.cc | 2 +- mindspore/{ccsrc => core}/ir/CMakeLists.txt | 0 mindspore/{ccsrc => core}/ir/anf.cc | 2 +- mindspore/{ccsrc => core}/ir/anf.h | 0 mindspore/{ccsrc => core}/ir/anf_extends.cc | 6 +- mindspore/{ccsrc => core}/ir/anf_py.cc | 0 mindspore/{ccsrc => core}/ir/dtype.cc | 0 mindspore/{ccsrc => core}/ir/dtype.h | 0 .../{ccsrc => core}/ir/dtype/container.cc | 0 .../{ccsrc => core}/ir/dtype/container.h | 0 mindspore/{ccsrc => core}/ir/dtype/empty.cc | 0 mindspore/{ccsrc => core}/ir/dtype/empty.h | 0 mindspore/{ccsrc => core}/ir/dtype/number.cc | 0 mindspore/{ccsrc => core}/ir/dtype/number.h | 0 mindspore/{ccsrc => core}/ir/dtype/ref.cc | 0 mindspore/{ccsrc => core}/ir/dtype/ref.h | 0 mindspore/{ccsrc => core}/ir/dtype/type.cc | 0 mindspore/{ccsrc => core}/ir/dtype/type.h | 0 .../{ccsrc => core}/ir/dtype/type_extends.cc | 0 mindspore/{ccsrc => core}/ir/dtype/type_id.h | 0 mindspore/{ccsrc => core}/ir/dtype_extends.cc | 0 mindspore/{ccsrc => core}/ir/dtype_py.cc | 0 mindspore/{ccsrc => core}/ir/func_graph.cc | 2 +- mindspore/{ccsrc => core}/ir/func_graph.h | 0 .../{ccsrc => core}/ir/func_graph_cloner.cc | 2 +- .../{ccsrc => core}/ir/func_graph_cloner.h | 0 .../{ccsrc => core}/ir/func_graph_extends.cc | 6 +- mindspore/{ccsrc => core}/ir/func_graph_py.cc | 0 .../ir/lite/param_value_lite.h | 0 mindspore/{ccsrc => core}/ir/lite/tensor.cc | 0 mindspore/{ccsrc => core}/ir/lite/tensor.h | 0 mindspore/{ccsrc => core}/ir/manager.cc | 2 +- mindspore/{ccsrc => core}/ir/manager.h | 0 .../{ccsrc => core}/ir/meta_func_graph.cc | 4 +- .../{ccsrc => core}/ir/meta_func_graph.h | 0 mindspore/{ccsrc => core}/ir/meta_tensor.cc | 0 mindspore/{ccsrc => core}/ir/meta_tensor.h | 0 .../{ccsrc => core}/ir/meta_tensor_extends.cc | 0 mindspore/{ccsrc => core}/ir/named.cc | 0 mindspore/{ccsrc => core}/ir/named.h | 0 .../{ccsrc => core}/ir/optimizer_caller.h | 0 mindspore/{ccsrc => core}/ir/param_value.h | 0 .../{ccsrc => core}/ir/param_value_py.cc | 0 .../{ccsrc => core}/ir/pattern_matcher.h | 2 +- mindspore/{ccsrc => core}/ir/primitive.cc | 0 mindspore/{ccsrc => core}/ir/primitive.h | 2 +- .../{ccsrc => core}/ir/primitive_extends.cc | 2 +- mindspore/{ccsrc => core}/ir/primitive_py.cc | 6 +- mindspore/{ccsrc => core}/ir/primitive_py.h | 2 +- mindspore/{ccsrc => core}/ir/scalar.h | 0 mindspore/{ccsrc => core}/ir/scope.cc | 0 mindspore/{ccsrc => core}/ir/scope.h | 0 mindspore/{ccsrc => core}/ir/signature.h | 0 mindspore/{ccsrc => core}/ir/signature_py.cc | 2 +- mindspore/{ccsrc => core}/ir/tensor.cc | 2 +- mindspore/{ccsrc => core}/ir/tensor.h | 2 +- mindspore/{ccsrc => core}/ir/tensor_py.cc | 2 +- mindspore/{ccsrc => core}/ir/tensor_py.h | 0 mindspore/{ccsrc => core}/ir/value.cc | 0 mindspore/{ccsrc => core}/ir/value.h | 0 mindspore/{ccsrc => core}/ir/value_extends.cc | 0 mindspore/{ccsrc => core}/ir/value_py.cc | 0 mindspore/{ccsrc => core}/ir/visitor.cc | 0 mindspore/{ccsrc => core}/ir/visitor.h | 0 tests/ut/cpp/CMakeLists.txt | 128 +++++++------- tests/ut/cpp/abstract/abstract_test.cc | 12 +- tests/ut/cpp/abstract/utils_test.cc | 2 +- tests/ut/cpp/common/backend_common_test.cc | 8 +- tests/ut/cpp/common/backend_common_test.h | 2 +- tests/ut/cpp/common/py_func_graph_fetcher.h | 4 +- tests/ut/cpp/common/test_main.cc | 4 +- tests/ut/cpp/dataset/arena_test.cc | 2 +- tests/ut/cpp/dataset/batch_op_test.cc | 6 +- tests/ut/cpp/dataset/bit_functions_test.cc | 2 +- .../dataset/bounding_box_augment_op_test.cc | 4 +- tests/ut/cpp/dataset/btree_test.cc | 8 +- tests/ut/cpp/dataset/c_api_test.cc | 12 +- tests/ut/cpp/dataset/cache_op_test.cc | 20 +-- tests/ut/cpp/dataset/celeba_op_test.cc | 10 +- tests/ut/cpp/dataset/center_crop_op_test.cc | 4 +- tests/ut/cpp/dataset/channel_swap_test.cc | 4 +- tests/ut/cpp/dataset/cifar_op_test.cc | 16 +- tests/ut/cpp/dataset/circular_pool_test.cc | 6 +- tests/ut/cpp/dataset/client_config_test.cc | 8 +- tests/ut/cpp/dataset/clue_op_test.cc | 6 +- tests/ut/cpp/dataset/coco_op_test.cc | 24 +-- tests/ut/cpp/dataset/common/bboxop_common.cc | 6 +- tests/ut/cpp/dataset/common/bboxop_common.h | 2 +- tests/ut/cpp/dataset/common/cvop_common.cc | 4 +- tests/ut/cpp/dataset/common/cvop_common.h | 2 +- tests/ut/cpp/dataset/concat_op_test.cc | 2 +- tests/ut/cpp/dataset/concatenate_op_test.cc | 2 +- tests/ut/cpp/dataset/connector_test.cc | 4 +- tests/ut/cpp/dataset/cut_out_op_test.cc | 2 +- tests/ut/cpp/dataset/cyclic_array_test.cc | 2 +- tests/ut/cpp/dataset/datatype_test.cc | 4 +- tests/ut/cpp/dataset/decode_op_test.cc | 2 +- tests/ut/cpp/dataset/duplicate_op_test.cc | 6 +- tests/ut/cpp/dataset/execution_tree_test.cc | 10 +- tests/ut/cpp/dataset/fill_op_test.cc | 2 +- tests/ut/cpp/dataset/filter_op_test.cc | 4 +- tests/ut/cpp/dataset/global_context_test.cc | 2 +- tests/ut/cpp/dataset/gnn_graph_test.cc | 6 +- tests/ut/cpp/dataset/image_folder_op_test.cc | 24 +-- tests/ut/cpp/dataset/interrupt_test.cc | 8 +- .../ut/cpp/dataset/jieba_tokenizer_op_test.cc | 2 +- tests/ut/cpp/dataset/manifest_op_test.cc | 12 +- tests/ut/cpp/dataset/map_op_test.cc | 12 +- tests/ut/cpp/dataset/mask_test.cc | 12 +- tests/ut/cpp/dataset/memory_pool_test.cc | 8 +- tests/ut/cpp/dataset/mind_record_op_test.cc | 10 +- tests/ut/cpp/dataset/mnist_op_test.cc | 24 +-- tests/ut/cpp/dataset/normalize_op_test.cc | 4 +- tests/ut/cpp/dataset/one_hot_op_test.cc | 2 +- tests/ut/cpp/dataset/pad_end_op_test.cc | 2 +- tests/ut/cpp/dataset/pad_op_test.cc | 2 +- tests/ut/cpp/dataset/path_test.cc | 2 +- tests/ut/cpp/dataset/perf_data_test.cc | 4 +- tests/ut/cpp/dataset/project_op_test.cc | 2 +- tests/ut/cpp/dataset/queue_test.cc | 4 +- .../dataset/random_color_adjust_op_test.cc | 4 +- .../dataset/random_crop_and_resize_op_test.cc | 2 +- ...andom_crop_and_resize_with_bbox_op_test.cc | 6 +- .../random_crop_decode_resize_op_test.cc | 8 +- tests/ut/cpp/dataset/random_crop_op_test.cc | 2 +- .../dataset/random_crop_with_bbox_op_test.cc | 6 +- tests/ut/cpp/dataset/random_data_op_test.cc | 8 +- .../dataset/random_horizontal_flip_op_test.cc | 2 +- .../random_horizontal_flip_with_bbox_test.cc | 2 +- tests/ut/cpp/dataset/random_resize_op_test.cc | 2 +- .../random_resize_with_bbox_op_test.cc | 6 +- .../ut/cpp/dataset/random_rotation_op_test.cc | 4 +- .../dataset/random_vertical_flip_op_test.cc | 2 +- .../random_vertical_flip_with_bbox_op_test.cc | 2 +- tests/ut/cpp/dataset/rename_op_test.cc | 12 +- tests/ut/cpp/dataset/repeat_op_test.cc | 4 +- tests/ut/cpp/dataset/rescale_op_test.cc | 2 +- .../ut/cpp/dataset/resize_bilinear_op_test.cc | 2 +- tests/ut/cpp/dataset/resize_op_test.cc | 2 +- .../cpp/dataset/resize_with_bbox_op_test.cc | 2 +- tests/ut/cpp/dataset/schema_test.cc | 10 +- tests/ut/cpp/dataset/shuffle_op_test.cc | 2 +- tests/ut/cpp/dataset/skip_op_test.cc | 4 +- .../cpp/dataset/stand_alone_samplers_test.cc | 14 +- tests/ut/cpp/dataset/status_test.cc | 2 +- .../cpp/dataset/subset_random_sampler_test.cc | 10 +- tests/ut/cpp/dataset/take_op_test.cc | 2 +- tests/ut/cpp/dataset/task_manager_test.cc | 2 +- .../cpp/dataset/tensor_op_fusion_pass_test.cc | 10 +- tests/ut/cpp/dataset/tensor_string_test.cc | 8 +- tests/ut/cpp/dataset/tensor_test.cc | 8 +- tests/ut/cpp/dataset/tensorshape_test.cc | 8 +- tests/ut/cpp/dataset/text_file_op_test.cc | 6 +- tests/ut/cpp/dataset/tfReader_op_test.cc | 4 +- tests/ut/cpp/dataset/to_float16_op_test.cc | 6 +- tests/ut/cpp/dataset/tokenizer_op_test.cc | 16 +- tests/ut/cpp/dataset/treap_test.cc | 2 +- tests/ut/cpp/dataset/trucate_pair_test.cc | 6 +- tests/ut/cpp/dataset/type_cast_op_test.cc | 12 +- tests/ut/cpp/dataset/voc_op_test.cc | 24 +-- .../dataset/weighted_random_sampler_test.cc | 10 +- tests/ut/cpp/dataset/zip_op_test.cc | 16 +- .../cpp/device/ascend_kernel_runtime_test.cc | 2 +- tests/ut/cpp/device/ascend_profiling_test.cc | 6 +- tests/ut/cpp/ir/anf_test.cc | 2 +- tests/ut/cpp/ir/clone_test.cc | 2 +- tests/ut/cpp/ir/manager_test.cc | 4 +- tests/ut/cpp/kernel/common_utils_test.cc | 2 +- .../cpu/sparse_apply_adam_cpu_kernel_test.cc | 2 +- .../cpu/sparse_apply_ftrl_cpu_kernel_test.cc | 2 +- .../sparse_apply_lazy_adam_cpu_kernel_test.cc | 2 +- ..._apply_proximal_adagrad_cpu_kernel_test.cc | 2 +- tests/ut/cpp/mindrecord/ut_common.h | 8 +- tests/ut/cpp/mindrecord/ut_shard.cc | 8 +- .../ut/cpp/mindrecord/ut_shard_header_test.cc | 14 +- .../ut_shard_index_generator_test.cc | 8 +- .../cpp/mindrecord/ut_shard_operator_test.cc | 10 +- tests/ut/cpp/mindrecord/ut_shard_page_test.cc | 2 +- .../ut/cpp/mindrecord/ut_shard_reader_test.cc | 4 +- .../ut/cpp/mindrecord/ut_shard_schema_test.cc | 6 +- .../cpp/mindrecord/ut_shard_segment_test.cc | 2 +- .../ut/cpp/mindrecord/ut_shard_writer_test.cc | 6 +- .../cpp/operator/cc_implementations_test.cc | 2 +- tests/ut/cpp/operator/composite_test.cc | 8 +- .../cpp/operator/grad_implementations_test.cc | 2 +- tests/ut/cpp/operator/ops_test.cc | 2 +- tests/ut/cpp/operator/prim2func_test.cc | 2 +- tests/ut/cpp/optimizer/ad/ad_test.cc | 8 +- tests/ut/cpp/optimizer/cconv_test.cc | 2 +- tests/ut/cpp/optimizer/clean_test.cc | 4 +- tests/ut/cpp/optimizer/lib_test.cc | 8 +- tests/ut/cpp/optimizer/opt_test.cc | 10 +- tests/ut/cpp/optimizer/optimizer_test.cc | 8 +- .../parallel/auto_parallel/dp_algo_test.cc | 12 +- .../auto_parallel/edge_costmodel_test.cc | 6 +- .../auto_parallel/graph_costmodel_test.cc | 6 +- .../auto_parallel/operator_costmodel_test.cc | 8 +- .../auto_parallel/rec_partition_test.cc | 6 +- tests/ut/cpp/parallel/device_manager_test.cc | 6 +- tests/ut/cpp/parallel/device_matrix_test.cc | 2 +- tests/ut/cpp/parallel/group_manager_test.cc | 6 +- .../parallel/ops_info/activation_info_test.cc | 8 +- .../cpp/parallel/ops_info/activation_test.cc | 6 +- .../cpp/parallel/ops_info/gelu_info_test.cc | 8 +- .../ops_info/generate_strategy_test.cc | 8 +- .../parallel/ops_info/get_next_info_test.cc | 8 +- .../ops_info/l2_normalize_info_test.cc | 8 +- .../ops_info/log_softmax_info_test.cc | 8 +- .../cpp/parallel/ops_info/matmul_info_test.cc | 10 +- .../cpp/parallel/ops_info/onehot_info_test.cc | 8 +- .../ops_info/onehot_info_test_axis_0.cc | 8 +- .../ut/cpp/parallel/ops_info/pow_info_test.cc | 8 +- tests/ut/cpp/parallel/ops_info/prelu_test.cc | 8 +- .../parallel/ops_info/reduce_method_test.cc | 8 +- .../ut/cpp/parallel/ops_info/reshape_test.cc | 8 +- .../softmax_entropy_loss_info_test.cc | 8 +- .../parallel/ops_info/softmax_info_test.cc | 8 +- .../cpp/parallel/ops_info/tanh_info_test.cc | 8 +- .../parallel/ops_info/tensor_add_info_test.cc | 8 +- .../cpp/parallel/ops_info/tmpidentity_test.cc | 8 +- .../cpp/parallel/ops_info/transpose_test.cc | 8 +- .../cpp/parallel/step_auto_parallel_test.cc | 12 +- tests/ut/cpp/parallel/step_parallel_test.cc | 8 +- tests/ut/cpp/parallel/strategy_test.cc | 2 +- .../tensor_layout/construct_operator_test.cc | 8 +- .../redistribution_layout_transfer_test.cc | 4 +- .../redistribution_operator_infer_test.cc | 4 +- .../reshape_layout_transfer_test.cc | 4 +- .../parallel/tensor_layout/shape_util_test.cc | 2 +- .../tensor_layout/tensor_layout_test.cc | 2 +- .../tensor_redistribution_test.cc | 2 +- .../tensor_layout/util_layout_gen_test.cc | 2 +- .../tensor_layout/util_layout_gen_test.h | 2 +- tests/ut/cpp/parallel/virtual_dataset_test.cc | 8 +- .../pipeline/parse/parser_abnormal_test.cc | 2 +- .../cpp/pipeline/parse/parser_class_test.cc | 2 +- .../pipeline/parse/parser_integrate_test.cc | 2 +- .../pipeline/parse/parser_primitive_test.cc | 2 +- tests/ut/cpp/pipeline/parse/parser_test.cc | 2 +- tests/ut/cpp/pipeline/parse/resolve_test.cc | 2 +- tests/ut/cpp/pipeline/resource_test.cc | 4 +- .../cpp/pipeline/static_analysis/data_test.cc | 4 +- .../static_analysis/evaluator_test.cc | 4 +- .../ut/cpp/pipeline/static_analysis/helper.cc | 2 +- .../ut/cpp/pipeline/static_analysis/helper.h | 2 +- .../cpp/pipeline/static_analysis/prim_test.cc | 4 +- .../static_analysis/specialize_test.cc | 4 +- .../static_analysis/static_analysis_test.cc | 10 +- .../buffer_fusion/buffer_fusion_test.cc | 34 ++-- .../enhancer/getnext_memcpy_elimination.cc | 10 +- .../insert_memcpy_async_for_getnext.cc | 14 +- .../insert_memcpy_async_for_hccl_op_test.cc | 10 +- .../format_type/check_consistency_test.cc | 16 +- .../ascend/format_type/insert_cast_test.cc | 14 +- .../format_type/insert_trans_op_test.cc | 12 +- .../format_type/merge_cast_to_op_test.cc | 10 +- .../ascend/ir_fission/addn_fission_test.cc | 2 +- .../batch_norm_bert_fission_test.cc | 2 +- .../batch_norm_grad_infer_fission_test.cc | 2 +- .../ascend/ir_fission/bn_grad_split_test.cc | 10 +- .../ascend/ir_fission/bn_split_test.cc | 14 +- .../ascend/ir_fission/lars_v2_fission_test.cc | 2 +- .../ir_fission/layer_norm_grad_split_test.cc | 10 +- .../single_batch_norm_fission_test.cc | 2 +- .../ascend/ir_fission/split_fission_test.cc | 2 +- .../ascend/ir_fission/topk_split_test.cc | 8 +- .../ascend/ir_fission/transdata_split_test.cc | 10 +- .../ir_fusion/adam_apply_one_fusion_test.cc | 2 +- .../adam_apply_one_with_decay_rule_test.cc | 4 +- .../ir_fusion/add_input_to_output_test.cc | 2 +- .../ir_fusion/batchnorm_to_bninfer_test.cc | 4 +- .../batchnormgrad_to_bninfergrad_test.cc | 4 +- ...p_by_norm_no_div_square_sum_fusion_test.cc | 4 +- .../ir_fusion/clip_by_value_fusion_test.cc | 4 +- .../confusion_mul_grad_fusion_test.cc | 4 +- .../ir_fusion/confusion_softmax_grad_test.cc | 4 +- .../ascend/ir_fusion/derelu_fusion_test.cc | 4 +- .../ir_fusion/fused_batch_norm_fusion_test.cc | 2 +- .../ir_fusion/lamb_next_mv_rule_test.cc | 2 +- .../lamb_next_mv_with_decay_rule_test.cc | 2 +- .../lamb_next_mv_with_decay_v1_rule_test.cc | 2 +- .../ir_fusion/lamb_next_right_rule_test.cc | 2 +- .../lamb_update_with_lr_rule_fusion_test.cc | 4 +- .../ir_fusion/lamb_update_with_lr_v2_test.cc | 2 +- ...er_norm_beta_gamma_backprop_fusion_test.cc | 6 +- .../ir_fusion/matmul_biasadd_fusion_test.cc | 2 +- .../momentum_lossscale_fusion_test.cc | 2 +- .../ascend/ir_fusion/mul_add_fusion_test.cc | 2 +- .../ascend/ir_fusion/mul_addn_fusion_test.cc | 2 +- .../reshape_transpose_fusion_test.cc | 4 +- .../ir_fusion/softmax_grad_ext_fusion_test.cc | 4 +- .../ir_fusion/square_sum_fusion_test.cc | 4 +- .../transpose_reshape_fusion_test.cc | 4 +- .../transpose_transdata_fusion_test.cc | 10 +- .../common/pattern_engine_test.cc | 4 +- .../pre_activate/mem_reuse/kernel_ref_test.cc | 2 +- .../mem_reuse/mem_reuse_allocator_test.cc | 6 +- .../pre_activate/mem_reuse/mem_reuse_test.cc | 22 +-- .../pass/allreduce_fusion_test.cc | 14 +- .../common_subexpression_elimination_test.cc | 14 +- .../const_to_attr_strided_slice_grad_test.cc | 10 +- .../pass/convert_const_input_to_attr_test.cc | 10 +- ...onvert_const_input_to_tensor_input_test.cc | 8 +- ...nvert_tuple_input_to_dynamic_input_test.cc | 8 +- .../convert_tuple_output_to_maketuple_test.cc | 8 +- .../pass/eliminate_redundant_op_test.cc | 20 +-- .../pre_activate/pass/getitem_tuple_test.cc | 10 +- .../pass/optimize_dependence_test.cc | 4 +- .../ut/cpp/pynative/pynative_execute_test.cc | 8 +- .../cpp/session/anf_runtime_algorithm_test.cc | 10 +- tests/ut/cpp/session/kernel_graph_test.cc | 8 +- tests/ut/cpp/session/session_basic_test.cc | 8 +- tests/ut/cpp/stub/aicpu/aicpu_stub.cc | 2 +- tests/ut/cpp/stub/ge/ge_task_launch_stub.cc | 2 +- .../ut/cpp/stub/kernel/kernel_fusion_stub.cc | 4 +- .../parallel_strategy_checkpoint_stub.cc | 2 +- .../tasksink/ascend_stream_assign_stub.cc | 6 +- tests/ut/cpp/stub/tasksink/task_sink_stub.cc | 2 +- tests/ut/cpp/transform/convert_test.cc | 10 +- tests/ut/cpp/transform/graph_builder_test.cc | 4 +- tests/ut/cpp/transform/graph_manager_test.cc | 2 +- tests/ut/cpp/transform/graph_runner_test.cc | 10 +- tests/ut/cpp/transform/op_adapter_test.cc | 4 +- tests/ut/cpp/transform/transform_base_test.h | 4 +- tests/ut/cpp/utils/any_test.cc | 2 +- tests/ut/cpp/utils/callback_test.cc | 6 +- tests/ut/cpp/utils/graph_utils_test.cc | 4 +- tests/ut/cpp/utils/ir_import_test.cc | 6 +- tests/ut/cpp/utils/symbolic_test.cc | 2 +- tests/ut/cpp/utils/validator_test.cc | 8 +- tests/ut/cpp/vm/segment_runner_test.cc | 6 +- tests/ut/cpp/vm/vm_test.cc | 2 +- 1863 files changed, 5304 insertions(+), 5291 deletions(-) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/CMakeLists.txt (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_kernel_build.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_kernel_build.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_kernel_metadata.cc (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_kernel_metadata.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_kernel_mod.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_kernel_mod.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_util.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/aicpu_util.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/proto/attr.proto (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/proto/node_def.proto (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/proto/tensor.proto (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/proto/tensor_shape.proto (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/aicpu/proto/types.proto (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/akg_kernel_attrs_process.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/akg_kernel_attrs_process.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/akg_kernel_build.cc (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/akg_kernel_build.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/akg_kernel_metadata.cc (88%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/akg_kernel_metadata.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/ascend/akg_ascend_kernel_build.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/ascend/akg_ascend_kernel_build.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/ascend/akg_ascend_kernel_mod.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/ascend/akg_ascend_kernel_mod.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/gpu/akg_gpu_kernel_build.cc (85%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/gpu/akg_gpu_kernel_build.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/gpu/akg_gpu_kernel_mod.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/akg/gpu/akg_gpu_kernel_mod.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/ascend_kernel_mod.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/common_utils.cc (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/common_utils.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/addn_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/addn_cpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/allgather_cpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/allgather_cpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/apply_momentum_cpu_kernel.cc (90%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/apply_momentum_cpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/argmax_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/argmax_cpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/bias_add_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/bias_add_cpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/bias_add_grad_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/bias_add_grad_cpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/concat_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/concat_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/cpu_kernel_factory.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/cpu_kernel_factory.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/debug_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/debug_cpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/embedding_look_up_comm_grad_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/embedding_look_up_comm_grad_cpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/embedding_look_up_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/embedding_look_up_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/equal_count_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/equal_count_cpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/gather_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/gather_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/conv2d_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/conv2d_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/lstm_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/lstm_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/lstm_grad_cpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/lstm_grad_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/matmul_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/matmul_cpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/mkl_cpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/mkl_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/mkl_kernel_engine.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/mkl_kernel_engine.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/mul_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/mul_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/pooling_cpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/pooling_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/pooling_grad_cpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/pooling_grad_cpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/relu_cpu_kernel.cc (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/relu_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/relu_grad_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/relu_grad_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/softmax_cpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/softmax_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/one_hot_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/one_hot_cpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/apply_momentum_ps_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/apply_momentum_ps_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/embedding_look_up_proxy_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/embedding_look_up_proxy_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/embedding_look_up_ps_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/embedding_look_up_ps_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/pserver_kernel.cc (88%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/pserver_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/pull_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/pull_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/push_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/push_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/sparse_apply_adam_ps_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/sparse_apply_adam_ps_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/sparse_apply_ftrl_ps_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/ps/sparse_apply_ftrl_ps_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/reduce_cpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/reduce_cpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/reduce_scatter_cpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/reduce_scatter_cpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/reshape_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/reshape_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/slice_cpu_kernel.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/slice_cpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/slice_grad_cpu_kernel.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/slice_grad_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_adam_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_adam_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_ftrl_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_ftrl_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_lazy_adam_cpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_lazy_adam_cpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sub_cpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/sub_cpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/transpose_cpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/cpu/transpose_cpu_kernel.h (90%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/argmax_gpu_kernel.cc (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/argmax_gpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/argmaxwithvalue_gpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/argmaxwithvalue_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/array_reduce_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/array_reduce_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/concatv2_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/concatv2_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/gather_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/gather_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/one_hot_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/one_hot_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/select_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/select_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/slice_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/slice_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/slice_grad_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/slice_grad_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/transpose_gpu_kernel.cc (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/transpose_gpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/arrays/unsorted_segment_sum_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/control/recv_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/control/recv_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/control/send_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/control/send_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/adam_impl.cu (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/adam_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/adam_weight_decay_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/adam_weight_decay_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/argmax_impl.cu (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/argmax_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/argmaxwithvalue_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/argmaxwithvalue_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/assign_add_impl.cu (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/assign_add_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/batchnorm_fold2_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/batchnorm_fold2_impl.cuh (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/batchnorm_fold_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/batchnorm_fold_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/broadcast_grad_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/broadcast_grad_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/broadcast_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/broadcast_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/concatv2_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/concatv2_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/correction_mul_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/correction_mul_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/cross_entropy_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/cross_entropy_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/dropout_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/dropout_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/equalcount_impl.cu (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/equalcount_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/fake_quant_perchannel_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/fake_quant_perchannel_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/fake_quant_perlayer_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/fake_quant_perlayer_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/float_status_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/float_status_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/ftrl_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/ftrl_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/gather.cu (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/gather.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/gelu_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/gelu_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/layer_norm_grad_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/layer_norm_grad_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/layer_norm_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/layer_norm_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/minmax_update_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/minmax_update_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/momentum_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/momentum_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/one_hot_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/one_hot_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/pad_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/pad_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/random_op_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/random_op_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/rmsprop_impl.cu (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/rmsprop_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/select_impl.cu (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/select_impl.cuh (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/slice_impl.cu (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/slice_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/smooth_l1_loss_impl.cu (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/smooth_l1_loss_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/transpose_impl.cu (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/transpose_impl.cuh (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/unary_op_impl.cu (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/unary_op_impl.cuh (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/unsorted_segment_sum.cu (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/cuda_impl/unsorted_segment_sum.cuh (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/data/dataset_init_kernel.cc (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/data/dataset_init_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/data/dataset_iterator_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/data/dataset_iterator_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/data/dataset_utils.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/data/dataset_utils.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/gpu_kernel.h (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/gpu_kernel_factory.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/gpu_kernel_factory.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/kernel_constants.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/addn_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/addn_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/assign_add_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/assign_add_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/bias_add_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/bias_add_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/broadcast_gpu_kernel.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/broadcast_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/broadcast_grad_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/broadcast_grad_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/equalcount_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/equalcount_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/float_status_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/float_status_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/matmul_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/matmul_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/random_op_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/random_op_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/unary_op_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/math/unary_op_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nccl/nccl_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nccl/nccl_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/activation_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/activation_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/activation_grad_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/activation_grad_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/adam_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/adam_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/bias_add_grad_gpu_kenel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/bias_add_grad_gpu_kenel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/conv2d_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/conv2d_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/conv2d_grad_filter_gpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/conv2d_grad_filter_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/conv2d_grad_input_gpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/conv2d_grad_input_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/ctcloss_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/ctcloss_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/dropout_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/dropout_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/dropout_grad_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/dropout_grad_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/flatten_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/flatten_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/flatten_grad_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/flatten_grad_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/ftrl_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/ftrl_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/fused_adam_weight_decay.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/fused_adam_weight_decay.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/fused_batch_norm_gpu_kernel.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/fused_batch_norm_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/fused_batchnorm_grad_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/gelu_grad_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/gelu_grad_kernel.h (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/gelu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/gelu_kernel.h (90%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/layer_norm_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/layer_norm_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/layer_norm_grad_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/layer_norm_grad_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/lstm_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/lstm_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/lstm_grad_data_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/lstm_grad_data_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/lstm_grad_weight_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/lstm_grad_weight_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/momentum_gpu_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/momentum_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/pooling_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/pooling_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/pooling_grad_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/pooling_grad_gpu_kernel.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/rmsprop_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/rmsprop_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/smooth_l1_loss_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/smooth_l1_loss_gpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/softmax_gpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/softmax_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/softmax_grad_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/softmax_grad_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/other/assign_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/other/assign_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold2_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold2_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold_gpu_kernel.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/batchnorm_fold_grad_gpu_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/correction_mul_gpu_kernel.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/correction_mul_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/correction_mul_grad_gpu_kernel.cc (88%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/correction_mul_grad_gpu_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perchannel_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perchannel_gpu_kernel.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perlayer_gpu_kernel.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perlayer_gpu_kernel.h (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h (91%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/minmax_update_perchannel_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/minmax_update_perchannel_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/minmax_update_perlayer_gpu_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/gpu/quant/minmax_update_perlayer_gpu_kernel.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hccl_kernel.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hccl_kernel.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hccl_kernel_build.cc (88%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hccl_kernel_build.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hccl_kernel_metadata.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hccl_kernel_metadata.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_broadcast.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_broadcast.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_gather.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_gather.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_reduce.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_reduce.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_reduce_scatter.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_all_reduce_scatter.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_util.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/hccl/hcom_util.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kash/kernel_pack.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel_build_info.cc (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel_build_info.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel_fusion.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel_fusion.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel_query.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/kernel_query.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/oplib/opinfo.h (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/oplib/oplib.cc (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/oplib/oplib.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/oplib/oploader.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/assign.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/assign.h (92%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/label_goto.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/label_goto.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/label_set.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/label_set.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/label_switch.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/label_switch.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/memcpy_async.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/memcpy_async.h (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/profiling_kernel_mod.cc (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/profiling_kernel_mod.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/recv.cc (94%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/recv.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/rt_kernel.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/rt_kernel.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/rt_kernel_build.cc (88%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/rt_kernel_build.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/rt_kernel_info.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/rt_kernel_info.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/send.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/send.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/stream_active.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/stream_active.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/stream_switch.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/rts/stream_switch.h (93%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/task_stream.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_adapter.cc (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_adapter.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_convert_utils.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_convert_utils.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_build.cc (99%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_build.h (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_mod.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_mod.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_parallel_build.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_parallel_build.h (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/common_utils.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/tbe_kernel_select.cc (97%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_kernel_select/tbe_kernel_select.h (95%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_python_funcs.cc (98%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_python_funcs.h (100%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_utils.cc (96%) rename mindspore/ccsrc/{kernel => backend/kernel_compiler}/tbe/tbe_utils.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/CMakeLists.txt (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ascend_backend_optimization.cc (78%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ascend_backend_optimization.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ascend_helper.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ascend_helper.h (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc (89%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv_double_in_fusion_pass.cc (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv_double_in_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv_single_in_fusion_pass.cc (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/conv_single_in_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/eltwise_fusion_pass.cc (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/eltwise_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/fusion_base_pass.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/fusion_base_pass.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/multi_output_fusion_pass.cc (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/multi_output_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/segment_eltwise_fusion_pass.h (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/ub_pattern_fusion.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/buffer_fusion/ub_pattern_fusion.h (85%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/getnext_memcpy_elimination.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/getnext_memcpy_elimination.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/insert_memcpy_async_for_getnext.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/insert_memcpy_async_for_getnext.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/insert_memcpy_async_for_hccl_op.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/insert_pad_for_nms_with_mask.cc (89%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/enhancer/insert_pad_for_nms_with_mask.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/chang_axis_of_reduce_kernel.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/chang_axis_of_reduce_kernel.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/check_consistency.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/check_consistency.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc (89%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/convert_unsupported_transnode_to_aicpu.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/deal_ref_trans_and_cast.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/deal_ref_trans_and_cast.h (89%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/insert_cast.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/insert_cast.h (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/insert_trans_op.cc (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/insert_trans_op.h (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/insert_transdata_for_runop.cc (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/insert_transdata_for_runop.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/merge_cast_to_op.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/merge_cast_to_op.h (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/modify_ops_attrs.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/modify_ops_attrs.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/rectify_do_mask_kernel_info.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/rectify_do_mask_kernel_info.h (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/remove_no_use_reshape_op.cc (88%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/format_type/remove_no_use_reshape_op.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/addn_fission.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/addn_fission.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/batch_norm_bert_fission.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/batch_norm_bert_fission.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/batch_norm_grad_infer_fission.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/batch_norm_grad_infer_fission.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/batch_norm_grad_split.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/batch_norm_grad_split.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/bn_grad_split.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/bn_grad_split.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/bn_split.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/bn_split.h (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/lars_v2_fission.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/lars_v2_fission.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/layer_norm_grad_split.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/layer_norm_grad_split.h (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/single_batch_norm_fission.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/single_batch_norm_fission.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/split_fission.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/split_fission.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/topk_split.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/topk_split.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/transdata_split.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fission/transdata_split.h (86%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/adam_apply_one_fusion.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/adam_apply_one_fusion.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/adam_apply_one_with_decay_rule.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/add_input_to_output.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/add_input_to_output.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/batchnorm_to_bninfer.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/batchnorm_to_bninfer.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/clip_by_value_fusion.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/clip_by_value_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/confusion_mul_grad_fusion.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/confusion_mul_grad_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/confusion_softmax_grad_rule.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/confusion_softmax_grad_rule.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/derelu_fusion.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/derelu_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/fused_batch_norm_fusion.cc (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/fused_batch_norm_fusion.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/input_to_output_registry.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/input_to_output_registry.h (100%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_mv_rule.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_mv_rule.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_right_rule.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_next_right_rule.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_update_with_lr_v2.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/lamb_update_with_lr_v2.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/matmul_biasadd_fusion.cc (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/matmul_biasadd_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/momentum_lossscale_fusion.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/momentum_lossscale_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/mul_add_fusion.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/mul_add_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/mul_addn_fusion.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/mul_addn_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/parameter_and_transop_fusion.cc (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/parameter_and_transop_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/refresh_parameter_format.cc (86%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/refresh_parameter_format.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/remove_reshape_pair.cc (92%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/remove_reshape_pair.h (90%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/reshape_transpose_fusion.cc (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/reshape_transpose_fusion.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/softmax_grad_ext_fusion.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/softmax_grad_ext_fusion.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/square_sum_fusion.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/square_sum_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/transpose_reshape_fusion.cc (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/transpose_reshape_fusion.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/transpose_transdata_fusion.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/ascend/ir_fusion/transpose_transdata_fusion.h (89%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/common_backend_optimization.cc (83%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/common_backend_optimization.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/fusion_id_allocator.cc (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/fusion_id_allocator.h (100%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/helper.cc (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/helper.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/node_pass.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/node_pass.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/optimizer.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/optimizer.h (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/pass.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/pass_manager.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/pass_manager.h (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/pattern_engine.cc (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/pattern_engine.h (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/visit.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/common/visit.h (100%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/gpu/adam_fusion.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/gpu/adam_fusion.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/gpu/adam_weight_decay_fusion.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/gpu/adam_weight_decay_fusion.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/kernel_refcount.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/kernel_refcount.h (100%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_copy_manager.h (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_dynamic_allocator.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_dynamic_allocator.h (100%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_reuse.cc (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_reuse.h (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_reuse_allocator.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_reuse_allocator.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_reuse_checker.cc (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_reuse_checker.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_swap_manager.cc (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/mem_reuse/mem_swap_manager.h (98%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/add_atomic_clean.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/add_atomic_clean.h (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/common_subexpression_elimination.cc (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/common_subexpression_elimination.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/communication_op_fusion.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/communication_op_fusion.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/const_input_to_attr_registry.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/const_input_to_attr_registry.h (100%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/const_to_attr_strided_slice_grad.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/const_to_attr_strided_slice_grad.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_const_input_to_attr.cc (84%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_const_input_to_attr.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_const_input_to_tensor_input.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_const_input_to_tensor_input.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_tuple_input_to_dynamic_input.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_tuple_input_to_dynamic_input.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_tuple_output_to_maketuple.cc (93%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/convert_tuple_output_to_maketuple.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/eliminate_redundant_op.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/eliminate_redundant_op.h (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/erase_visit_attr.cc (88%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/erase_visit_attr.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/fuse_basic.cc (97%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/fuse_basic.h (91%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/fuse_graph_kernel.cc (99%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/fuse_graph_kernel.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/getitem_tuple.cc (94%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/getitem_tuple.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/optimize_dependence.cc (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/optimize_dependence.h (96%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/replace_node_by_proxy.cc (95%) rename mindspore/ccsrc/{pre_activate => backend/optimizer}/pass/replace_node_by_proxy.h (93%) rename mindspore/ccsrc/{ => backend}/session/CMakeLists.txt (89%) rename mindspore/ccsrc/{ => backend}/session/anf_runtime_algorithm.cc (99%) rename mindspore/ccsrc/{ => backend}/session/anf_runtime_algorithm.h (98%) rename mindspore/ccsrc/{ => backend}/session/ascend_control_parser.cc (99%) rename mindspore/ccsrc/{ => backend}/session/ascend_control_parser.h (98%) rename mindspore/ccsrc/{ => backend}/session/ascend_inference_session.cc (93%) rename mindspore/ccsrc/{ => backend}/session/ascend_inference_session.h (86%) rename mindspore/ccsrc/{ => backend}/session/ascend_session.cc (98%) rename mindspore/ccsrc/{ => backend}/session/ascend_session.h (97%) rename mindspore/ccsrc/{ => backend}/session/cpu_session.cc (94%) rename mindspore/ccsrc/{ => backend}/session/cpu_session.h (90%) rename mindspore/ccsrc/{ => backend}/session/gpu_session.cc (93%) rename mindspore/ccsrc/{ => backend}/session/gpu_session.h (95%) rename mindspore/ccsrc/{ => backend}/session/kernel_graph.cc (99%) rename mindspore/ccsrc/{ => backend}/session/kernel_graph.h (99%) rename mindspore/ccsrc/{ => backend}/session/session.cc (96%) rename mindspore/ccsrc/{ => backend}/session/session.h (97%) rename mindspore/ccsrc/{ => backend}/session/session_basic.cc (99%) rename mindspore/ccsrc/{ => backend}/session/session_basic.h (97%) rename mindspore/ccsrc/{ => backend}/session/session_context.cc (95%) rename mindspore/ccsrc/{ => backend}/session/session_context.h (97%) rename mindspore/ccsrc/{ => backend}/session/session_factory.cc (96%) rename mindspore/ccsrc/{ => backend}/session/session_factory.h (97%) delete mode 100644 mindspore/ccsrc/dataset/core/client.h delete mode 120000 mindspore/ccsrc/dataset/include/utils/log_adapter.h delete mode 120000 mindspore/ccsrc/dataset/include/utils/overload.h rename mindspore/ccsrc/{ => frontend}/operator/CMakeLists.txt (72%) rename mindspore/ccsrc/{ => frontend}/operator/cc_implementations.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/cc_implementations.h (100%) rename mindspore/ccsrc/{ => frontend}/operator/composite/composite.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/composite/composite.h (95%) rename mindspore/ccsrc/{ => frontend}/operator/composite/do_signature.cc (98%) rename mindspore/ccsrc/{ => frontend}/operator/composite/do_signature.h (97%) rename mindspore/ccsrc/{ => frontend}/operator/composite/list_append_operation.cc (95%) rename mindspore/ccsrc/{ => frontend}/operator/composite/list_append_operation.h (100%) rename mindspore/ccsrc/{ => frontend}/operator/composite/map.cc (98%) rename mindspore/ccsrc/{ => frontend}/operator/composite/map.h (98%) rename mindspore/ccsrc/{ => frontend}/operator/composite/multitype_funcgraph.cc (97%) rename mindspore/ccsrc/{ => frontend}/operator/composite/multitype_funcgraph.h (97%) rename mindspore/ccsrc/{ => frontend}/operator/composite/unpack_call.cc (96%) rename mindspore/ccsrc/{ => frontend}/operator/composite/unpack_call.h (96%) rename mindspore/ccsrc/{ => frontend}/operator/composite/zip_operation.cc (96%) rename mindspore/ccsrc/{ => frontend}/operator/composite/zip_operation.h (97%) rename mindspore/ccsrc/{ => frontend}/operator/ops.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/ops.h (100%) rename mindspore/ccsrc/{ => frontend}/operator/ops_extends.cc (90%) rename mindspore/ccsrc/{ => frontend}/operator/prim_arrays.cc (98%) rename mindspore/ccsrc/{ => frontend}/operator/prim_debug.cc (94%) rename mindspore/ccsrc/{ => frontend}/operator/prim_maths.cc (95%) rename mindspore/ccsrc/{ => frontend}/operator/prim_nn.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/prim_others.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/prim_statement.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/prim_structures.cc (99%) rename mindspore/ccsrc/{ => frontend}/operator/prim_to_function.cc (98%) rename mindspore/ccsrc/{ => frontend}/operator/prim_to_function.h (100%) rename mindspore/ccsrc/{ => frontend}/optimizer/CMakeLists.txt (71%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/adjoint.cc (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/adjoint.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/dfunctor.cc (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/dfunctor.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/grad.cc (96%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/grad.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/ad/kprim.cc (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/clean.cc (99%) rename mindspore/ccsrc/{ => frontend}/optimizer/clean.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/control_depend.cc (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/control_depend.h (100%) rename mindspore/ccsrc/{ => frontend}/optimizer/cse.cc (99%) rename mindspore/ccsrc/{ => frontend}/optimizer/cse.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/graph_kernel_reuse.cc (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/graph_kernel_reuse.h (93%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass.cc (85%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/arithmetic_simplify.cc (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/arithmetic_simplify.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/branch_culling.cc (99%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/branch_culling.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/cast_eliminate.cc (90%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/cast_eliminate.h (96%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/convert.h (94%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/env_item_eliminate.h (99%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/grad_var_prepare.cc (95%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/grad_var_prepare.h (90%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/gradient_eliminate.cc (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/gradient_eliminate.h (91%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/incorporate_call.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/incorporate_getitem.h (99%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/indexed_slices_eliminate.h (94%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/inline.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/item_tuple_eliminate.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/mark_interface_fusion.h (92%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/merge_addn.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/minmax_grad.h (96%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/param_replace.h (92%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/partial_eliminate.h (95%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/prim_eliminate.h (94%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/reduce_eliminate.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/ref_eliminate.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/reshape_eliminate.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/special_op_eliminate.h (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/specialize_transform.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/symbol_resolver.h (92%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/tile_eliminate.h (94%) rename mindspore/ccsrc/{ => frontend}/optimizer/irpass/transpose_eliminate.h (94%) rename mindspore/ccsrc/{ => frontend}/optimizer/opt.cc (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/opt.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/optimizer.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/pass_group.cc (97%) rename mindspore/ccsrc/{ => frontend}/optimizer/pass_group.h (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/py_pass.cc (98%) rename mindspore/ccsrc/{ => frontend}/optimizer/py_pass.h (100%) rename mindspore/ccsrc/{ => frontend}/optimizer/py_pass_manager.cc (96%) rename mindspore/ccsrc/{ => frontend}/optimizer/py_pass_manager.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/CMakeLists.txt (86%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/allreduce_fusion.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/allreduce_fusion.h (96%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/allreduce_graph.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/allreduce_graph.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/allreduce_node.cc (96%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/allreduce_node.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/step_allreduce_fusion.cc (90%) rename mindspore/ccsrc/{ => frontend}/parallel/allreduce_fusion/step_allreduce_fusion.h (96%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/costmodel.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/costmodel.h (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/dp_algo_costmodel.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/dp_algo_costmodel.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/edge_costmodel.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/edge_costmodel.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/graph_costmodel.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/graph_costmodel.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/operator_costmodel.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/operator_costmodel.h (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_cost.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_cost.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_generate_strategy.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_generate_strategy.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_graph.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_parse_graph.cc (95%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_parse_graph.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_partition.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_partition.h (87%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_strategy.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/auto_parallel/rec_core/rec_tensor.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/context.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/context.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/costmodel_context.cc (96%) rename mindspore/ccsrc/{ => frontend}/parallel/costmodel_context.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/device.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/device_manager.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/device_manager.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/device_matrix.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/device_matrix.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/dynamic_creator.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/generate_graph.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/generate_graph.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/get_parallel_info.cc (92%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/get_parallel_info.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/graph_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/graph_info.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/node_info.cc (92%) rename mindspore/ccsrc/{ => frontend}/parallel/graph_util/node_info.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/group_manager.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/group_manager.h (96%) rename mindspore/ccsrc/{ => frontend}/parallel/node_check.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/node_check.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/activation_info.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/activation_info.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/arithmetic_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/arithmetic_info.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/batch_parallel_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/batch_parallel_info.h (96%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/bias_add_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/bias_add_info.h (92%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/comparison_function_info.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/dropout_do_mask_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/dropout_do_mask_info.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/elementary_function_info.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/gather_v2_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/gather_v2_info.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/gather_v2_p_info.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/gather_v2_p_info.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/get_next_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/get_next_info.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/l2_normalize_info.cc (94%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/l2_normalize_info.h (90%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/layer_norm_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/layer_norm_info.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/loss_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/loss_info.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/matmul_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/matmul_info.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/onehot_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/onehot_info.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/operator_info.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/operator_info.h (97%) create mode 100644 mindspore/ccsrc/frontend/parallel/ops_info/ops_info_head_files.h rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/ops_utils.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/prelu_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/prelu_info.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/reduce_method_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/reduce_method_info.h (96%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/reshape_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/reshape_info.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/tmp_identity_info.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/tmp_identity_info.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/transpose_info.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/transpose_info.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/virtual_dataset_info.cc (96%) rename mindspore/ccsrc/{ => frontend}/parallel/ops_info/virtual_dataset_info.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/common.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/optimizer_info.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/optimizer_info.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/optimizer_info_builder.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/optimizer_info_builder.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/parameter_server.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/scheduler.cc (91%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/scheduler.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/util.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/util.h (96%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/worker.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/ps/worker_proxy.h (99%) rename mindspore/ccsrc/{ => frontend}/parallel/status.h (100%) rename mindspore/ccsrc/{ => frontend}/parallel/step_auto_parallel.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/step_auto_parallel.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/step_parallel.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/step_parallel.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/strategy.h (98%) rename mindspore/ccsrc/{ => frontend}/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/arrangement.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/arrangement.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/array.cc (95%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/array.h (97%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/construct_operator.cc (99%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/construct_operator.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/layout_transfer.cc (92%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/layout_transfer.h (93%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/map.cc (97%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/map.h (91%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/redistribution_layout_transfer.cc (91%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/redistribution_layout_transfer.h (88%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/redistribution_operator_infer.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/redistribution_operator_infer.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/reshape_layout_transfer.cc (96%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/reshape_layout_transfer.h (95%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/shape_util.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/shape_util.h (99%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/tensor_info.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/tensor_layout.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/tensor_layout.h (94%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/tensor_redistribution.cc (98%) rename mindspore/ccsrc/{ => frontend}/parallel/tensor_layout/tensor_redistribution.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/CMakeLists.txt (94%) rename mindspore/ccsrc/{ => minddata}/dataset/api/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/api/datasets.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/api/de_pipeline.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/api/de_pipeline.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/api/iterator.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/api/python_bindings.cc (90%) rename mindspore/ccsrc/{ => minddata}/dataset/api/samplers.cc (92%) rename mindspore/ccsrc/{ => minddata}/dataset/api/transforms.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/core/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/core/client.cc (80%) create mode 100644 mindspore/ccsrc/minddata/dataset/core/client.h rename mindspore/ccsrc/{ => minddata}/dataset/core/config_manager.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/core/config_manager.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/core/constants.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/core/cv_tensor.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/core/cv_tensor.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/core/data_type.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/core/data_type.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/core/example.proto (100%) rename mindspore/ccsrc/{ => minddata}/dataset/core/feature.proto (100%) rename mindspore/ccsrc/{ => minddata}/dataset/core/global_context.cc (86%) rename mindspore/ccsrc/{ => minddata}/dataset/core/global_context.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/core/pybind_support.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/core/tensor.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/core/tensor.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/core/tensor_row.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/core/tensor_row.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/core/tensor_shape.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/core/tensor_shape.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_client.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_client.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_request.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_request.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_server.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_server.h (87%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_service.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/cache_service.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/cache/de_tensor.fbs (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/connector.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/data_buffer.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/data_buffer.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/data_schema.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/data_schema.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/dataset_iterator.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/dataset_iterator.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/barrier_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/barrier_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/batch_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/batch_op.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/bucket_batch_by_length_op.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/bucket_batch_by_length_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/build_vocab_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/build_vocab_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_base_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_base_op.h (87%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_lookup_op.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_lookup_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_merge_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_merge_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/cache_op.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/concat_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/concat_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/dataset_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/dataset_op.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/device_queue_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/device_queue_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/filter_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/filter_op.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/map_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/map_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/parallel_op.cc (89%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/parallel_op.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/pipeline_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/pipeline_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/project_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/project_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/rename_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/rename_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/repeat_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/repeat_op.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/shuffle_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/shuffle_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/skip_op.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/skip_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/celeba_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/celeba_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/cifar_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/cifar_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/clue_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/clue_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/coco_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/coco_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/generator_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/generator_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/image_folder_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/image_folder_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/io_block.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/io_block.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/manifest_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/manifest_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/mindrecord_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/mindrecord_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/mnist_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/mnist_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/random_data_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/random_data_op.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/distributed_sampler.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/distributed_sampler.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/pk_sampler.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/pk_sampler.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/python_sampler.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/python_sampler.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/random_sampler.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/random_sampler.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/sampler.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/sampler.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/sequential_sampler.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/sequential_sampler.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/subset_random_sampler.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/text_file_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/text_file_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/tf_reader_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/tf_reader_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/voc_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/source/voc_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/take_op.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/take_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/zip_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/datasetops/zip_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/db_connector.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/execution_tree.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/execution_tree.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/edge.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/feature.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/feature.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/graph.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/graph.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/graph_loader.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/graph_loader.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/local_edge.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/local_edge.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/local_node.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/local_node.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/gnn/node.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/jagged_connector.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/optional/tensor_op_fusion_pass.cc (88%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/optional/tensor_op_fusion_pass.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pass.cc (82%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pass.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/post/repeat_pass.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/post/repeat_pass.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/cache_pass.cc (88%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/cache_pass.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/cache_transform_pass.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/cache_transform_pass.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/removal_nodes.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/removal_nodes.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/removal_pass.cc (90%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/pre/removal_pass.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/util/printer_pass.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/opt/util/printer_pass.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/connector_size.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/connector_size.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/connector_throughput.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/connector_throughput.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/cyclic_array.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/dataset_iterator_tracing.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/dataset_iterator_tracing.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/device_queue_tracing.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/device_queue_tracing.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/monitor.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/monitor.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/perf_data.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/profiling.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/perf/profiling.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/tdt/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/tdt/tdt_plugin.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/engine/tdt/tdt_plugin.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/include/dataset/core/constants.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/dataset/core/data_type.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/dataset/core/tensor_shape.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/dataset/util/status.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/datasets.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/include/iterator.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/include/samplers.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/status.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/tensor.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/include/transforms.h (99%) create mode 120000 mindspore/ccsrc/minddata/dataset/include/utils/log_adapter.h create mode 120000 mindspore/ccsrc/minddata/dataset/include/utils/overload.h rename mindspore/ccsrc/{ => minddata}/dataset/kernels/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/concatenate_op.cc (90%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/concatenate_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/data_utils.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/data_utils.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/duplicate_op.cc (87%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/duplicate_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/fill_op.cc (81%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/fill_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/mask_op.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/mask_op.h (89%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/one_hot_op.cc (88%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/one_hot_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/pad_end_op.cc (86%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/pad_end_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/slice_op.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/slice_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/to_float16_op.cc (84%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/to_float16_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/type_cast_op.cc (85%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/data/type_cast_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/bounding_box_augment_op.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/bounding_box_augment_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/center_crop_op.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/center_crop_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/cut_out_op.cc (86%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/cut_out_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/decode_op.cc (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/decode_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/hwc_to_chw_op.cc (89%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/hwc_to_chw_op.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/image_utils.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/image_utils.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/normalize_op.cc (89%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/normalize_op.h (88%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/pad_op.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/pad_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_color_adjust_op.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_color_adjust_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_and_resize_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_and_resize_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc (89%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_decode_resize_op.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_decode_resize_op.h (86%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_with_bbox_op.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_crop_with_bbox_op.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_horizontal_flip_op.cc (85%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_horizontal_flip_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc (90%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_resize_op.cc (81%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_resize_op.h (88%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_resize_with_bbox_op.cc (86%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_resize_with_bbox_op.h (85%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_rotation_op.cc (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_rotation_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_vertical_flip_op.cc (85%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_vertical_flip_op.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/random_vertical_flip_with_bbox_op.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/rescale_op.cc (87%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/rescale_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/resize_bilinear_op.cc (89%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/resize_bilinear_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/resize_op.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/resize_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/resize_with_bbox_op.cc (80%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/resize_with_bbox_op.h (86%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/uniform_aug_op.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/image/uniform_aug_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/no_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/py_func_op.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/py_func_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/tensor_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/kernels/tensor_op.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/text/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/basic_tokenizer_op.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/basic_tokenizer_op.h (87%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/bert_tokenizer_op.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/bert_tokenizer_op.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/case_fold_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/case_fold_op.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/jieba_tokenizer_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/jieba_tokenizer_op.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/lookup_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/lookup_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/ngram_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/ngram_op.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/normalize_utf8_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/normalize_utf8_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/regex_replace_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/regex_replace_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/regex_tokenizer_op.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/regex_tokenizer_op.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/to_number_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/to_number_op.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/truncate_sequence_pair_op.cc (90%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/truncate_sequence_pair_op.h (87%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/unicode_char_tokenizer_op.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/unicode_char_tokenizer_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/unicode_script_tokenizer_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/unicode_script_tokenizer_op.h (92%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/whitespace_tokenizer_op.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/whitespace_tokenizer_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/wordpiece_tokenizer_op.cc (96%) rename mindspore/ccsrc/{ => minddata}/dataset/text/kernels/wordpiece_tokenizer_op.h (91%) rename mindspore/ccsrc/{ => minddata}/dataset/text/vocab.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/text/vocab.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/.gitignore (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/README.md (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/allocator.h (99%) rename mindspore/ccsrc/{ => minddata}/dataset/util/arena.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/arena.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/auto_index.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/util/bit.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/btree.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/btree_impl.tpp (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/btree_iterator.tpp (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/buddy.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/buddy.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/cache_pool.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/cache_pool.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/util/circular_pool.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/circular_pool.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/util/cond_var.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/util/cond_var.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/util/intrp_resource.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/intrp_service.cc (95%) rename mindspore/ccsrc/{ => minddata}/dataset/util/intrp_service.h (87%) rename mindspore/ccsrc/{ => minddata}/dataset/util/list.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/lock.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/util/lock.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/memory_pool.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/memory_pool.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/path.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/util/path.h (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/queue.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/random.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/util/semaphore.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/util/semaphore.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/service.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/service.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/util/services.cc (92%) rename mindspore/ccsrc/{ => minddata}/dataset/util/services.h (95%) rename mindspore/ccsrc/{ => minddata}/dataset/util/sig_handler.cc (94%) rename mindspore/ccsrc/{ => minddata}/dataset/util/sig_handler.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/slice.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/slice.h (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/status.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/status.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/storage_container.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/storage_container.h (90%) rename mindspore/ccsrc/{ => minddata}/dataset/util/storage_manager.cc (97%) rename mindspore/ccsrc/{ => minddata}/dataset/util/storage_manager.h (85%) rename mindspore/ccsrc/{ => minddata}/dataset/util/system_pool.h (96%) rename mindspore/ccsrc/{ => minddata}/dataset/util/task.cc (98%) rename mindspore/ccsrc/{ => minddata}/dataset/util/task.h (93%) rename mindspore/ccsrc/{ => minddata}/dataset/util/task_manager.cc (99%) rename mindspore/ccsrc/{ => minddata}/dataset/util/task_manager.h (94%) rename mindspore/ccsrc/{ => minddata}/dataset/util/treap.h (100%) rename mindspore/ccsrc/{ => minddata}/dataset/util/wait_post.cc (93%) rename mindspore/ccsrc/{ => minddata}/dataset/util/wait_post.h (92%) rename mindspore/ccsrc/{ => minddata}/mindrecord/CMakeLists.txt (100%) rename mindspore/ccsrc/{ => minddata}/mindrecord/common/shard_error.cc (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/common/shard_pybind.cc (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/common/shard_utils.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/common/shard_pybind.h (95%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/common/shard_utils.h (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_category.h (97%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_column.h (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_distributed_sample.h (91%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_error.h (100%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_header.h (94%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_index.h (90%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_index_generator.h (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_operator.h (97%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_page.h (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_pk_sample.h (89%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_reader.h (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_sample.h (93%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_schema.h (94%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_segment.h (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_sequential_sample.h (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_shuffle.h (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_statistics.h (93%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_task.h (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/include/shard_writer.h (97%) rename mindspore/ccsrc/{ => minddata}/mindrecord/io/shard_index_generator.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/io/shard_reader.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/io/shard_segment.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/io/shard_writer.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_category.cc (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_column.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_distributed_sample.cc (97%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_header.cc (99%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_index.cc (95%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_page.cc (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_pk_sample.cc (96%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_sample.cc (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_schema.cc (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_sequential_sample.cc (97%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_shuffle.cc (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_statistics.cc (98%) rename mindspore/ccsrc/{ => minddata}/mindrecord/meta/shard_task.cc (97%) delete mode 100644 mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h rename mindspore/ccsrc/pipeline/{ => jit}/CMakeLists.txt (90%) rename mindspore/ccsrc/pipeline/{ => jit}/action.cc (97%) rename mindspore/ccsrc/pipeline/{ => jit}/action.h (98%) rename mindspore/ccsrc/pipeline/{ => jit}/base.h (98%) rename mindspore/ccsrc/pipeline/{ => jit}/init.cc (97%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/data_converter.cc (98%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/data_converter.h (95%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/function_block.cc (99%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/function_block.h (99%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/parse.cc (99%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/parse.h (99%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/parse_base.h (100%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/python_adapter.cc (98%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/python_adapter.h (98%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/resolve.cc (97%) rename mindspore/ccsrc/pipeline/{ => jit}/parse/resolve.h (98%) rename mindspore/ccsrc/pipeline/{ => jit}/pass.cc (95%) rename mindspore/ccsrc/pipeline/{ => jit}/pass.h (97%) rename mindspore/ccsrc/pipeline/{ => jit}/pipeline.cc (98%) rename mindspore/ccsrc/pipeline/{ => jit}/pipeline.h (98%) rename mindspore/ccsrc/pipeline/{ => jit}/pipeline_ge.cc (98%) rename mindspore/ccsrc/pipeline/{ => jit}/pipeline_ge.h (96%) rename mindspore/ccsrc/pipeline/{ => jit}/remove_value_node_dup.cc (96%) rename mindspore/ccsrc/pipeline/{ => jit}/remove_value_node_dup.h (100%) rename mindspore/ccsrc/pipeline/{ => jit}/resource.cc (97%) rename mindspore/ccsrc/pipeline/{ => jit}/resource.h (96%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/abstract_function.cc (98%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/abstract_function.h (100%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/evaluator.cc (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/evaluator.h (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/prim.cc (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/prim.h (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/program_specialize.cc (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/program_specialize.h (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/static_analysis.cc (99%) rename mindspore/ccsrc/pipeline/{ => jit}/static_analysis/static_analysis.h (99%) rename mindspore/ccsrc/pipeline/{ => jit}/validator.cc (97%) rename mindspore/ccsrc/pipeline/{ => jit}/validator.h (97%) rename mindspore/ccsrc/{ => pipeline}/pynative/CMakeLists.txt (84%) rename mindspore/ccsrc/{ => pipeline}/pynative/base.h (100%) rename mindspore/ccsrc/{ => pipeline}/pynative/pynative_execute.cc (98%) rename mindspore/ccsrc/{ => pipeline}/pynative/pynative_execute.h (97%) rename mindspore/ccsrc/{ => pipeline}/pynative/pynative_execute_ge.cc (98%) rename mindspore/ccsrc/{ => pipeline}/pynative/pynative_execute_ge.h (90%) rename mindspore/ccsrc/{ => runtime}/device/CMakeLists.txt (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_device_address.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_device_address.h (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_kernel_runtime.cc (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_kernel_runtime.h (93%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_label_assign.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_label_assign.h (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_memory_manager.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_memory_manager.h (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_memory_pool.cc (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_memory_pool.h (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_stream_assign.cc (99%) rename mindspore/ccsrc/{ => runtime}/device/ascend/ascend_stream_assign.h (99%) rename mindspore/ccsrc/{ => runtime}/device/ascend/dump/data_dumper.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/dump/data_dumper.h (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/dump/ge_dump.h (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/dump/proto/ge_dtype.proto (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/dump/proto/op_mapping_info.proto (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/kernel_build_ascend.cc (93%) rename mindspore/ccsrc/{ => runtime}/device/ascend/kernel_build_ascend.h (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/kernel_select_ascend.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/kernel_select_ascend.h (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/kernel_select_graph_kernel.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/plugin_impl.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/plugin_impl.h (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/profiling_engine_impl.cc (89%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/profiling_engine_impl.h (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/profiling_manager.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/profiling_manager.h (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/profiling_utils.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/profiling_utils.h (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/desc_reporter.cc (94%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/desc_reporter.h (93%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/graph_desc_reporter.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/graph_desc_reporter.h (95%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/point_reporter.cc (93%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/point_reporter.h (95%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/profiling_desc.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/profiling_desc.h (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/task_desc_reporter.cc (92%) rename mindspore/ccsrc/{ => runtime}/device/ascend/profiling/reporter/task_desc_reporter.h (96%) rename mindspore/ccsrc/{ => runtime}/device/ascend/readme.md (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/tasksink/runtime_utils.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/ascend/tasksink/runtime_utils.h (100%) rename mindspore/ccsrc/{ => runtime}/device/ascend/tasksink/task_generator.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/ascend/tasksink/task_generator.h (95%) rename mindspore/ccsrc/{ => runtime}/device/convert_tensor_utils.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/convert_tensor_utils.h (100%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_device_address.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_device_address.h (94%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_kernel_runtime.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_kernel_runtime.h (92%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_resource_manager.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_resource_manager.h (90%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_simple_mem_plan.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/cpu/cpu_simple_mem_plan.h (94%) rename mindspore/ccsrc/{ => runtime}/device/cpu/kernel_select_cpu.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/cpu/kernel_select_cpu.h (100%) rename mindspore/ccsrc/{ => runtime}/device/cpu/mpi/mpi_adapter.cc (99%) rename mindspore/ccsrc/{ => runtime}/device/cpu/mpi/mpi_adapter.h (100%) rename mindspore/ccsrc/{ => runtime}/device/cpu/readme.md (100%) rename mindspore/ccsrc/{ => runtime}/device/device_address.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/blocking_queue.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/gpu/blocking_queue.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/cuda_common.h (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/cuda_driver.cc (99%) rename mindspore/ccsrc/{ => runtime}/device/gpu/cuda_driver.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/collective_common.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/collective_fake_init.cc (93%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/collective_fake_init.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/collective_init.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/collective_init.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/collective_wrapper.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/mpi_wrapper.cc (96%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/mpi_wrapper.h (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/nccl_wrapper.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/distribution/nccl_wrapper.h (96%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_buffer_mgr.cc (99%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_buffer_mgr.h (98%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_common.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_device_address.cc (93%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_device_address.h (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_device_manager.cc (94%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_device_manager.h (93%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_kernel_build.cc (85%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_kernel_build.h (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_kernel_runtime.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_kernel_runtime.h (94%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_memory_allocator.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_memory_allocator.h (91%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_memory_copy_manager.cc (96%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_memory_copy_manager.h (91%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_memory_manager.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_memory_manager.h (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_stream_assign.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/gpu_stream_assign.h (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/kernel_info_setter.cc (95%) rename mindspore/ccsrc/{ => runtime}/device/gpu/kernel_info_setter.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/mpi/mpi_initializer.cc (97%) rename mindspore/ccsrc/{ => runtime}/device/gpu/mpi/mpi_initializer.h (100%) rename mindspore/ccsrc/{ => runtime}/device/gpu/readme.md (100%) rename mindspore/ccsrc/{ => runtime}/device/kernel_adjust.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/kernel_adjust.h (93%) rename mindspore/ccsrc/{ => runtime}/device/kernel_info.cc (99%) rename mindspore/ccsrc/{ => runtime}/device/kernel_info.h (95%) rename mindspore/ccsrc/{ => runtime}/device/kernel_runtime.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/kernel_runtime.h (95%) rename mindspore/ccsrc/{ => runtime}/device/kernel_runtime_manager.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/kernel_runtime_manager.h (98%) rename mindspore/ccsrc/{ => runtime}/device/memory_manager.cc (98%) rename mindspore/ccsrc/{ => runtime}/device/memory_manager.h (96%) rename mindspore/ccsrc/transform/{ => graph_ir}/CMakeLists.txt (61%) rename mindspore/ccsrc/transform/{ => graph_ir}/all_ops.h (100%) rename mindspore/ccsrc/transform/{ => graph_ir}/convert.cc (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/convert.h (98%) rename mindspore/ccsrc/transform/{ => graph_ir}/df_graph_manager.cc (97%) rename mindspore/ccsrc/transform/{ => graph_ir}/df_graph_manager.h (98%) rename mindspore/ccsrc/transform/{ => graph_ir}/graph_builder.cc (97%) rename mindspore/ccsrc/transform/{ => graph_ir}/graph_builder.h (92%) rename mindspore/ccsrc/transform/{ => graph_ir}/graph_runner.cc (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/graph_runner.h (93%) rename mindspore/ccsrc/transform/{ => graph_ir}/op_adapter.h (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/op_adapter_base.h (98%) rename mindspore/ccsrc/transform/{ => graph_ir}/op_adapter_util.cc (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/op_adapter_util.h (98%) rename mindspore/ccsrc/transform/{ => graph_ir}/op_declare.cc (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/op_declare.h (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/types.h (100%) rename mindspore/ccsrc/transform/{ => graph_ir}/util.cc (99%) rename mindspore/ccsrc/transform/{ => graph_ir}/util.h (99%) rename mindspore/ccsrc/{ => transform}/onnx/CMakeLists.txt (72%) rename mindspore/ccsrc/{ => transform}/onnx/ir_exporter.cc (99%) rename mindspore/ccsrc/{ => transform}/onnx/onnx_exporter.cc (99%) rename mindspore/{ccsrc => core}/ir/CMakeLists.txt (100%) rename mindspore/{ccsrc => core}/ir/anf.cc (99%) rename mindspore/{ccsrc => core}/ir/anf.h (100%) rename mindspore/{ccsrc => core}/ir/anf_extends.cc (96%) rename mindspore/{ccsrc => core}/ir/anf_py.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype.h (100%) rename mindspore/{ccsrc => core}/ir/dtype/container.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype/container.h (100%) rename mindspore/{ccsrc => core}/ir/dtype/empty.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype/empty.h (100%) rename mindspore/{ccsrc => core}/ir/dtype/number.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype/number.h (100%) rename mindspore/{ccsrc => core}/ir/dtype/ref.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype/ref.h (100%) rename mindspore/{ccsrc => core}/ir/dtype/type.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype/type.h (100%) rename mindspore/{ccsrc => core}/ir/dtype/type_extends.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype/type_id.h (100%) rename mindspore/{ccsrc => core}/ir/dtype_extends.cc (100%) rename mindspore/{ccsrc => core}/ir/dtype_py.cc (100%) rename mindspore/{ccsrc => core}/ir/func_graph.cc (99%) rename mindspore/{ccsrc => core}/ir/func_graph.h (100%) rename mindspore/{ccsrc => core}/ir/func_graph_cloner.cc (99%) rename mindspore/{ccsrc => core}/ir/func_graph_cloner.h (100%) rename mindspore/{ccsrc => core}/ir/func_graph_extends.cc (99%) rename mindspore/{ccsrc => core}/ir/func_graph_py.cc (100%) rename mindspore/{ccsrc => core}/ir/lite/param_value_lite.h (100%) rename mindspore/{ccsrc => core}/ir/lite/tensor.cc (100%) rename mindspore/{ccsrc => core}/ir/lite/tensor.h (100%) rename mindspore/{ccsrc => core}/ir/manager.cc (99%) rename mindspore/{ccsrc => core}/ir/manager.h (100%) rename mindspore/{ccsrc => core}/ir/meta_func_graph.cc (95%) rename mindspore/{ccsrc => core}/ir/meta_func_graph.h (100%) rename mindspore/{ccsrc => core}/ir/meta_tensor.cc (100%) rename mindspore/{ccsrc => core}/ir/meta_tensor.h (100%) rename mindspore/{ccsrc => core}/ir/meta_tensor_extends.cc (100%) rename mindspore/{ccsrc => core}/ir/named.cc (100%) rename mindspore/{ccsrc => core}/ir/named.h (100%) rename mindspore/{ccsrc => core}/ir/optimizer_caller.h (100%) rename mindspore/{ccsrc => core}/ir/param_value.h (100%) rename mindspore/{ccsrc => core}/ir/param_value_py.cc (100%) rename mindspore/{ccsrc => core}/ir/pattern_matcher.h (99%) rename mindspore/{ccsrc => core}/ir/primitive.cc (100%) rename mindspore/{ccsrc => core}/ir/primitive.h (98%) rename mindspore/{ccsrc => core}/ir/primitive_extends.cc (93%) rename mindspore/{ccsrc => core}/ir/primitive_py.cc (98%) rename mindspore/{ccsrc => core}/ir/primitive_py.h (97%) rename mindspore/{ccsrc => core}/ir/scalar.h (100%) rename mindspore/{ccsrc => core}/ir/scope.cc (100%) rename mindspore/{ccsrc => core}/ir/scope.h (100%) rename mindspore/{ccsrc => core}/ir/signature.h (100%) rename mindspore/{ccsrc => core}/ir/signature_py.cc (98%) rename mindspore/{ccsrc => core}/ir/tensor.cc (99%) rename mindspore/{ccsrc => core}/ir/tensor.h (99%) rename mindspore/{ccsrc => core}/ir/tensor_py.cc (99%) rename mindspore/{ccsrc => core}/ir/tensor_py.h (100%) rename mindspore/{ccsrc => core}/ir/value.cc (100%) rename mindspore/{ccsrc => core}/ir/value.h (100%) rename mindspore/{ccsrc => core}/ir/value_extends.cc (100%) rename mindspore/{ccsrc => core}/ir/value_py.cc (100%) rename mindspore/{ccsrc => core}/ir/visitor.cc (100%) rename mindspore/{ccsrc => core}/ir/visitor.h (100%) diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 176c7e576a..4a6e51b8aa 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -1,4 +1,5 @@ ## common setting +include_directories(${CMAKE_SOURCE_DIR}/mindspore/core) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_BINARY_DIR}) link_directories(${CMAKE_SOURCE_DIR}/build/mindspore/graphengine) @@ -35,20 +36,20 @@ if(ENABLE_GPU) include_directories(${CUDNN_PATH} ${CUDA_PATH} ${CUDA_INCLUDE_DIRS}) file(GLOB_RECURSE GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "device/gpu/*.cc" - "device/gpu/*.cu" - "kernel/gpu/*.cu" - "kernel/akg/gpu/*.cc" - "kernel/akg/akg_kernel_build.cc" - "kernel/akg/akg_kernel_attrs_process.cc" + "runtime/device/gpu/*.cc" + "runtime/device/gpu/*.cu" + "backend/kernel_compiler/gpu/*.cu" + "backend/kernel_compiler/akg/gpu/*.cc" + "backend/kernel_compiler/akg/akg_kernel_build.cc" + "backend/kernel_compiler/akg/akg_kernel_attrs_process.cc" ) list(APPEND CUDA_NVCC_FLAGS -arch=sm_53) - list(REMOVE_ITEM GPU_SRC_LIST "device/gpu/blocking_queue.cc" "device/gpu/gpu_buffer_mgr.cc") - list(REMOVE_ITEM GPU_SRC_LIST "device/gpu/mpi/mpi_initializer.cc" - "device/gpu/distribution/collective_wrapper.cc" - "device/gpu/distribution/mpi_wrapper.cc" - "device/gpu/distribution/nccl_wrapper.cc" + list(REMOVE_ITEM GPU_SRC_LIST "runtime/device/gpu/blocking_queue.cc" "runtime/device/gpu/gpu_buffer_mgr.cc") + list(REMOVE_ITEM GPU_SRC_LIST "runtime/device/gpu/mpi/mpi_initializer.cc" + "runtime/device/gpu/distribution/collective_wrapper.cc" + "runtime/device/gpu/distribution/mpi_wrapper.cc" + "runtime/device/gpu/distribution/nccl_wrapper.cc" ) set(NVCC_TMP_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) @@ -101,15 +102,15 @@ if (ENABLE_DUMP_PROTO) endif () if (ENABLE_D) - include_directories("${CMAKE_BINARY_DIR}/kernel/aicpu") + include_directories("${CMAKE_BINARY_DIR}/backend/kernel_compiler/aicpu") include_directories("${CMAKE_BINARY_DIR}/predict/generator/ir") - file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "kernel/aicpu/proto/*.proto") + file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "backend/kernel_compiler/aicpu/proto/*.proto") ms_protobuf_generate(PROTOSRCS PROTOHDRS ${PROTO_IN}) file(GLOB_RECURSE PROTO_INNER RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "predict/proto/*.proto") ms_protobuf_generate(PREDICT_PROTOSRCS PREDICT_PROTOHDRS ${PROTO_INNER}) - file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "device/ascend/dump/proto/*.proto") + file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "runtime/device/ascend/dump/proto/*.proto") ms_protobuf_generate(DUMP_PROTOSRCS PROTOHDRS ${PROTO_DUMP}) list(APPEND MINDSPORE_PROTO_LIST ${PROTOSRCS}) @@ -125,18 +126,32 @@ if (MINDSPORE_PROTO_LIST) endif() ## make sub objects -set(SUB_COMP - transform pre_activate parallel pipeline device kernel common debug gvar ir onnx operator optimizer predict - pybind_api pynative session utils vm base abstract +set(SUB_COMP + transform/graph_ir + transform/onnx + backend/optimizer + backend/kernel_compiler + backend/session + runtime/device + frontend/optimizer + frontend/parallel + frontend/operator + pipeline/jit + pipeline/pynative + common debug gvar predict pybind_api utils vm base abstract ) foreach (_comp ${SUB_COMP}) add_subdirectory(${_comp}) - if (TARGET _mindspore_${_comp}_obj) - list(APPEND SUB_OBJECTS_SRC $) - add_dependencies(_mindspore_${_comp}_obj proto_input flat_input) + string(REPLACE "/" "_" sub ${_comp}) + if (TARGET _mindspore_${sub}_obj) + list(APPEND SUB_OBJECTS_SRC $) + add_dependencies(_mindspore_${sub}_obj proto_input flat_input) endif () endforeach () +add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/ir ir) +list(APPEND SUB_OBJECTS_SRC $) +add_dependencies(_mindspore_ir_obj proto_input flat_input) set_property(SOURCE ${SUB_OBJECTS_SRC} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME) add_library(mindspore STATIC ${SUB_OBJECTS_SRC}) @@ -207,8 +222,8 @@ endif() # set c_expression building set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) -set_property(SOURCE "pipeline/init.cc" PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PIPELINE) -pybind11_add_module(_c_expression "pipeline/init.cc") +set_property(SOURCE "pipeline/jit/init.cc" PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PIPELINE) +pybind11_add_module(_c_expression "pipeline/jit/init.cc") MESSAGE(STATUS "operation system is ${CMAKE_SYSTEM}") if (CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -265,8 +280,8 @@ if (ENABLE_CPU) endif () if (ENABLE_MINDDATA) - add_subdirectory(mindrecord) - add_subdirectory(dataset) + add_subdirectory(minddata/mindrecord) + add_subdirectory(minddata/dataset) endif () # build inference @@ -275,7 +290,7 @@ set(LOAD_ONNX_SRC ${CMAKE_CURRENT_SOURCE_DIR}/utils/load_onnx/anf_model_parser.cc ) add_library(inference SHARED - ${CMAKE_CURRENT_SOURCE_DIR}/session/session.cc + ${CMAKE_CURRENT_SOURCE_DIR}/backend/session/session.cc ${LOAD_ONNX_SRC} ) target_link_libraries(inference PRIVATE ${PYTHON_LIBRARIES} ${SECUREC_LIBRARY} diff --git a/mindspore/ccsrc/kernel/CMakeLists.txt b/mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt similarity index 94% rename from mindspore/ccsrc/kernel/CMakeLists.txt rename to mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt index 9f460425e1..b412d83d11 100644 --- a/mindspore/ccsrc/kernel/CMakeLists.txt +++ b/mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt @@ -63,4 +63,4 @@ endif() set_property(SOURCE ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) -add_library(_mindspore_kernel_obj OBJECT ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST}) +add_library(_mindspore_backend_kernel_compiler_obj OBJECT ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST}) diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc similarity index 96% rename from mindspore/ccsrc/kernel/aicpu/aicpu_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc index 99e792216f..7e7fd20f39 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/aicpu/aicpu_kernel_build.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h" #include #include #include @@ -22,18 +22,18 @@ #include #include #include -#include "device/kernel_runtime.h" -#include "kernel/aicpu/aicpu_kernel_mod.h" -#include "kernel/akg/akg_kernel_build.h" +#include "runtime/device/kernel_runtime.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" +#include "backend/kernel_compiler/akg/akg_kernel_build.h" #include "proto/tensor.pb.h" #include "proto/tensor_shape.pb.h" #include "proto/attr.pb.h" #include "proto/node_def.pb.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" -#include "kernel/aicpu/aicpu_util.h" -#include "session/kernel_graph.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h similarity index 95% rename from mindspore/ccsrc/kernel/aicpu/aicpu_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h index a3c24ae49e..6e2ee3959b 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_MINDSPORE_CCSRC_KERNEL_AICPU_AICPU_KERNEL_BUILD_H_ #define MINDSPORE_MINDSPORE_CCSRC_KERNEL_AICPU_AICPU_KERNEL_BUILD_H_ #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.cc b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc similarity index 91% rename from mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.cc rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc index 3670a2d76f..76c29b9f5c 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/aicpu/aicpu_kernel_metadata.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h" #include #include -#include "kernel/oplib/oplib.h" -#include "kernel/common_utils.h" -#include "kernel/aicpu/aicpu_util.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.h b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h similarity index 95% rename from mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.h rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h index 74e667856e..e21f4eace4 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.h +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h @@ -20,7 +20,7 @@ #include #include #include -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc similarity index 97% rename from mindspore/ccsrc/kernel/aicpu/aicpu_kernel_mod.cc rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc index c6d8a101cd..e18b3169f3 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/aicpu/aicpu_kernel_mod.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" #include #include @@ -23,9 +23,9 @@ #include "runtime/mem.h" #include "runtime/rt.h" -#include "kernel/aicpu/aicpu_kernel_build.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h" #include "utils/convert_utils.h" -#include "kernel/aicpu/aicpu_util.h" +#include "backend/kernel_compiler/aicpu/aicpu_util.h" #include "utils/context/ms_context.h" using AicpuTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_mod.h b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h similarity index 96% rename from mindspore/ccsrc/kernel/aicpu/aicpu_kernel_mod.h rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h index 3ee9bd2a15..82260010ea 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_kernel_mod.h +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h @@ -18,8 +18,8 @@ #include #include #include -#include "kernel/ascend_kernel_mod.h" -#include "kernel/aicpu/aicpu_util.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "backend/kernel_compiler/aicpu/aicpu_util.h" namespace mindspore { namespace kernel { class AicpuOpKernelMod : public AscendKernelMod { diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_util.cc b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc similarity index 95% rename from mindspore/ccsrc/kernel/aicpu/aicpu_util.cc rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc index a617f56f8f..790319daa6 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_util.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/aicpu/aicpu_util.h" +#include "backend/kernel_compiler/aicpu/aicpu_util.h" #include #include #include "proto/types.pb.h" #include "runtime/mem.h" #include "runtime/rt.h" #include "utils/convert_utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/aicpu/aicpu_util.h b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h similarity index 97% rename from mindspore/ccsrc/kernel/aicpu/aicpu_util.h rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h index bf8025de2c..fd4495afeb 100644 --- a/mindspore/ccsrc/kernel/aicpu/aicpu_util.h +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h @@ -20,7 +20,7 @@ #include #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/aicpu/proto/attr.proto b/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/attr.proto similarity index 100% rename from mindspore/ccsrc/kernel/aicpu/proto/attr.proto rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/attr.proto diff --git a/mindspore/ccsrc/kernel/aicpu/proto/node_def.proto b/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/node_def.proto similarity index 100% rename from mindspore/ccsrc/kernel/aicpu/proto/node_def.proto rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/node_def.proto diff --git a/mindspore/ccsrc/kernel/aicpu/proto/tensor.proto b/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor.proto similarity index 100% rename from mindspore/ccsrc/kernel/aicpu/proto/tensor.proto rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor.proto diff --git a/mindspore/ccsrc/kernel/aicpu/proto/tensor_shape.proto b/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor_shape.proto similarity index 100% rename from mindspore/ccsrc/kernel/aicpu/proto/tensor_shape.proto rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor_shape.proto diff --git a/mindspore/ccsrc/kernel/aicpu/proto/types.proto b/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/types.proto similarity index 100% rename from mindspore/ccsrc/kernel/aicpu/proto/types.proto rename to mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/types.proto diff --git a/mindspore/ccsrc/kernel/akg/akg_kernel_attrs_process.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.cc similarity index 98% rename from mindspore/ccsrc/kernel/akg/akg_kernel_attrs_process.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.cc index 018fbe4f2a..73fdb5c11b 100644 --- a/mindspore/ccsrc/kernel/akg/akg_kernel_attrs_process.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/akg/akg_kernel_attrs_process.h" +#include "backend/kernel_compiler/akg/akg_kernel_attrs_process.h" #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/akg_kernel_attrs_process.h b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h similarity index 98% rename from mindspore/ccsrc/kernel/akg/akg_kernel_attrs_process.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h index 9d15d4f9e9..9ba724db42 100644 --- a/mindspore/ccsrc/kernel/akg/akg_kernel_attrs_process.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h @@ -22,7 +22,7 @@ #include #include "ir/anf.h" #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/akg_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc similarity index 99% rename from mindspore/ccsrc/kernel/akg/akg_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc index 0e8d93d47f..9c13629b1b 100644 --- a/mindspore/ccsrc/kernel/akg/akg_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/akg/akg_kernel_build.h" +#include "backend/kernel_compiler/akg/akg_kernel_build.h" #include #include #include @@ -35,8 +35,8 @@ #include "utils/convert_utils.h" #include "utils/any.h" #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/akg/akg_kernel_attrs_process.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/akg/akg_kernel_attrs_process.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/akg_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h similarity index 95% rename from mindspore/ccsrc/kernel/akg/akg_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h index 15fa03f45b..7b6a2f0b86 100644 --- a/mindspore/ccsrc/kernel/akg/akg_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h @@ -22,11 +22,11 @@ #include #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "ir/dtype.h" #include -#include "kernel/common_utils.h" -#include "kernel/oplib/oplib.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/kernel_compiler/oplib/oplib.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.cc similarity index 88% rename from mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.cc index 3515add1e0..f3567428d3 100644 --- a/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "kernel/akg/akg_kernel_metadata.h" +#include "backend/kernel_compiler/akg/akg_kernel_metadata.h" #include -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/oplib.h" -#include "kernel/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.h b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h similarity index 95% rename from mindspore/ccsrc/kernel/akg/akg_kernel_metadata.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h index 5e329f0080..02785c6cdb 100644 --- a/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h @@ -21,7 +21,7 @@ #include #include #include -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc similarity index 97% rename from mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc index 7200a91ac0..d698c89bc9 100644 --- a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/akg/ascend/akg_ascend_kernel_build.h" +#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h" #include #include @@ -26,12 +26,12 @@ #include #include "ir/dtype.h" #include "ir/func_graph.h" -#include "kernel/kernel.h" -#include "kernel/common_utils.h" -#include "kernel/tbe/tbe_utils.h" -#include "kernel/akg/ascend/akg_ascend_kernel_mod.h" -#include "kernel/akg/akg_kernel_attrs_process.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h" +#include "backend/kernel_compiler/akg/akg_kernel_attrs_process.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h similarity index 95% rename from mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h index 01752911ed..713b65a451 100644 --- a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h @@ -22,8 +22,8 @@ #include #include #include "ir/anf.h" -#include "kernel/kernel.h" -#include "kernel/akg/akg_kernel_build.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/akg/akg_kernel_build.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc similarity index 98% rename from mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc index 101a9f79b6..8bb4940778 100644 --- a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/akg/ascend/akg_ascend_kernel_mod.h" +#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h" #include #include #include diff --git a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.h b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h index 18d342f629..3ea36f1a23 100644 --- a/mindspore/ccsrc/kernel/akg/ascend/akg_ascend_kernel_mod.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h @@ -19,8 +19,8 @@ #include #include #include -#include "kernel/ascend_kernel_mod.h" -#include "kernel/tbe/tbe_utils.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc similarity index 85% rename from mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc index 534e355802..96fcd1869e 100644 --- a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/akg/gpu/akg_gpu_kernel_build.h" +#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h" #include #include -#include "kernel/kernel.h" -#include "kernel/akg/akg_kernel_build.h" -#include "kernel/akg/gpu/akg_gpu_kernel_mod.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/akg/akg_kernel_build.h" +#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h similarity index 95% rename from mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h index d615890737..abb6d1f030 100644 --- a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_ #define MINDSPORE_CCSRC_KERNEL_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_ -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "base/base.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc similarity index 98% rename from mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_mod.cc rename to mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc index 64590cd9b8..d527f8ec76 100644 --- a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/akg/gpu/akg_gpu_kernel_mod.h" +#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h" #include #include #include "nlohmann/json.hpp" diff --git a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_mod.h b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h similarity index 98% rename from mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_mod.h rename to mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h index df9cb069f7..a6a17d033f 100644 --- a/mindspore/ccsrc/kernel/akg/gpu/akg_gpu_kernel_mod.h +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h @@ -21,7 +21,7 @@ #include #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/ascend_kernel_mod.h b/mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h similarity index 97% rename from mindspore/ccsrc/kernel/ascend_kernel_mod.h rename to mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h index 1ca1dbacc8..c6398eda9e 100644 --- a/mindspore/ccsrc/kernel/ascend_kernel_mod.h +++ b/mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h @@ -20,7 +20,7 @@ #include #include #include "framework/ge_runtime/task_info.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #ifdef ENABLE_DATA_DUMP #include "debug/data_dump_parser.h" #endif diff --git a/mindspore/ccsrc/kernel/common_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc similarity index 99% rename from mindspore/ccsrc/kernel/common_utils.cc rename to mindspore/ccsrc/backend/kernel_compiler/common_utils.cc index d42e887bbc..f4495cdb9d 100644 --- a/mindspore/ccsrc/kernel/common_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" #include #include #include @@ -22,12 +22,12 @@ #include #include #include "nlohmann/json.hpp" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" #include "ir/manager.h" #include "ir/meta_tensor.h" #include "ir/func_graph.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/graph_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/common_utils.h b/mindspore/ccsrc/backend/kernel_compiler/common_utils.h similarity index 97% rename from mindspore/ccsrc/kernel/common_utils.h rename to mindspore/ccsrc/backend/kernel_compiler/common_utils.h index b0ffb4ccb8..8c9ea84b34 100644 --- a/mindspore/ccsrc/kernel/common_utils.h +++ b/mindspore/ccsrc/backend/kernel_compiler/common_utils.h @@ -26,9 +26,9 @@ #include #include #include -#include "kernel/kernel.h" -#include "kernel/oplib/opinfo.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/oplib/opinfo.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/addn_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/addn_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.cc index 021b49e20c..1300847d40 100644 --- a/mindspore/ccsrc/kernel/cpu/addn_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/cpu/addn_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/addn_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/addn_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/addn_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.h index 1a1a9157d9..925f0fab50 100644 --- a/mindspore/ccsrc/kernel/cpu/addn_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_ADDN_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/allgather_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/cpu/allgather_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc index 811ea3ea16..55afecb8fa 100644 --- a/mindspore/ccsrc/kernel/cpu/allgather_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/allgather_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" -#include "device/cpu/mpi/mpi_adapter.h" +#include "backend/kernel_compiler/cpu/allgather_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" +#include "runtime/device/cpu/mpi/mpi_adapter.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/allgather_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/allgather_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.h index 1dddf810ef..42c83ccf0b 100644 --- a/mindspore/ccsrc/kernel/cpu/allgather_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_REDUCE_SCATTER_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/apply_momentum_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc similarity index 90% rename from mindspore/ccsrc/kernel/cpu/apply_momentum_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc index 3cd6c57413..c1ff8d54bd 100644 --- a/mindspore/ccsrc/kernel/cpu/apply_momentum_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/apply_momentum_cpu_kernel.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/apply_momentum_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/cpu/apply_momentum_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h index c0ca581974..23e8488890 100644 --- a/mindspore/ccsrc/kernel/cpu/apply_momentum_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/argmax_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/argmax_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc index ee328df721..d67c4d47ff 100644 --- a/mindspore/ccsrc/kernel/cpu/argmax_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/argmax_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/argmax_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/argmax_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/argmax_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.h index aae7435c5c..3883344f96 100644 --- a/mindspore/ccsrc/kernel/cpu/argmax_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_ARGMAX_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/bias_add_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/bias_add_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc index 00f3017231..f42bb6807d 100644 --- a/mindspore/ccsrc/kernel/cpu/bias_add_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/cpu/bias_add_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/bias_add_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/bias_add_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/bias_add_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.h index 516a21147b..c572f68230 100644 --- a/mindspore/ccsrc/kernel/cpu/bias_add_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/bias_add_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/bias_add_grad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc index 1d9c7d076e..8b6e2d0188 100644 --- a/mindspore/ccsrc/kernel/cpu/bias_add_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/cpu/bias_add_grad_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/bias_add_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/bias_add_grad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h index e3ac896096..a5743879a7 100644 --- a/mindspore/ccsrc/kernel/cpu/bias_add_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/concat_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/concat_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc index dac382f447..6776c0f154 100644 --- a/mindspore/ccsrc/kernel/cpu/concat_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/cpu/concat_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/concat_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/concat_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/concat_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.h index 46f9078178..94e4ad40f3 100644 --- a/mindspore/ccsrc/kernel/cpu/concat_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_CONCAT_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc index 2be05038d6..fb9398e7c4 100644 --- a/mindspore/ccsrc/kernel/cpu/cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h index 5837f922b5..f2aa292c6e 100644 --- a/mindspore/ccsrc/kernel/cpu/cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "ir/anf.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" using mindspore::kernel::Address; using mindspore::kernel::AddressPtr; diff --git a/mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc index bcda7af9fd..249450c193 100644 --- a/mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" #include #include #include -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h similarity index 97% rename from mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h index aebcc15d6a..80f9a342ac 100644 --- a/mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h @@ -24,8 +24,8 @@ #include #include "common/utils.h" -#include "kernel/cpu/cpu_kernel.h" -#include "device/cpu/kernel_select_cpu.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "runtime/device/cpu/kernel_select_cpu.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/debug_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/debug_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc index a1dcaca3f3..344f03cc53 100644 --- a/mindspore/ccsrc/kernel/cpu/debug_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/debug_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/debug_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" diff --git a/mindspore/ccsrc/kernel/cpu/debug_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/debug_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.h index da9f3286b9..18302e8992 100644 --- a/mindspore/ccsrc/kernel/cpu/debug_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc index c9e60f0f4c..1bcc36faa4 100644 --- a/mindspore/ccsrc/kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include "kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" -#include "device/cpu/mpi/mpi_adapter.h" +#include "backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" +#include "runtime/device/cpu/mpi/mpi_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h index 7222bd9be1..3e3807f58e 100644 --- a/mindspore/ccsrc/kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_COMM_GRAD_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/embedding_look_up_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/embedding_look_up_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc index f2fd7fc650..b2feb9204f 100644 --- a/mindspore/ccsrc/kernel/cpu/embedding_look_up_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc @@ -15,9 +15,9 @@ */ #include #include -#include "kernel/cpu/embedding_look_up_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" -#include "device/cpu/mpi/mpi_adapter.h" +#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" +#include "runtime/device/cpu/mpi/mpi_adapter.h" #include "ir/primitive.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/embedding_look_up_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/embedding_look_up_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h index d839571caa..6c61ee346c 100644 --- a/mindspore/ccsrc/kernel/cpu/embedding_look_up_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/equal_count_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/equal_count_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc index 60e7eafa78..a61cd185c6 100644 --- a/mindspore/ccsrc/kernel/cpu/equal_count_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/equal_count_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/equal_count_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/equal_count_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/equal_count_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.h index 13083889d0..6e4ed6d5f1 100644 --- a/mindspore/ccsrc/kernel/cpu/equal_count_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_EQUAL_COUNT_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/gather_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/gather_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc index 8aad9d19e6..73b11f1c01 100644 --- a/mindspore/ccsrc/kernel/cpu/gather_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/gather_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/gather_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/gather_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/gather_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.h index 2ffd7df4d4..8fdac0dfde 100644 --- a/mindspore/ccsrc/kernel/cpu/gather_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_GATHER_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc index 657c85dc48..e58b1d319c 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/conv2d_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.h" #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.h index 1cb100299e..c0c64ba4da 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc index fbfebaf56e..3fa6a91405 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h" #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h index 49559f452b..ae8269c142 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc index ff0b8633d4..1f02d70f86 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h" #include -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h index 9fb024a279..6f699130a8 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/lstm_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc index 0a343785f7..626fd1934e 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/lstm_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h" #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/mkldnn/lstm_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h index d42ff803f0..761494a931 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h @@ -24,7 +24,7 @@ #endif #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { class LstmCPUKernel : public MKLCPUKernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/mkldnn/lstm_grad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc index d7e7701d85..56da8ec808 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/lstm_grad_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h" #include #include #include #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/lstm_grad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h index 1f3fb824c0..b95b5ba792 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/lstm_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/matmul_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/mkldnn/matmul_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc index 28266f2aa0..4bbaa6459f 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/matmul_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/matmul_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h" #include #include -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "common/utils.h" -#include "device/cpu/cpu_device_address.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/matmul_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/cpu/mkldnn/matmul_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h index 10276d01fa..ef52f652d0 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/matmul_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/mkldnn/mkl_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc index a38470e3a3..c71abe809d 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" #include #include #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/mkldnn/mkl_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h index 10a860afff..fc7128b10e 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include "dnnl.hpp" -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_kernel_engine.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/mkl_kernel_engine.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.cc index 5ae9791b12..777668f960 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_kernel_engine.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "utils/log_adapter.h" #include "dnnl.hpp" diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/mkl_kernel_engine.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h similarity index 100% rename from mindspore/ccsrc/kernel/cpu/mkldnn/mkl_kernel_engine.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/mul_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/mkldnn/mul_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc index 4f77508004..fddd769047 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/mul_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/mul_cpu_kernel.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/mul_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/mul_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.h index 1131fd594c..182679f59d 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/mul_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/cpu/mkldnn/pooling_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc index 5225050dc1..e4bedf23b9 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/pooling_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h" #include #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/pooling_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h index 4993d0834d..8187eaffda 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/mkldnn/pooling_grad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc index c0459de790..8189df07ff 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/pooling_grad_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.h" #include #include #include #include "common/utils.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/cpu/mkldnn/pooling_grad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.h index cdb2c69ef0..95a7bb3f66 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/pooling_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/kernel/cpu/mkldnn/relu_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc index d5ef20a25e..29ac9a1062 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/relu_cpu_kernel.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/relu_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.h index 26905e267d..a2da2480e2 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/mkldnn/relu_grad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc index 4a6213ddf2..9139aa7862 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/relu_grad_cpu_kernel.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/relu_grad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.h index f0a77ee282..c895ab2756 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/relu_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc index 7fa740cfc0..94271b8a69 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/softmax_cpu_kernel.h" -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h index 6acb9e5b9b..2812dd31af 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc index 05b1a79924..889e2abdec 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h" #include #include #include -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h index f663508059..d05cb49b7b 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc index c33fcd246f..b8bf7b318a 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h" #include #include #include -#include "kernel/cpu/mkldnn/mkl_kernel_engine.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h index 6391b27de6..0d79b0514b 100644 --- a/mindspore/ccsrc/kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/one_hot_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/one_hot_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc index 00dfe73f28..5bbc9f49a2 100644 --- a/mindspore/ccsrc/kernel/cpu/one_hot_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/one_hot_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/one_hot_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/one_hot_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/one_hot_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.h index ef13047343..393b0e8c41 100644 --- a/mindspore/ccsrc/kernel/cpu/one_hot_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_ONE_HOT_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/apply_momentum_ps_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/cpu/ps/apply_momentum_ps_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc index ecbf407610..6537c88840 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/apply_momentum_ps_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/ps/apply_momentum_ps_kernel.h" +#include "backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/apply_momentum_ps_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/ps/apply_momentum_ps_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h index 43992abc87..a78f40d04b 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/apply_momentum_ps_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/ps/pserver_kernel.h" -#include "kernel/cpu/apply_momentum_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_proxy_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_proxy_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc index 01dad83f98..59ab65014b 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_proxy_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/ps/embedding_look_up_proxy_kernel.h" +#include "backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h" #include -#include "parallel/ps/worker.h" +#include "frontend/parallel/ps/worker.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_proxy_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_proxy_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h index 1ce9154ac0..45e0a23fcb 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_proxy_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h @@ -16,9 +16,9 @@ #ifndef MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_PROXY_KERNEL_H_ #define MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_PROXY_KERNEL_H_ -#include "kernel/cpu/embedding_look_up_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h" #include -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_ps_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_ps_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc index efabb49550..bcb3ca8ae8 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_ps_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/cpu/ps/embedding_look_up_ps_kernel.h" +#include "backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h" #include #include #include -#include "kernel/common_utils.h" -#include "parallel/ps/util.h" +#include "backend/kernel_compiler/common_utils.h" +#include "frontend/parallel/ps/util.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_ps_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_ps_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h index 11850b2fa6..e23a90a11c 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/embedding_look_up_ps_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/embedding_look_up_cpu_kernel.h" -#include "kernel/cpu/ps/pserver_kernel.h" +#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/pserver_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.cc similarity index 88% rename from mindspore/ccsrc/kernel/cpu/ps/pserver_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.cc index d6a7725a8d..3aa421881a 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/pserver_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/cpu/ps/pserver_kernel.h" -#include "parallel/ps/util.h" +#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "frontend/parallel/ps/util.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/pserver_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/pserver_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.h index 527ee2c7fe..a2b6c4fa61 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/pserver_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/kernel.h" -#include "parallel/ps/util.h" +#include "backend/kernel_compiler/kernel.h" +#include "frontend/parallel/ps/util.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/pull_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/pull_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.cc index 90b5e2e64d..92c901d4c8 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/pull_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/cpu/ps/pull_kernel.h" +#include "backend/kernel_compiler/cpu/ps/pull_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/pull_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/pull_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.h index 5cde005617..84dd9b819e 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/pull_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "parallel/ps/worker.h" -#include "parallel/ps/util.h" -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "frontend/parallel/ps/worker.h" +#include "frontend/parallel/ps/util.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/push_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/ps/push_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.cc index a49c7e9207..96c1f15bda 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/push_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/cpu/ps/push_kernel.h" +#include "backend/kernel_compiler/cpu/ps/push_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/push_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/push_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.h index 436bebd388..938792f3bf 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/push_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "parallel/ps/worker.h" -#include "parallel/ps/util.h" -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "frontend/parallel/ps/worker.h" +#include "frontend/parallel/ps/util.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_adam_ps_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/cpu/ps/sparse_apply_adam_ps_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.cc index 947f379f5d..c7283954f8 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_adam_ps_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/ps/sparse_apply_adam_ps_kernel.h" +#include "backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h" #include -#include "kernel/common_utils.h" -#include "device/cpu/cpu_device_address.h" -#include "parallel/ps/util.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/cpu/cpu_device_address.h" +#include "frontend/parallel/ps/util.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_adam_ps_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/sparse_apply_adam_ps_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h index df49ccc889..337fcb3bf0 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_adam_ps_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/ps/pserver_kernel.h" -#include "kernel/cpu/sparse_apply_adam_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.cc index 26cc42685f..0392bd5a69 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h index b1afcaf87e..d97f19d349 100644 --- a/mindspore/ccsrc/kernel/cpu/ps/sparse_apply_ftrl_ps_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/ps/pserver_kernel.h" -#include "kernel/cpu/sparse_apply_ftrl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/reduce_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/cpu/reduce_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.cc index e56f2af8c7..0dddf1d3c4 100644 --- a/mindspore/ccsrc/kernel/cpu/reduce_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.cc @@ -16,8 +16,8 @@ #include #include #include -#include "kernel/cpu/reduce_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/reduce_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/reduce_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/reduce_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.h index 3317ec72ed..a9696bad49 100644 --- a/mindspore/ccsrc/kernel/cpu/reduce_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/reduce_scatter_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/cpu/reduce_scatter_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.cc index 19a4e907a0..f44c109ace 100644 --- a/mindspore/ccsrc/kernel/cpu/reduce_scatter_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/reduce_scatter_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" -#include "device/cpu/mpi/mpi_adapter.h" +#include "backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" +#include "runtime/device/cpu/mpi/mpi_adapter.h" #include "ir/primitive.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/reduce_scatter_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/cpu/reduce_scatter_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h index 5c6907602a..317d7df443 100644 --- a/mindspore/ccsrc/kernel/cpu/reduce_scatter_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_REDUCE_SCATTER_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/reshape_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/reshape_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.cc index 7342a19e99..6370fdc78a 100644 --- a/mindspore/ccsrc/kernel/cpu/reshape_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/reshape_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/reshape_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/reshape_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/reshape_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.h index 6ca746f4ac..04f1db3304 100644 --- a/mindspore/ccsrc/kernel/cpu/reshape_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_RESHAPE_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/slice_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/kernel/cpu/slice_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.cc index afb3e6a247..c6657a845a 100644 --- a/mindspore/ccsrc/kernel/cpu/slice_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/slice_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/slice_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/slice_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/cpu/slice_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.h index 913c993d7a..03b7ecdc17 100644 --- a/mindspore/ccsrc/kernel/cpu/slice_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_SLICE_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/slice_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/kernel/cpu/slice_grad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.cc index 92eaffe8c6..20904e0504 100644 --- a/mindspore/ccsrc/kernel/cpu/slice_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/slice_grad_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "ir/primitive.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/cpu/slice_grad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/slice_grad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h index 1e42c8ac68..ec480d7e80 100644 --- a/mindspore/ccsrc/kernel/cpu/slice_grad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_SLICE_GRAD_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc index ef3db78275..2ff8e77fcd 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/sparse_apply_adam_cpu_kernel.h" -#include "kernel/common_utils.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h index 05bcad16f6..5d3d4193f7 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc index 03fb1d303f..2662604e19 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/sparse_apply_ftrl_cpu_kernel.h" -#include "kernel/common_utils.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h index dd218294e3..af8796d8a5 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_SPARSE_APPLY_FTRL_CPU_KERNEL_H_ #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc index ed5438a318..636d92dcbb 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.h" -#include "kernel/common_utils.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h index 795568a64d..ee95db8f33 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc index 6069fb708e..efba35ad8c 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h" -#include "kernel/common_utils.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h index ff7da7966c..56b180ec0b 100644 --- a/mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sub_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/cpu/sub_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sub_cpu_kernel.cc index 543f0e5cdd..1e759390a2 100644 --- a/mindspore/ccsrc/kernel/cpu/sub_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include -#include "kernel/cpu/sub_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/sub_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/sub_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/cpu/sub_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/sub_cpu_kernel.h index 54b2c8951a..d1b55ded90 100644 --- a/mindspore/ccsrc/kernel/cpu/sub_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_KERNEL_CPU_SUB_CPU_KERNEL_H_ #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/cpu/transpose_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/cpu/transpose_cpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.cc index f2ac9350cb..8ec3698cf6 100644 --- a/mindspore/ccsrc/kernel/cpu/transpose_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/cpu/transpose_cpu_kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/cpu/transpose_cpu_kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { namespace kernel { const size_t kMaxDim = 100; diff --git a/mindspore/ccsrc/kernel/cpu/transpose_cpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.h similarity index 90% rename from mindspore/ccsrc/kernel/cpu/transpose_cpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.h index d882f4fa51..15796f9f3c 100644 --- a/mindspore/ccsrc/kernel/cpu/transpose_cpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "kernel/cpu/cpu_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace kernel { class TransposeCPUFwdKernel : public CPUKernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/argmax_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/kernel/gpu/arrays/argmax_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.cc index 71f612d07c..39f535a2af 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/argmax_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/argmax_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/argmax_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/gpu/arrays/argmax_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h index 3df70d0960..61a53c5b40 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/argmax_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_ARGMAXGPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/argmax_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cuh" namespace mindspore { namespace kernel { #define ARGMAX_MAX_DIMENSION 2 diff --git a/mindspore/ccsrc/kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.cc index 24c8a9a730..5ead387ccc 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.h index 304f0ab161..d2369023fb 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/argmaxwithvalue_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxwithvalue_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_ARGMAXWITHVALUEGPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/argmaxwithvalue_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/argmaxwithvalue_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/arrays/array_reduce_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/arrays/array_reduce_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.cc index f378604624..5d34a1c9c2 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/array_reduce_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/array_reduce_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/array_reduce_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/arrays/array_reduce_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h index 4a52439305..b96f63670d 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/array_reduce_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { const std::map kReduceTypeMap = { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/concatv2_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/arrays/concatv2_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.cc index 3bca6a69d3..f5979dc62d 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/concatv2_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/concatv2_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/concatv2_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/arrays/concatv2_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h index a91c50ce69..15ccedcaec 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/concatv2_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CONCATV2_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/concatv2_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/gather_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/arrays/gather_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.cc index dc595e4793..8d3c06e805 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/gather_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/gather_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/gather_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/arrays/gather_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h index 72a05b0915..2211361cee 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/gather_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_GATHER_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/gather.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/gather.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/one_hot_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/arrays/one_hot_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.cc index 7c160f8f58..e764a08dc8 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/one_hot_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/one_hot_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/one_hot_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/arrays/one_hot_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h index c8b64e7243..6c46a63e69 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/one_hot_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_ONEHOT_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/one_hot_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/select_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/arrays/select_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.cc index 41c9c2243f..3c1323de07 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/select_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/select_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/select_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/arrays/select_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h index f1b6c5853a..73e60c44bd 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/select_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_SELECT_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/select_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/slice_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/arrays/slice_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.cc index 53161c29c2..4c9ff2b7f4 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/slice_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/slice_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/slice_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/arrays/slice_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h index 7f71e548ad..f8ecb9ccf0 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/slice_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_SLICE_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/slice_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/slice_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/arrays/slice_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.cc index b91aafb734..2eeb3acf73 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/slice_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/slice_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/slice_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/arrays/slice_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h index bf24272d93..006cbf0266 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/slice_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_SLICE_GRAD_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/slice_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/transpose_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/kernel/gpu/arrays/transpose_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.cc index 338e7a4093..77e7de6fef 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/transpose_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/transpose_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(Transpose, KernelAttr().AddInputAttr(kNumberTypeFloat32).AddOutputAttr(kNumberTypeFloat32), diff --git a/mindspore/ccsrc/kernel/gpu/arrays/transpose_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/gpu/arrays/transpose_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h index 61be9b68fe..0f9c710e3e 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/transpose_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_TRANSPOSE_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/transpose_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc index 9962d55988..4be887ec79 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h index a20375ee29..1f7884c650 100644 --- a/mindspore/ccsrc/kernel/gpu/arrays/unsorted_segment_sum_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_UNSORT_SEGMENT_SUM_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/unsorted_segment_sum.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/control/recv_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/control/recv_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.cc index 5468aa6500..a89d4e9baf 100644 --- a/mindspore/ccsrc/kernel/gpu/control/recv_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/control/recv_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/control/recv_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/control/recv_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/control/recv_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.h index 12b4eed132..7de32ade4f 100644 --- a/mindspore/ccsrc/kernel/gpu/control/recv_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CONTROL_RECV_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/control/send_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/control/send_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.cc index c417c30bb3..946038bb18 100644 --- a/mindspore/ccsrc/kernel/gpu/control/send_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/control/send_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/control/send_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/control/send_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/control/send_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.h index a26e41aa1e..beea19a435 100644 --- a/mindspore/ccsrc/kernel/gpu/control/send_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CONTROL_SEND_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cu similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/adam_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cu index 3ec63ee03a..615b94723d 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/adam_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh" template __device__ __forceinline__ T SqrtFunc(T input) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/adam_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh index f48a113c26..7fc4a3e949 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAM_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAM_IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void ApplyAdam(const size_t size, const T *gradient, const T *beta1_power, const T *beta2_power, const T *learning_rate, const T *beta1, const T *beta2, const T *epsilon, T *variable, T *m, T *v, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_weight_decay_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/adam_weight_decay_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cu index dfadaa09d6..3bad9a61e1 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_weight_decay_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cu @@ -15,7 +15,7 @@ */ #include "adam_weight_decay_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void AdamWeightDecayKernel(const int element_num_, const bool need_decay, const float *beta1, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/adam_weight_decay_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/adam_weight_decay_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/argmax_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cu similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/argmax_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cu index e8fab27dda..a4f1f6680b 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/argmax_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cu @@ -15,7 +15,7 @@ */ #include "argmax_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void Argmax1D(const T* input, const int channel_size, int* output) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/argmax_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/argmax_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/argmaxwithvalue_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmaxwithvalue_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/argmaxwithvalue_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmaxwithvalue_impl.cu index 3313fc6853..46a8a75af9 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/argmaxwithvalue_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmaxwithvalue_impl.cu @@ -15,7 +15,7 @@ */ #include "argmaxwithvalue_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void ArgmaxWithValue(const T* input, const int bound, int outerSize, int innerSize, S* index, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/argmaxwithvalue_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmaxwithvalue_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/argmaxwithvalue_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmaxwithvalue_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/assign_add_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cu similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/assign_add_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cu index d44ad99202..604391ccf3 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/assign_add_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cu @@ -15,7 +15,7 @@ */ #include "assign_add_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void AssignAdd(const size_t size, T* ref, const T* value, T* output) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/assign_add_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/assign_add_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold2_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold2_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold2_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold2_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh index c3ce08dfd0..3a895405b1 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold2_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BATCHNORMFOLD2_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BATCHNORMFOLD2_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void BatchNormFold2Forward(const T *x, const T *beta, const T *gamma, const T *batch_std, const T *batch_mean, const T *running_std, const T *running_mean, const int *global_step, T *y, int freeze_bn, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cu index ddc2803f56..dae9a7d629 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cu @@ -18,7 +18,7 @@ #include #include #include "batchnorm_fold_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void UpdateRunningStd(int channel_size, const double epsilon, T* running_std) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/batchnorm_fold_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_grad_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_grad_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cu index 5aa087e7f5..262d4c438d 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_grad_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/broadcast_grad_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh" +#include "runtime/device/gpu/cuda_common.h" template struct MinimumGradFunc { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_grad_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_grad_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh index d154eddd4c..7742043592 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_grad_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BROADCAST_GRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BROADCAST_GRAD_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" enum BroadcastGradOpType { BROADCAST_GRAD_TYPE_MAXIMUM = 0, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cu index afa94fc56c..a72daa4234 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/broadcast_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh" +#include "runtime/device/gpu/cuda_common.h" template struct GreaterFunc { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh index 5f6992511d..dfc4c75c93 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/broadcast_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BROADCAST_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BROADCAST_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" enum BroadcastOpType { BROADCAST_TYPE_GREATER = 0, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/concatv2_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/concatv2_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cu index 5cccf183ea..147782591a 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/concatv2_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "kernel/gpu/cuda_impl/concatv2_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh" template __global__ void Concat(const size_t size, const int w1, const int w2, const T* input_1, const T* input_2, T* output) { for (size_t pos = blockIdx.x * blockDim.x + threadIdx.x; pos < (size); pos += blockDim.x * gridDim.x) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/concatv2_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/concatv2_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh index b6932aa4a1..7bd32c140f 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/concatv2_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CONCATV2IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CONCATV2IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void ConcatKernel(const size_t size, const int w1, const int w2, const T* input_1, const T* input_2, T* output, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/correction_mul_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/correction_mul_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cu index ac2f99ed9a..87aaf1351c 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/correction_mul_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cu @@ -16,7 +16,7 @@ #include #include "correction_mul_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void CorrectionMul(const T* weight, const T* gamma, const T* running_std, const int batchsize, const int chw, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/correction_mul_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/correction_mul_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/cross_entropy_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/cross_entropy_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/cross_entropy_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/cross_entropy_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh index 54ae072892..cb4ccc2c44 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/cross_entropy_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CROSSENTROPY_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CROSSENTROPY_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void CrossEntropyWithSparse(const T *logits, const S *labels, const size_t batch_size, const size_t class_num, T *loss, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/dropout_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/dropout_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/dropout_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/dropout_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh index f89d42ce49..3ba27eeeea 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/dropout_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_DROPOUT_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_DROPOUT_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void DropoutForward(const T *input, T *mask, T *output, float *mask_f, size_t num_count, float keep_prob, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/equalcount_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cu similarity index 94% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/equalcount_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cu index 38dd79c441..e6f424c661 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/equalcount_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cu @@ -15,7 +15,7 @@ */ #include "equalcount_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void EqualCount(const int size, const T* input1, const T* input2, T* output) { T equal_count = 0; diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/equalcount_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/equalcount_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh index ad2e387b08..e17615db67 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_QUANT_PERCHANNEL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_QUANT_PERCHANNEL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" void CalNudgePerChannel(float *input_min, float *input_max, const float quant_min, const float quant_max, float *nudge_min, float *nudge_max, float *scale, const int channel_num, const bool symmetric, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh index dda95ed781..5f6675b2d7 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_QUANT_PERLAYER_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_QUANT_PERLAYER_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" void CalNudgePerLayer(float *input_min, float *input_max, const float quant_min, const float quant_max, float *nudge_min, float *nudge_max, float *scale, const bool symmetric, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/float_status_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/float_status_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cu index c2fd5ecd70..bc400eb704 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/float_status_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cu @@ -15,7 +15,7 @@ */ #include "include/cuda_runtime.h" -#include "kernel/gpu/cuda_impl/float_status_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh" template __global__ void IsNan(const size_t size, const T* input, bool* out) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/float_status_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/float_status_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh index da488ff937..fbe063e72a 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/float_status_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_FLOATSTATUS_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_FLOATSTATUS_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void CalFloatStatus(const size_t size, const T *input, T *output, cudaStream_t stream); template diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/ftrl_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/ftrl_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cu index ea6ffdbbdc..be4415d509 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/ftrl_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/ftrl_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh" template __device__ __forceinline__ T PowFunc(T x, T y) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/ftrl_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/ftrl_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh index ba4a8fa816..b5f0f82afe 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/ftrl_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FTRL_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FTRL_IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void ApplyFtrl(const size_t size, const T *gradient, const T *learning_rate, const T *l1_regularization, const T *l2_regularization, const T *learning_rate_power, T *variable, T *accumulation, T *linear, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/gather.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cu similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/gather.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cu index 6bde359d9b..03b58b81a0 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/gather.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cu @@ -15,8 +15,8 @@ */ #include -#include "kernel/gpu/cuda_impl/gather.cuh" -#include "device/gpu/cuda_common.h" +#include "backend/kernel_compiler/gpu/cuda_impl/gather.cuh" +#include "runtime/device/gpu/cuda_common.h" template __global__ void GatherKernel(T *input, S *indices, T *output, size_t output_dim0, size_t output_dim1, size_t output_dim2, size_t input_dim1) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/gather.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/gather.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/gelu_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/gelu_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cu index e460caec9e..a4dc6648cc 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/gelu_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/gelu_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh" +#include "runtime/device/gpu/cuda_common.h" template __global__ void GeluKernel(size_t size, T *input_addr, T *output_addr) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/gelu_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/gelu_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh index 7a8e1fae8a..1e69f26d57 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/gelu_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_GELU_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_GELU_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void Gelu(size_t input_size, T* input_addr, T* output_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_grad_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_grad_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cu index e887b98eca..fcb7418952 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_grad_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cu @@ -17,8 +17,8 @@ #include #include #include -#include "kernel/gpu/cuda_impl/layer_norm_grad_impl.cuh" -#include "kernel/gpu/cuda_impl/layer_norm_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh" constexpr int NUM_PER_THREAD_REDUCE = 4; constexpr int WARP_SIZE = 32; diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_grad_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_grad_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh index 9f7d57cdb9..13d7a58614 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_grad_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LAYER_NORM_GRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LAYER_NORM_GRAD_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void LayerNormGrad(const int& row_dim, const int& col_dim, const int& param_dim, const T& epsilon, const T* dy, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cu index cfb60f0ba6..138300b303 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "kernel/gpu/cuda_impl/layer_norm_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh" constexpr int NUM_PER_THREAD_REDUCE = 4; constexpr int WARP_SIZE = 32; diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh index c06a698384..9548b30d44 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/layer_norm_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LAYER_NORM_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LAYER_NORM_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template struct DynamicSharedMem; diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/minmax_update_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/minmax_update_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cu index 27b2cb0232..3915dba172 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/minmax_update_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cu @@ -20,7 +20,7 @@ #include #include #include "minmax_update_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" __global__ void UpdateInputMinMaxPerLayerWithEMA(const float *input_min, const float *input_max, float *output_min, float *output_max, const float min, const float max, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/minmax_update_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/minmax_update_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh index 5e9becab38..b4b4d582ee 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/minmax_update_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_MIN_MAX_UPDATE_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_MIN_MAX_UPDATE_IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" void CalMinMaxPerChannel(float *input, float *input_min, float *input_max, float *output_min, float *output_max, const int total_num, const int channel_num, const float ema_decay, const bool ema, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/momentum_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/momentum_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/momentum_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/momentum_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh index 5405f5ef1d..62708663ad 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/momentum_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_MOMENTUMIMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_MOMENTUMIMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void MomentumUpdateVariable(const size_t size, T *variable, T *accumulation, const S *learning_rate, const T *gradient, const S *momentum, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/one_hot_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/one_hot_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cu index cf5dc7ecd0..6dc4d676f2 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/one_hot_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cu @@ -15,7 +15,7 @@ */ #include "one_hot_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void OneHotKernel(size_t size, const S *indices, size_t depth, const T *on_value, const T *off_value, size_t left_dim_size, size_t right_dim_size, T *output) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/one_hot_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/one_hot_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/pad_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/pad_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cu index ddc615d94b..3bb4d04a01 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/pad_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cu @@ -16,7 +16,7 @@ #include #include -#include "kernel/gpu/cuda_impl/pad_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" template __global__ void Pad(const size_t size, const T* input, const int num, const int channels, const int old_height, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/pad_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/pad_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh index dc3036b8b6..b10804fdab 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/pad_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_PADIMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_PADIMPL_H_ #include -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void CalPad(const size_t size, const T* input, const int num, const int channels, const int old_height, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/random_op_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/random_op_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/random_op_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/random_op_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh index 5e9110a1bc..b099ead9bf 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/random_op_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_RANDOMOPIMPL_H_ #include -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void StandardNormal(int seed, int seed2, curandState *globalState, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/rmsprop_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cu similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/rmsprop_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cu index 913aaa3b8d..80806b552f 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/rmsprop_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cu @@ -15,8 +15,8 @@ */ #include -#include "kernel/gpu/cuda_impl/rmsprop_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh" +#include "runtime/device/gpu/cuda_common.h" template __global__ void RmsPropKernel(const T* learning_rate, const T decay, const T momentum, const T epsilon, T* variable, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/rmsprop_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/rmsprop_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh index b5802dbb67..16ad611381 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/rmsprop_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_RMSPROP_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_RMSPROP_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void RmsProp(const T* learning_rate, const T decay, const T momentum, const T epsilon, T* variable, T* mean_square, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/select_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cu similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/select_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cu index f07a820e75..f7086f8093 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/select_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "kernel/gpu/cuda_impl/select_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh" template __global__ void Select(const size_t size, const bool* cond, const T* input_x, const T* input_y, T* output) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/select_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/select_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh index da2d7d9a7f..e201ab352c 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/select_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SELECT_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SELECT_IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void CalSelect(const size_t size, const bool* cond, const T* input_x, const T* input_y, T* output, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu similarity index 95% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu index a0082b84c8..f0c64bfb01 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh" template __global__ void SigmoidCrossEntropyWithLogitsGradKernel(const size_t size, const T *logits, const S *labels, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh index 2cd4922d25..6b444d6c02 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GRAD_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GRAD_IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void SigmoidCrossEntropyWithLogitsGrad(const size_t size, const T *logits, const S *labels, T *outputs, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu similarity index 94% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu index 3766f367db..7425ac3809 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh" template __global__ void SigmoidCrossEntropyWithLogitsKernel(const size_t size, const T *logits, const S *labels, T *outputs) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh index 575605bde0..7e9130857f 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_IMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void SigmoidCrossEntropyWithLogits(const size_t size, const T *logits, const S *labels, T *outputs, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/slice_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cu similarity index 99% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/slice_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cu index e49a22bb46..dd4effc174 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/slice_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cu @@ -18,7 +18,7 @@ #include #include #include -#include "kernel/gpu/cuda_impl/slice_impl.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" template __global__ void Slice4D(const int s1, const int s2, const int s3, const int s4, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/slice_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/slice_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh index 9513d6ed24..e04f277c3d 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/slice_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh @@ -19,7 +19,7 @@ #include #include -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/smooth_l1_loss_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cu similarity index 98% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/smooth_l1_loss_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cu index bebcd50a0f..9050044b7f 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/smooth_l1_loss_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cu @@ -15,7 +15,7 @@ */ #include "smooth_l1_loss_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void SmoothL1LossKernel(const int input_size, const float sigma, const T *prediction, const T *target, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/smooth_l1_loss_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/smooth_l1_loss_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh index d16131470c..fa32260381 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPARSECROSSENTROPYCUDAIMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPARSECROSSENTROPYCUDAIMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void CalCrossEntropy(const float *logits, T *labels, const int batch_size, const int class_num, float *loss, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/transpose_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cu similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/transpose_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cu index a0fea90136..ffcb2c8052 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/transpose_impl.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cu @@ -16,7 +16,7 @@ #include #include "transpose_impl.cuh" -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template __global__ void Transpose(const int size, const T* input, const int* input_shape, const int* input_axis, const int shape_size, T* output) { diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/transpose_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/transpose_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/unary_op_impl.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cu similarity index 100% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/unary_op_impl.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cu diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/unary_op_impl.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/unary_op_impl.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh index 623b1a8c03..cf8b30866e 100755 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/unary_op_impl.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNARYOPIMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNARYOPIMPL_H_ -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void Exponential(T *input, T *output, size_t count, cudaStream_t cuda_stream); template diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/unsorted_segment_sum.cu b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cu similarity index 97% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/unsorted_segment_sum.cu rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cu index a7affd4705..3d299c2352 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/unsorted_segment_sum.cu +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/cuda_impl/unsorted_segment_sum.cuh" +#include "backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh" template __global__ void UnsortedSegmentSum(size_t input_dim0, size_t input_dim1, size_t output_dim0, size_t output_dim1, diff --git a/mindspore/ccsrc/kernel/gpu/cuda_impl/unsorted_segment_sum.cuh b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh similarity index 96% rename from mindspore/ccsrc/kernel/gpu/cuda_impl/unsorted_segment_sum.cuh rename to mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh index ef95032996..315677fde4 100644 --- a/mindspore/ccsrc/kernel/gpu/cuda_impl/unsorted_segment_sum.cuh +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNSORT_SEGMENT_SUM_H_ #include -#include "device/gpu/cuda_common.h" +#include "runtime/device/gpu/cuda_common.h" template void UnsortedSegmentSum(size_t input_dim0, size_t input_dim1, size_t output_dim0, size_t output_dim1, diff --git a/mindspore/ccsrc/kernel/gpu/data/dataset_init_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.cc similarity index 91% rename from mindspore/ccsrc/kernel/gpu/data/dataset_init_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.cc index 777310cebc..3c88b88c74 100644 --- a/mindspore/ccsrc/kernel/gpu/data/dataset_init_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "kernel/gpu/data/dataset_init_kernel.h" -#include "kernel/gpu/data/dataset_utils.h" -#include "device/gpu/gpu_buffer_mgr.h" -#include "device/gpu/gpu_memory_allocator.h" +#include "backend/kernel_compiler/gpu/data/dataset_init_kernel.h" +#include "backend/kernel_compiler/gpu/data/dataset_utils.h" +#include "runtime/device/gpu/gpu_buffer_mgr.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/gpu/data/dataset_init_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/data/dataset_init_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.h index 318049f4ad..f8cc9b19ea 100644 --- a/mindspore/ccsrc/kernel/gpu/data/dataset_init_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/data/dataset_iterator_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/data/dataset_iterator_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.cc index 13ca191b0b..67a487ce28 100644 --- a/mindspore/ccsrc/kernel/gpu/data/dataset_iterator_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/gpu/data/dataset_iterator_kernel.h" +#include "backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h" #include #include #include -#include "device/gpu/gpu_buffer_mgr.h" -#include "device/gpu/gpu_common.h" -#include "kernel/gpu/data/dataset_utils.h" +#include "runtime/device/gpu/gpu_buffer_mgr.h" +#include "runtime/device/gpu/gpu_common.h" +#include "backend/kernel_compiler/gpu/data/dataset_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/data/dataset_iterator_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/gpu/data/dataset_iterator_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h index cdd7a47e7b..746aed3294 100644 --- a/mindspore/ccsrc/kernel/gpu/data/dataset_iterator_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/data/dataset_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/data/dataset_utils.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.cc index 846a63f84f..cb014a3d2b 100644 --- a/mindspore/ccsrc/kernel/gpu/data/dataset_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/data/dataset_utils.h" +#include "backend/kernel_compiler/gpu/data/dataset_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/data/dataset_utils.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.h similarity index 100% rename from mindspore/ccsrc/kernel/gpu/data/dataset_utils.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.h diff --git a/mindspore/ccsrc/kernel/gpu/gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/kernel/gpu/gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.h index c935798f06..4c179f2173 100644 --- a/mindspore/ccsrc/kernel/gpu/gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.h @@ -21,11 +21,11 @@ #include #include #include -#include "kernel/kernel.h" -#include "kernel/gpu/kernel_constants.h" -#include "device/gpu/gpu_device_manager.h" -#include "device/gpu/gpu_common.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "runtime/device/gpu/gpu_device_manager.h" +#include "runtime/device/gpu/gpu_common.h" +#include "backend/session/anf_runtime_algorithm.h" using AnfAlgo = mindspore::session::AnfRuntimeAlgorithm; namespace mindspore { diff --git a/mindspore/ccsrc/kernel/gpu/gpu_kernel_factory.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/gpu_kernel_factory.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc index b00b5c263d..3820089e35 100644 --- a/mindspore/ccsrc/kernel/gpu/gpu_kernel_factory.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" #include #include #include "common/utils.h" -#include "device/kernel_info.h" -#include "device/gpu/cuda_common.h" -#include "kernel/common_utils.h" +#include "runtime/device/kernel_info.h" +#include "runtime/device/gpu/cuda_common.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/gpu_kernel_factory.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/gpu_kernel_factory.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.h index dc5f61a315..8834fa0f1a 100644 --- a/mindspore/ccsrc/kernel/gpu/gpu_kernel_factory.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.h @@ -21,9 +21,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "device/gpu/kernel_info_setter.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/kernel_constants.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/kernel_constants.h similarity index 100% rename from mindspore/ccsrc/kernel/gpu/kernel_constants.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/kernel_constants.h diff --git a/mindspore/ccsrc/kernel/gpu/math/addn_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/math/addn_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.cc index 4683f015ae..86c7d8c108 100644 --- a/mindspore/ccsrc/kernel/gpu/math/addn_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/addn_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/addn_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/addn_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/math/addn_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.h index 41930d3d7b..b69bd20216 100644 --- a/mindspore/ccsrc/kernel/gpu/math/addn_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.h @@ -19,11 +19,11 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/math/broadcast_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/slice_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/assign_add_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/math/assign_add_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.cc index 2ae1728ca3..bffcca158b 100644 --- a/mindspore/ccsrc/kernel/gpu/math/assign_add_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/assign_add_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/assign_add_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/math/assign_add_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h index db69fd7be6..04a74b3412 100644 --- a/mindspore/ccsrc/kernel/gpu/math/assign_add_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/assign_add_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/math/bias_add_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/math/bias_add_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.cc index 5684f0c424..a07fb6ddf6 100644 --- a/mindspore/ccsrc/kernel/gpu/math/bias_add_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/bias_add_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/bias_add_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/math/bias_add_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.h index 5a664db2e1..fd344be28a 100644 --- a/mindspore/ccsrc/kernel/gpu/math/bias_add_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/bias_add_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/broadcast_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/kernel/gpu/math/broadcast_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.cc index 96d51b704c..41e7147328 100644 --- a/mindspore/ccsrc/kernel/gpu/math/broadcast_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/broadcast_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/broadcast_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/math/broadcast_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h index be7d3a19d4..aaf827723a 100644 --- a/mindspore/ccsrc/kernel/gpu/math/broadcast_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/broadcast_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/math/broadcast_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/math/broadcast_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.cc index 85598cf940..49be2fd9a6 100644 --- a/mindspore/ccsrc/kernel/gpu/math/broadcast_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/broadcast_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/broadcast_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/math/broadcast_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h index f1eb5fecf9..6258c5c4e2 100644 --- a/mindspore/ccsrc/kernel/gpu/math/broadcast_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/broadcast_grad_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/math/equalcount_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/math/equalcount_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.cc index f3c3b6164d..3103f30f52 100644 --- a/mindspore/ccsrc/kernel/gpu/math/equalcount_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/equalcount_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/equalcount_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/math/equalcount_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h index 7d3f74970f..eae7a893b7 100644 --- a/mindspore/ccsrc/kernel/gpu/math/equalcount_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_EQUALCOUNT_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/equalcount_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/float_status_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/math/float_status_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.cc index 374644eaf5..313669a647 100644 --- a/mindspore/ccsrc/kernel/gpu/math/float_status_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/float_status_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/float_status_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/math/float_status_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h index 1aa9b18684..be74f2e9dc 100644 --- a/mindspore/ccsrc/kernel/gpu/math/float_status_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/float_status_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/matmul_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/math/matmul_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.cc index 808d599853..471c394598 100644 --- a/mindspore/ccsrc/kernel/gpu/math/matmul_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/matmul_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/matmul_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/math/matmul_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h index 3ee3493ed6..7888d442c9 100644 --- a/mindspore/ccsrc/kernel/gpu/math/matmul_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/gpu/math/random_op_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/math/random_op_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.cc index d54fe285c2..c72c271c52 100644 --- a/mindspore/ccsrc/kernel/gpu/math/random_op_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/random_op_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/random_op_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/math/random_op_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h index 3767cd9fc8..785ac02ee5 100644 --- a/mindspore/ccsrc/kernel/gpu/math/random_op_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/random_op_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/unary_op_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/math/unary_op_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.cc index 77f53fc417..ae8e7bbd0b 100644 --- a/mindspore/ccsrc/kernel/gpu/math/unary_op_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/math/unary_op_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/math/unary_op_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/math/unary_op_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h index 4503b805f6..26993bc3bd 100644 --- a/mindspore/ccsrc/kernel/gpu/math/unary_op_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/unary_op_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nccl/nccl_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nccl/nccl_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.cc index 6993085a75..c6e3c4c043 100644 --- a/mindspore/ccsrc/kernel/gpu/nccl/nccl_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nccl/nccl_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nccl/nccl_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nccl/nccl_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h index b5ab46a67d..4c3c3189fb 100644 --- a/mindspore/ccsrc/kernel/gpu/nccl/nccl_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h @@ -23,10 +23,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "device/gpu/distribution/collective_init.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "runtime/device/gpu/distribution/collective_init.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/activation_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/activation_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.cc index 5e80cccd75..334550b213 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/activation_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/activation_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/activation_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/activation_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h index bf6cfa7b23..d651da75e0 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/activation_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/activation_grad_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/activation_grad_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.cc index 35d11f8b47..8fd486c08c 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/activation_grad_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/activation_grad_kernel.h" +#include "backend/kernel_compiler/gpu/nn/activation_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/activation_grad_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/activation_grad_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.h index 38e34eb752..ffdb618098 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/activation_grad_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/adam_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/adam_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.cc index 049a5cc280..0f89eb4419 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/adam_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/adam_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/adam_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/adam_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h index 93c6381ab3..e2fc87ed51 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/adam_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_ADAM_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/adam_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/nn/bias_add_grad_gpu_kenel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/bias_add_grad_gpu_kenel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.cc index ce6c9beeb7..6131aa8568 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/bias_add_grad_gpu_kenel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/bias_add_grad_gpu_kenel.h" +#include "backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/bias_add_grad_gpu_kenel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/bias_add_grad_gpu_kenel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h index 9b4f18d24c..3e15b818be 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/bias_add_grad_gpu_kenel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h @@ -23,9 +23,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.cc index df6825e079..f9bb710b94 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/conv2d_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h index f51cbfef33..6072614e22 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/conv2d_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/pad_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.cc index 28e9a10ccc..ca16e1a18c 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h index 0d7be25772..638da4a99f 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_filter_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/pad_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.cc index 12b6f91537..d8441fb67c 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h index a33ea5b4da..a9a1e5c0cc 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/conv2d_grad_input_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/pad_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/ctcloss_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/ctcloss_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.cc index 355d238ab4..155451875c 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/ctcloss_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/ctcloss_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/ctcloss_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/ctcloss_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h index 2bd83b3176..8b02354516 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/ctcloss_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "device/gpu/gpu_memory_allocator.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/dropout_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/dropout_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.cc index 459010e9e9..423a230b6e 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/dropout_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/dropout_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/dropout_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/dropout_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h index 4dfacb7ca1..2104d7af35 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/dropout_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_DROPOUT_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/dropout_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh" #include "include/curand.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/gpu/nn/dropout_grad_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/dropout_grad_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.cc index 2fd21c96ee..faf884c2eb 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/dropout_grad_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/dropout_grad_kernel.h" +#include "backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/dropout_grad_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/dropout_grad_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h index e6683e15dd..a3a7250c9b 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/dropout_grad_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_DROPOUT_GRAD_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/dropout_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/flatten_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/flatten_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc index f9c993d31d..d8206aedcd 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/flatten_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/flatten_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/flatten_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/flatten_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h index 3b0ad8c946..a140579a3c 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/flatten_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/flatten_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/flatten_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.cc index 0e079d137b..c07126a2ed 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/flatten_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/flatten_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/flatten_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/flatten_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h index 0748dc77db..b21327bc3b 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/flatten_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/ftrl_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/ftrl_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.cc index 4d30130931..0186153745 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/ftrl_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/ftrl_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/ftrl_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/ftrl_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h index 9e2153965b..ea08741dba 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/ftrl_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_FTRL_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/ftrl_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/nn/fused_adam_weight_decay.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/fused_adam_weight_decay.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.cc index 99af1add46..5ef2fd8786 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/fused_adam_weight_decay.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/fused_adam_weight_decay.h" +#include "backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/fused_adam_weight_decay.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/fused_adam_weight_decay.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h index f13f6ed59f..c4fd31a737 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/fused_adam_weight_decay.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_FUSED_ADAM_WEIGHT_DECAY_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "kernel/gpu/cuda_impl/adam_weight_decay_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/fused_batch_norm_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/fused_batch_norm_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.cc index 91747d24d8..2ce39b63a0 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/fused_batch_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/fused_batch_norm_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/fused_batch_norm_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/fused_batch_norm_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.h index b0a898209b..774428dc40 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/fused_batch_norm_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batch_norm_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_FUSED_BATCH_NORM_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc index 3947aaea9a..546e034f6b 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.h index 712354b17c..a2d0d741b1 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/fused_batchnorm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_batchnorm_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_FUSED_BATCHNORM_GRAD_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/gelu_grad_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/gelu_grad_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.cc index 32d91be80a..274e4896c9 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/gelu_grad_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/gelu_grad_kernel.h" +#include "backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/gelu_grad_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h similarity index 91% rename from mindspore/ccsrc/kernel/gpu/nn/gelu_grad_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h index 6415349012..823da1fe9f 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/gelu_grad_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_GELU_GRAD_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "kernel/gpu/cuda_impl/gelu_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/gelu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/gelu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.cc index ca54ff68ad..03cd9a155b 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/gelu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/gelu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/gelu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/gelu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.h similarity index 90% rename from mindspore/ccsrc/kernel/gpu/nn/gelu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.h index 60968d109b..76d3861d55 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/gelu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_GELU_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "kernel/gpu/cuda_impl/gelu_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/layer_norm_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.cc index 19e4dc17a6..49f556ae64 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/layer_norm_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/layer_norm_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h index d5ec3ff8f2..74669e03de 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_LAYER_NORM_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/layer_norm_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/layer_norm_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.cc index 7991d42499..b59f95b8a2 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/layer_norm_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/layer_norm_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h index 83bdedb9b3..93967adad3 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/layer_norm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_LAYER_NORM_GRAD_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/layer_norm_grad_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/lstm_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/lstm_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.cc index c745c216f7..a24aaeeb96 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/lstm_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/lstm_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/lstm_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/lstm_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h index 42eda96b02..ad3e588f00 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/lstm_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_data_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/lstm_grad_data_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.cc index ab88308d4e..1fa47690b3 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_data_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/lstm_grad_data_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_data_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/lstm_grad_data_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h index 6eeefa262c..6d6bed5555 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_data_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_weight_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/lstm_grad_weight_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.cc index 856a986e07..9ec239491f 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_weight_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/lstm_grad_weight_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_weight_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/lstm_grad_weight_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h index a1a4852c84..445d2ce199 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/lstm_grad_weight_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/nn/momentum_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/momentum_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.cc index e8b2b17706..99ae2affe8 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/momentum_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/momentum_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/momentum_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/momentum_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h index 5abfb9e97b..32d3fbb079 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/momentum_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_MOMENTUM_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/momentum_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/nn/pooling_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/pooling_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.cc index e871af360a..902b0d9faf 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/pooling_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/pooling_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/pooling_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/pooling_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h index 0dda1e8998..908a4e9b99 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/pooling_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/pad_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/pooling_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/pooling_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.cc index c3d4a44943..2948c900d2 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/pooling_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/pooling_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/pooling_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/kernel/gpu/nn/pooling_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h index e8f1ebc1af..a066eacfa0 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/pooling_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/pad_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/rmsprop_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/rmsprop_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.cc index 032e8eeec4..c33909a82b 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/rmsprop_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/rmsprop_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/rmsprop_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/nn/rmsprop_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h index 9e148b690d..9811c71094 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/rmsprop_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_RMSPROP_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/rmsprop_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc index 1e650811fd..96d2d29549 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h index 8d0efe90b4..a2d3aabb68 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc index dabc4df850..05c9a4234b 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h index 01f416f6b7..88ab46a6ba 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GRAD_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.cc index dec1d23663..ea40bea6a4 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/smooth_l1_loss_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h index 1317e7a6a0..dc20f75077 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SMOOTH_L1_LOSS_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/smooth_l1_loss_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc index c4acd1fb45..8a4fb38460 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h index 5319e0496c..02be336932 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SMOOTH_L1_LOSS_GRAD_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/smooth_l1_loss_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc index 160a26d200..8a64762c0a 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h index 8256174bcb..e56cb96fd7 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/cross_entropy_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/softmax_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/nn/softmax_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.cc index b9667ed85b..24c2c12601 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/softmax_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/softmax_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/softmax_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/nn/softmax_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h index 9d5a2a24e1..279bac3aa9 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/softmax_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SOFTMAX_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "kernel/gpu/cuda_impl/transpose_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/softmax_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/nn/softmax_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.cc index 5b07136522..bd20413d08 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/softmax_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/softmax_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/softmax_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/softmax_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h index d73503d5a5..b814be9969 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/softmax_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SOFTMAX_GRAD_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "kernel/gpu/cuda_impl/transpose_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc index 537eeb5726..81b46f520c 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h index 6950f0e308..bcb8a6b333 100644 --- a/mindspore/ccsrc/kernel/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/cross_entropy_impl.cuh" -#include "kernel/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh" +#include "backend/kernel_compiler/gpu/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/other/assign_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/other/assign_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.cc index 0f3e0c95f4..4e07463a6c 100644 --- a/mindspore/ccsrc/kernel/gpu/other/assign_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/other/assign_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/other/assign_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/other/assign_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/other/assign_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.h index b41d583a43..76e863393c 100644 --- a/mindspore/ccsrc/kernel/gpu/other/assign_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_ASSIGN_GPU_KERNEL_H #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.cc index af95767407..92652f67f9 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/quant/batchnorm_fold2_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h index b898f34689..83600e20df 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_BATCHNORMFOLD2_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/batchnorm_fold2_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc index 93862aeedd..6fc080713a 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h index e0bafdb96a..3335210925 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_BATCHNORMFOLD2_GRAD_GPU_KERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/batchnorm_fold2_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.cc index 4f968a0fa3..95349c84aa 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/quant/batchnorm_fold_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h index 6cd001fd2e..11b150686c 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_BATCHNORM_FOLD_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/kernel_constants.h" -#include "kernel/gpu/cuda_impl/batchnorm_fold_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc index 93ea66258d..b727c6c7df 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h index 7a3ed7ef91..93a3cbf46e 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/batchnorm_fold_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_BATCHNORM_FOLD_GRAD_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/batchnorm_fold_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/kernel/gpu/quant/correction_mul_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.cc index a914b6ec14..9af5451c53 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/gpu/quant/correction_mul_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/correction_mul_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h index 29aeabb03a..4ba6285e4b 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CORRECTIONMUL_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/correction_mul_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.cc similarity index 88% rename from mindspore/ccsrc/kernel/gpu/quant/correction_mul_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.cc index 28b5d56e68..63a47bc452 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/correction_mul_grad_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/correction_mul_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/gpu/quant/correction_mul_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h index 3feffa586b..b9fcbf0787 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/correction_mul_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CORRECTIONMULGRAD_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/gpu/cuda_impl/correction_mul_impl.cuh" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.cc index 8db6ddd848..8a43ce0941 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h index 122fe96af3..8e2c9524b2 100755 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKEQUANT_PER_CHANNEL_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc index 5c774c05ed..598a6a960d 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/fake_quant_perchannel_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h index d863a2c99f..c2611ab8a2 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKEQUANT_PER_CHANNEL_GRAD_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.cc index 44869983eb..24edec97a9 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h index 38810e06df..6df4da3104 100755 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKEQUANT_PERLAYER_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc index c8d57b2bb1..f96b6a48d2 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/fake_quant_perlayer_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h index ae2ea5bfac..475723f684 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKEQUANT_PERLAYER_GRAD_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.cc index a8ce72148b..742a9b8c55 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/minmax_update_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h index 563a583ca1..9a0fe23e6a 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perchannel_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_MINMAX_UPDATE_PERCHANNEL_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.cc index 3659665b23..8f11e907e1 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.h" -#include "kernel/gpu/cuda_impl/minmax_update_impl.cuh" +#include "backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h" +#include "backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h index a237b6dc26..80ce6185c0 100644 --- a/mindspore/ccsrc/kernel/gpu/quant/minmax_update_perlayer_gpu_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_MINMAX_UPDATE_PERLAYER_GPUKERNEL_H_ #include -#include "kernel/gpu/gpu_kernel.h" -#include "kernel/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hccl_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc similarity index 97% rename from mindspore/ccsrc/kernel/hccl/hccl_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc index d5d6e55698..5ec4f52574 100644 --- a/mindspore/ccsrc/kernel/hccl/hccl_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "kernel/hccl/hccl_kernel.h" -#include "device/ascend/tasksink/runtime_utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "runtime/device/ascend/tasksink/runtime_utils.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/kernel/hccl/hccl_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hccl_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h index 72e202591f..db7a0fbf7c 100644 --- a/mindspore/ccsrc/kernel/hccl/hccl_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h @@ -23,8 +23,8 @@ #include #include #include -#include "kernel/ascend_kernel_mod.h" -#include "kernel/hccl/hcom_util.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "backend/kernel_compiler/hccl/hcom_util.h" #include "hccl/hcom.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/kernel/hccl/hccl_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.cc similarity index 88% rename from mindspore/ccsrc/kernel/hccl/hccl_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.cc index d6e4aa09b9..8297be0b6d 100644 --- a/mindspore/ccsrc/kernel/hccl/hccl_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "kernel/hccl/hccl_kernel_build.h" +#include "backend/kernel_compiler/hccl/hccl_kernel_build.h" #include #include #include -#include "kernel/hccl/hccl_kernel.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hccl_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.h similarity index 95% rename from mindspore/ccsrc/kernel/hccl/hccl_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.h index f20760a3eb..21b34d6522 100644 --- a/mindspore/ccsrc/kernel/hccl/hccl_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.h @@ -19,7 +19,7 @@ #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hccl_kernel_metadata.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.cc similarity index 94% rename from mindspore/ccsrc/kernel/hccl/hccl_kernel_metadata.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.cc index bfd1327548..55742d383c 100755 --- a/mindspore/ccsrc/kernel/hccl/hccl_kernel_metadata.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/hccl/hccl_kernel_metadata.h" +#include "backend/kernel_compiler/hccl/hccl_kernel_metadata.h" #include #include #include "utils/utils.h" -#include "kernel/hccl/hcom_util.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/hccl/hcom_util.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hccl_kernel_metadata.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.h similarity index 95% rename from mindspore/ccsrc/kernel/hccl/hccl_kernel_metadata.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.h index b13393d3bd..25891fdaf6 100755 --- a/mindspore/ccsrc/kernel/hccl/hccl_kernel_metadata.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.h @@ -18,7 +18,7 @@ #include #include #include -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_broadcast.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hcom_all_broadcast.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc index 9dbe708ef9..e9fb4c9314 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_broadcast.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/hccl/hcom_all_broadcast.h" +#include "backend/kernel_compiler/hccl/hcom_all_broadcast.h" #include #include diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_broadcast.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.h similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hcom_all_broadcast.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.h index ca8eba91af..6434b5fb9c 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_broadcast.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.h @@ -20,7 +20,7 @@ #include #include #include "hccl/hcom.h" -#include "kernel/hccl/hccl_kernel.h" +#include "backend/kernel_compiler/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_gather.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hcom_all_gather.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc index 6494f7fd12..201071dcb5 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_gather.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/hccl/hcom_all_gather.h" +#include "backend/kernel_compiler/hccl/hcom_all_gather.h" #include #include diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_gather.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.h similarity index 95% rename from mindspore/ccsrc/kernel/hccl/hcom_all_gather.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.h index 5de2c513cf..21d8ffa484 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_gather.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.h @@ -20,7 +20,7 @@ #include #include #include "hccl/hcom.h" -#include "kernel/hccl/hccl_kernel.h" +#include "backend/kernel_compiler/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hcom_all_reduce.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc index 35a058e766..533ce1b087 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/hccl/hcom_all_reduce.h" +#include "backend/kernel_compiler/hccl/hcom_all_reduce.h" #include #include diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.h similarity index 95% rename from mindspore/ccsrc/kernel/hccl/hcom_all_reduce.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.h index 939abd9de7..39641f7448 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.h @@ -19,7 +19,7 @@ #include #include -#include "kernel/hccl/hccl_kernel.h" +#include "backend/kernel_compiler/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce_scatter.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hcom_all_reduce_scatter.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc index dea516885d..32c6dacb01 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce_scatter.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/hccl/hcom_all_reduce_scatter.h" +#include "backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h" #include #include diff --git a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce_scatter.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h similarity index 96% rename from mindspore/ccsrc/kernel/hccl/hcom_all_reduce_scatter.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h index c734b517c6..2f4ace5aea 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_all_reduce_scatter.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h @@ -20,7 +20,7 @@ #include #include #include "hccl/hcom.h" -#include "kernel/hccl/hccl_kernel.h" +#include "backend/kernel_compiler/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/hccl/hcom_util.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.cc similarity index 97% rename from mindspore/ccsrc/kernel/hccl/hcom_util.cc rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.cc index 088dbe59d5..721c1b6ba0 100644 --- a/mindspore/ccsrc/kernel/hccl/hcom_util.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/hccl/hcom_util.h" +#include "backend/kernel_compiler/hccl/hcom_util.h" #include -#include "kernel/common_utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/hccl/hcom_util.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.h similarity index 100% rename from mindspore/ccsrc/kernel/hccl/hcom_util.h rename to mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.h diff --git a/mindspore/ccsrc/kernel/kash/kernel_pack.cc b/mindspore/ccsrc/backend/kernel_compiler/kash/kernel_pack.cc similarity index 98% rename from mindspore/ccsrc/kernel/kash/kernel_pack.cc rename to mindspore/ccsrc/backend/kernel_compiler/kash/kernel_pack.cc index a87441031b..9933826f2b 100644 --- a/mindspore/ccsrc/kernel/kash/kernel_pack.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/kash/kernel_pack.cc @@ -15,12 +15,11 @@ */ #include -#include "mindspore/ccsrc/kernel/kernel.h" -#include "kernel/kernel.h" -#include "kernel/akg/akg_kernel_build.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/akg/akg_kernel_build.h" #include "nlohmann/json.hpp" #include "securec/include/securec.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/log_adapter.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/kernel.h b/mindspore/ccsrc/backend/kernel_compiler/kernel.h similarity index 100% rename from mindspore/ccsrc/kernel/kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/kernel.h diff --git a/mindspore/ccsrc/kernel/kernel_build_info.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc similarity index 99% rename from mindspore/ccsrc/kernel/kernel_build_info.cc rename to mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc index bb7ce75ac4..68392d1871 100644 --- a/mindspore/ccsrc/kernel/kernel_build_info.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include #include "utils/log_adapter.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/kernel/kernel_build_info.h b/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.h similarity index 98% rename from mindspore/ccsrc/kernel/kernel_build_info.h rename to mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.h index 45ac45f98f..be243c9ae0 100644 --- a/mindspore/ccsrc/kernel/kernel_build_info.h +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.h @@ -22,7 +22,7 @@ #include #include #include "ir/dtype.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/kernel_fusion.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc similarity index 94% rename from mindspore/ccsrc/kernel/kernel_fusion.cc rename to mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc index be79eca15a..0045e49bef 100644 --- a/mindspore/ccsrc/kernel/kernel_fusion.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include #include @@ -22,10 +22,10 @@ #include #include "common/utils.h" -#include "kernel/tbe/tbe_kernel_build.h" -#include "kernel/tbe/tbe_kernel_parallel_build.h" -#include "kernel/tbe/tbe_utils.h" -#include "kernel/tbe/tbe_convert_utils.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/kernel_fusion.h b/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.h similarity index 96% rename from mindspore/ccsrc/kernel/kernel_fusion.h rename to mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.h index 8ded21787c..2fb3a05b4b 100644 --- a/mindspore/ccsrc/kernel/kernel_fusion.h +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_KERNELFUSION_H_ #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { /* diff --git a/mindspore/ccsrc/kernel/kernel_query.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc similarity index 93% rename from mindspore/ccsrc/kernel/kernel_query.cc rename to mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc index 4a8ae81afa..81b5d0f996 100755 --- a/mindspore/ccsrc/kernel/kernel_query.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "kernel/kernel_query.h" +#include "backend/kernel_compiler/kernel_query.h" #include #include -#include "kernel/aicpu/aicpu_kernel_metadata.h" -#include "kernel/rts/rt_kernel_info.h" -#include "kernel/hccl/hccl_kernel_metadata.h" -#include "kernel/tbe/tbe_kernel_select/tbe_kernel_select.h" -#include "kernel/akg/akg_kernel_metadata.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/hccl/hccl_kernel_metadata.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h" +#include "backend/kernel_compiler/akg/akg_kernel_metadata.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/kernel_query.h b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.h similarity index 93% rename from mindspore/ccsrc/kernel/kernel_query.h rename to mindspore/ccsrc/backend/kernel_compiler/kernel_query.h index 257b0cf073..20458f48d0 100644 --- a/mindspore/ccsrc/kernel/kernel_query.h +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.h @@ -20,8 +20,8 @@ #include #include #include -#include "kernel/kernel.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/oplib/opinfo.h b/mindspore/ccsrc/backend/kernel_compiler/oplib/opinfo.h similarity index 99% rename from mindspore/ccsrc/kernel/oplib/opinfo.h rename to mindspore/ccsrc/backend/kernel_compiler/oplib/opinfo.h index 990702d100..64ae1009d1 100644 --- a/mindspore/ccsrc/kernel/oplib/opinfo.h +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/opinfo.h @@ -21,7 +21,7 @@ #include #include #include "ir/dtype.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/oplib/oplib.cc b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc similarity index 99% rename from mindspore/ccsrc/kernel/oplib/oplib.cc rename to mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc index 5b322c12a4..69c4ca7db1 100644 --- a/mindspore/ccsrc/kernel/oplib/oplib.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/oplib/oplib.h" +#include "backend/kernel_compiler/oplib/oplib.h" #include #include #include diff --git a/mindspore/ccsrc/kernel/oplib/oplib.h b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h similarity index 98% rename from mindspore/ccsrc/kernel/oplib/oplib.h rename to mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h index 742b0977c7..845edbfc2a 100644 --- a/mindspore/ccsrc/kernel/oplib/oplib.h +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h @@ -20,7 +20,7 @@ #include #include #include -#include "kernel/oplib/opinfo.h" +#include "backend/kernel_compiler/oplib/opinfo.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/oplib/oploader.h b/mindspore/ccsrc/backend/kernel_compiler/oplib/oploader.h similarity index 96% rename from mindspore/ccsrc/kernel/oplib/oploader.h rename to mindspore/ccsrc/backend/kernel_compiler/oplib/oploader.h index dd4c37e80b..6b2981e5b3 100644 --- a/mindspore/ccsrc/kernel/oplib/oploader.h +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/oploader.h @@ -18,7 +18,7 @@ #define MINDSPORE_OPLOADER_H #include -#include "kernel/oplib/oplib.h" +#include "backend/kernel_compiler/oplib/oplib.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/assign.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc similarity index 98% rename from mindspore/ccsrc/kernel/rts/assign.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc index 7038004898..552468bb71 100644 --- a/mindspore/ccsrc/kernel/rts/assign.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/rts/assign.h" +#include "backend/kernel_compiler/rts/assign.h" #include diff --git a/mindspore/ccsrc/kernel/rts/assign.h b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.h similarity index 92% rename from mindspore/ccsrc/kernel/rts/assign.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/assign.h index 0e7e52d48f..cff946cc36 100644 --- a/mindspore/ccsrc/kernel/rts/assign.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_RTS_ASSIGN_H #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/label_goto.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc similarity index 95% rename from mindspore/ccsrc/kernel/rts/label_goto.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc index 1d29bb4f35..8ec460fe0b 100644 --- a/mindspore/ccsrc/kernel/rts/label_goto.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/rts/label_goto.h" +#include "backend/kernel_compiler/rts/label_goto.h" #include #include #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" using ge::model_runner::LabelGotoTaskInfo; diff --git a/mindspore/ccsrc/kernel/rts/label_goto.h b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.h similarity index 93% rename from mindspore/ccsrc/kernel/rts/label_goto.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.h index efccc12d6f..2680d916a5 100644 --- a/mindspore/ccsrc/kernel/rts/label_goto.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/label_set.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc similarity index 95% rename from mindspore/ccsrc/kernel/rts/label_set.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc index 4266e2b0af..909885ff17 100644 --- a/mindspore/ccsrc/kernel/rts/label_set.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/rts/label_set.h" +#include "backend/kernel_compiler/rts/label_set.h" #include #include #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" using ge::model_runner::LabelSetTaskInfo; diff --git a/mindspore/ccsrc/kernel/rts/label_set.h b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.h similarity index 93% rename from mindspore/ccsrc/kernel/rts/label_set.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/label_set.h index d05d81f898..8d0cfdfb20 100644 --- a/mindspore/ccsrc/kernel/rts/label_set.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/label_switch.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc similarity index 97% rename from mindspore/ccsrc/kernel/rts/label_switch.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc index bc5282b4af..ccb49d9497 100644 --- a/mindspore/ccsrc/kernel/rts/label_switch.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/rts/label_switch.h" +#include "backend/kernel_compiler/rts/label_switch.h" #include #include #include #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" using ge::model_runner::LabelSwitchTaskInfo; diff --git a/mindspore/ccsrc/kernel/rts/label_switch.h b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.h similarity index 94% rename from mindspore/ccsrc/kernel/rts/label_switch.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.h index 858f851b2a..1860d38d74 100644 --- a/mindspore/ccsrc/kernel/rts/label_switch.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/memcpy_async.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc similarity index 98% rename from mindspore/ccsrc/kernel/rts/memcpy_async.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc index ea33c4dd8b..ca1114a83f 100644 --- a/mindspore/ccsrc/kernel/rts/memcpy_async.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "kernel/rts/memcpy_async.h" +#include "backend/kernel_compiler/rts/memcpy_async.h" #include #include #include "runtime/mem.h" #include "common/utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/trans.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/kernel/rts/memcpy_async.h b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.h similarity index 94% rename from mindspore/ccsrc/kernel/rts/memcpy_async.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.h index 94bbf1ca1c..07a782be50 100644 --- a/mindspore/ccsrc/kernel/rts/memcpy_async.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/profiling_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.cc similarity index 93% rename from mindspore/ccsrc/kernel/rts/profiling_kernel_mod.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.cc index 0161e8562a..8213468b48 100644 --- a/mindspore/ccsrc/kernel/rts/profiling_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "kernel/rts/profiling_kernel_mod.h" +#include "backend/kernel_compiler/rts/profiling_kernel_mod.h" #include #include #include #include "framework/ge_runtime/task_info.h" -#include "device/ascend/profiling/profiling_utils.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "backend/session/anf_runtime_algorithm.h" using ProfilerTraceTaskInfo = ge::model_runner::ProfilerTraceTaskInfo; using mindspore::device::ascend::ProfilingUtils; diff --git a/mindspore/ccsrc/kernel/rts/profiling_kernel_mod.h b/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.h similarity index 96% rename from mindspore/ccsrc/kernel/rts/profiling_kernel_mod.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.h index f77f3b5c67..cdb43afb3e 100644 --- a/mindspore/ccsrc/kernel/rts/profiling_kernel_mod.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_MINDSPORE_CCSRC_KERNEL_RTS_PROFILING_KERNEL_MOD_H_ #define MINDSPORE_MINDSPORE_CCSRC_KERNEL_RTS_PROFILING_KERNEL_MOD_H_ #include -#include "kernel/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" namespace mindspore { namespace kernel { class ProfilingKernelMod : public RtKernel { diff --git a/mindspore/ccsrc/kernel/rts/recv.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc similarity index 94% rename from mindspore/ccsrc/kernel/rts/recv.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc index 3fb2fd6bb5..cee0ef2fdc 100644 --- a/mindspore/ccsrc/kernel/rts/recv.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/rts/recv.h" +#include "backend/kernel_compiler/rts/recv.h" #include #include "runtime/stream.h" #include "utils/context/ms_context.h" -#include "device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_stream_assign.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/rts/recv.h b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.h similarity index 93% rename from mindspore/ccsrc/kernel/rts/recv.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/recv.h index 68f0b69cc5..73e0214eae 100644 --- a/mindspore/ccsrc/kernel/rts/recv.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/rt_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc similarity index 96% rename from mindspore/ccsrc/kernel/rts/rt_kernel.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc index 9e81372383..9279a84cf0 100644 --- a/mindspore/ccsrc/kernel/rts/rt_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/rt_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h similarity index 95% rename from mindspore/ccsrc/kernel/rts/rt_kernel.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h index 44d55dca31..dc0aa3e283 100644 --- a/mindspore/ccsrc/kernel/rts/rt_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "kernel/ascend_kernel_mod.h" -#include "kernel/task_stream.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "backend/kernel_compiler/task_stream.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/rt_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.cc similarity index 88% rename from mindspore/ccsrc/kernel/rts/rt_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.cc index 164605fe9b..9704a9b97f 100644 --- a/mindspore/ccsrc/kernel/rts/rt_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "kernel/rts/rt_kernel_build.h" +#include "backend/kernel_compiler/rts/rt_kernel_build.h" #include #include #include #include -#include "kernel/rts/rt_kernel.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/rt_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.h similarity index 95% rename from mindspore/ccsrc/kernel/rts/rt_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.h index cbd674b751..ccfb8d923b 100644 --- a/mindspore/ccsrc/kernel/rts/rt_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.h @@ -19,7 +19,7 @@ #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { KernelModPtr RtOpBuild(const AnfNodePtr &anf_node); diff --git a/mindspore/ccsrc/kernel/rts/rt_kernel_info.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc similarity index 97% rename from mindspore/ccsrc/kernel/rts/rt_kernel_info.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc index 14f5a60a07..9501aed5f2 100755 --- a/mindspore/ccsrc/kernel/rts/rt_kernel_info.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" #include #include #include "utils/convert_utils.h" #include "utils/utils.h" #include "common/utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/rt_kernel_info.h b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.h similarity index 95% rename from mindspore/ccsrc/kernel/rts/rt_kernel_info.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.h index ae3753b4c8..6048fb3779 100644 --- a/mindspore/ccsrc/kernel/rts/rt_kernel_info.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.h @@ -26,8 +26,8 @@ #include #include "ir/dtype.h" -#include "kernel/kernel_build_info.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/kernel_compiler/kernel.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/rts/send.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc similarity index 96% rename from mindspore/ccsrc/kernel/rts/send.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/send.cc index 298d75befd..11c0a7d668 100644 --- a/mindspore/ccsrc/kernel/rts/send.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "kernel/rts/send.h" +#include "backend/kernel_compiler/rts/send.h" #include #include "runtime/event.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" using ge::model_runner::EventRecordTaskInfo; diff --git a/mindspore/ccsrc/kernel/rts/send.h b/mindspore/ccsrc/backend/kernel_compiler/rts/send.h similarity index 93% rename from mindspore/ccsrc/kernel/rts/send.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/send.h index 5c5b7cf09e..dbadb1ef44 100644 --- a/mindspore/ccsrc/kernel/rts/send.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/send.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_RTS_SEND_H #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/stream_active.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc similarity index 96% rename from mindspore/ccsrc/kernel/rts/stream_active.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc index b573964868..e33549973d 100644 --- a/mindspore/ccsrc/kernel/rts/stream_active.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "kernel/rts/stream_active.h" +#include "backend/kernel_compiler/rts/stream_active.h" #include #include #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" using ge::model_runner::StreamActiveTaskInfo; diff --git a/mindspore/ccsrc/kernel/rts/stream_active.h b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.h similarity index 93% rename from mindspore/ccsrc/kernel/rts/stream_active.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.h index 68c422e7c2..409c3437dc 100644 --- a/mindspore/ccsrc/kernel/rts/stream_active.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_RTS_STREAM_ACTIVE_H #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/rts/stream_switch.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc similarity index 97% rename from mindspore/ccsrc/kernel/rts/stream_switch.cc rename to mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc index 44b0a1ef86..5fe03b1960 100644 --- a/mindspore/ccsrc/kernel/rts/stream_switch.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "kernel/rts/stream_switch.h" +#include "backend/kernel_compiler/rts/stream_switch.h" #include #include #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" using ge::model_runner::StreamSwitchTaskInfo; diff --git a/mindspore/ccsrc/kernel/rts/stream_switch.h b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.h similarity index 93% rename from mindspore/ccsrc/kernel/rts/stream_switch.h rename to mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.h index 4e927f3059..64a51f68bf 100644 --- a/mindspore/ccsrc/kernel/rts/stream_switch.h +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.h @@ -19,8 +19,8 @@ #include #include -#include "kernel/rts/rt_kernel.h" -#include "kernel/rts/rt_kernel_info.h" +#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "backend/kernel_compiler/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/task_stream.h b/mindspore/ccsrc/backend/kernel_compiler/task_stream.h similarity index 100% rename from mindspore/ccsrc/kernel/task_stream.h rename to mindspore/ccsrc/backend/kernel_compiler/task_stream.h diff --git a/mindspore/ccsrc/kernel/tbe/tbe_adapter.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.cc similarity index 99% rename from mindspore/ccsrc/kernel/tbe/tbe_adapter.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.cc index 052b7eb2df..449a9f4556 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_adapter.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_adapter.h" +#include "backend/kernel_compiler/tbe/tbe_adapter.h" #include #include @@ -23,8 +23,8 @@ #include #include -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/opinfo.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/opinfo.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_adapter.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.h similarity index 98% rename from mindspore/ccsrc/kernel/tbe/tbe_adapter.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.h index 354bcb3ebd..aa09efc11f 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_adapter.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.h @@ -22,7 +22,7 @@ #include #include "nlohmann/json.hpp" #include "base/base.h" -#include "kernel/oplib/opinfo.h" +#include "backend/kernel_compiler/oplib/opinfo.h" // Note: This file is mainly used to adapt the ME front-end operator description and // the TBE back-end operator implementation difference namespace mindspore { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc similarity index 97% rename from mindspore/ccsrc/kernel/tbe/tbe_convert_utils.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc index 90c5557253..e7fd94ef84 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_convert_utils.h" +#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.h similarity index 96% rename from mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.h index 3fc52becc2..dea058cd56 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_convert_utils.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_TBE_COMMON_UTILS_H_ #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "base/base.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc similarity index 99% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc index 645a195f5e..73642b291a 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_kernel_build.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include #include #include -#include "operator/ops.h" -#include "parallel/ops_info/ops_utils.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/tbe/tbe_adapter.h" -#include "kernel/tbe/tbe_python_funcs.h" -#include "kernel/tbe/tbe_convert_utils.h" -#include "kernel/tbe/tbe_utils.h" +#include "frontend/operator/ops.h" +#include "frontend/parallel/ops_info/ops_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/tbe/tbe_adapter.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" +#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_build.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.h similarity index 97% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.h index eef02efa87..768f811055 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.h @@ -25,10 +25,10 @@ #include #include #include "ir/dtype.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "pybind11/stl.h" -#include "kernel/oplib/oplib.h" -#include "kernel/tbe/tbe_adapter.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/tbe/tbe_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc similarity index 98% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_mod.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc index 9d5222659a..e6cb4cf30d 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_kernel_mod.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" #include #include "runtime/rt.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_mod.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_mod.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.h index e0e7ab4646..de48c83d9b 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_mod.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.h @@ -21,8 +21,8 @@ #include #include #include -#include "kernel/ascend_kernel_mod.h" -#include "kernel/tbe/tbe_utils.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_parallel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc similarity index 96% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_parallel_build.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc index 43d492f397..48223f40c6 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_parallel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_kernel_parallel_build.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h" #include #include @@ -24,14 +24,14 @@ #include #include "utils/context/ms_context.h" -#include "kernel/tbe/tbe_adapter.h" -#include "kernel/tbe/tbe_kernel_build.h" -#include "kernel/tbe/tbe_kernel_mod.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/tbe/tbe_adapter.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" +#include "backend/session/anf_runtime_algorithm.h" #include "./common.h" -#include "kernel/tbe/tbe_python_funcs.h" -#include "kernel/tbe/tbe_convert_utils.h" -#include "kernel/tbe/tbe_utils.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" +#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_parallel_build.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h similarity index 98% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_parallel_build.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h index 637c03bce3..a29469b47c 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_parallel_build.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h @@ -21,7 +21,7 @@ #include #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "pybind11/stl.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/common_utils.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h similarity index 100% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/common_utils.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc similarity index 98% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc index 8050f02f95..c5e882949b 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/tbe/tbe_kernel_select/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h similarity index 96% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h index af711ddf29..4685df6724 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h @@ -21,7 +21,7 @@ #include #include #include "ir/anf.h" -#include "kernel/tbe/tbe_kernel_select/common_utils.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc similarity index 95% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc index 84f3fc29e3..61aa9dfb91 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" #include #include #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/tbe/tbe_kernel_select/common_utils.h" -#include "kernel/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h similarity index 96% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h index 4cff87d60f..196bb7b06a 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h @@ -20,7 +20,7 @@ #include #include #include "ir/anf.h" -#include "kernel/tbe/tbe_kernel_select/common_utils.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { class TbeKernelReduceSelecter { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc similarity index 97% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc index 5ef5d50e9c..d0563e0ffa 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc @@ -14,23 +14,23 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_kernel_select/tbe_kernel_select.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h" #include #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/oplib.h" -#include "kernel/tbe/tbe_kernel_build.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include "nlohmann/json.hpp" #include "utils/context/ms_context.h" -#include "kernel/tbe/tbe_python_funcs.h" -#include "pre_activate/common/helper.h" -#include "kernel/tbe/tbe_convert_utils.h" -#include "parallel/ops_info/ops_utils.h" -#include "kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" -#include "kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" -#include "kernel/tbe/tbe_kernel_select/common_utils.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" +#include "backend/optimizer/common/helper.h" +#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" +#include "frontend/parallel/ops_info/ops_utils.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h similarity index 95% rename from mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h index c400bdbb6f..679c56379f 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h @@ -20,9 +20,9 @@ #include #include #include -#include "kernel/oplib/opinfo.h" -#include "kernel/kernel_build_info.h" -#include "kernel/tbe/tbe_kernel_select/common_utils.h" +#include "backend/kernel_compiler/oplib/opinfo.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_python_funcs.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_python_funcs.cc similarity index 98% rename from mindspore/ccsrc/kernel/tbe/tbe_python_funcs.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_python_funcs.cc index 7204fb7f96..facb07991a 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_python_funcs.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_python_funcs.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_python_funcs.h" -#include "kernel/tbe/tbe_utils.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" #include "common/utils.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/kernel/tbe/tbe_python_funcs.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_python_funcs.h similarity index 100% rename from mindspore/ccsrc/kernel/tbe/tbe_python_funcs.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_python_funcs.h diff --git a/mindspore/ccsrc/kernel/tbe/tbe_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc similarity index 96% rename from mindspore/ccsrc/kernel/tbe/tbe_utils.cc rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc index ae7e5cb6d5..76ef7b08d5 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "kernel/tbe/tbe_utils.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" #include #include @@ -27,15 +27,15 @@ #include #include "runtime/kernel.h" -#include "kernel/oplib/oplib.h" +#include "backend/kernel_compiler/oplib/oplib.h" #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" #include "ir/dtype/type.h" -#include "kernel/tbe/tbe_convert_utils.h" +#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" #include "securec/include/securec.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/kernel/tbe/tbe_utils.h b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.h similarity index 96% rename from mindspore/ccsrc/kernel/tbe/tbe_utils.h rename to mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.h index 56fbe7967a..39ddaaa73d 100644 --- a/mindspore/ccsrc/kernel/tbe/tbe_utils.h +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.h @@ -23,9 +23,9 @@ #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "ir/anf.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/pre_activate/CMakeLists.txt b/mindspore/ccsrc/backend/optimizer/CMakeLists.txt similarity index 84% rename from mindspore/ccsrc/pre_activate/CMakeLists.txt rename to mindspore/ccsrc/backend/optimizer/CMakeLists.txt index 239757fb17..ee1532a416 100644 --- a/mindspore/ccsrc/pre_activate/CMakeLists.txt +++ b/mindspore/ccsrc/backend/optimizer/CMakeLists.txt @@ -11,4 +11,4 @@ if (ENABLE_D) endif () set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) -add_library(_mindspore_pre_activate_obj OBJECT ${_PREACTIVATE_SRC_LIST}) +add_library(_mindspore_backend_optimizer_obj OBJECT ${_PREACTIVATE_SRC_LIST}) diff --git a/mindspore/ccsrc/pre_activate/ascend/ascend_backend_optimization.cc b/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc similarity index 78% rename from mindspore/ccsrc/pre_activate/ascend/ascend_backend_optimization.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc index f6020500f8..40e7a29c92 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ascend_backend_optimization.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc @@ -13,89 +13,89 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ascend_backend_optimization.h" +#include "backend/optimizer/ascend/ascend_backend_optimization.h" #include #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fission/bn_split.h" -#include "pre_activate/ascend/ir_fission/bn_grad_split.h" -#include "pre_activate/ascend/ir_fission/batch_norm_grad_split.h" -#include "pre_activate/ascend/ir_fission/batch_norm_bert_fission.h" -#include "pre_activate/ascend/ir_fission/single_batch_norm_fission.h" -#include "pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.h" -#include "pre_activate/ascend/ir_fission/layer_norm_grad_split.h" -#include "pre_activate/pass/communication_op_fusion.h" -#include "pre_activate/ascend/ir_fusion/square_sum_fusion.h" -#include "pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" -#include "pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" -#include "pre_activate/ascend/ir_fusion/clip_by_value_fusion.h" -#include "pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_rule.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_right_rule.h" -#include "pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.h" -#include "pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" -#include "pre_activate/ascend/ir_fusion/reshape_transpose_fusion.h" -#include "pre_activate/ascend/ir_fusion/transpose_reshape_fusion.h" -#include "pre_activate/ascend/ir_fusion/adam_apply_one_fusion.h" -#include "pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" -#include "pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.h" -#include "pre_activate/ascend/ir_fusion/refresh_parameter_format.h" -#include "pre_activate/ascend/ir_fusion/transpose_transdata_fusion.h" -#include "pre_activate/ascend/ir_fission/transdata_split.h" -#include "pre_activate/ascend/ir_fission/topk_split.h" -#include "pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.h" -#include "pre_activate/ascend/ir_fusion/mul_add_fusion.h" -#include "pre_activate/ascend/ir_fusion/mul_addn_fusion.h" -#include "pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.h" -#include "pre_activate/ascend/ir_fusion/remove_reshape_pair.h" -#include "pre_activate/ascend/ir_fusion/derelu_fusion.h" -#include "pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.h" -#include "pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" -#include "pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.h" -#include "pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.h" -#include "pre_activate/ascend/format_type/insert_trans_op.h" -#include "pre_activate/ascend/format_type/rectify_do_mask_kernel_info.h" -#include "pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.h" -#include "pre_activate/pass/getitem_tuple.h" -#include "pre_activate/pass/optimize_dependence.h" -#include "pre_activate/pass/erase_visit_attr.h" -#include "pre_activate/ascend/format_type/insert_cast.h" -#include "pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.h" -#include "pre_activate/pass/eliminate_redundant_op.h" -#include "pre_activate/pass/common_subexpression_elimination.h" -#include "pre_activate/pass/fuse_graph_kernel.h" -#include "pre_activate/pass/fuse_basic.h" -#include "pre_activate/pass/add_atomic_clean.h" -#include "pre_activate/ascend/format_type/merge_cast_to_op.h" -#include "pre_activate/ascend/format_type/check_consistency.h" -#include "pre_activate/ascend/buffer_fusion/ub_pattern_fusion.h" -#include "pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" -#include "pre_activate/ascend/format_type/deal_ref_trans_and_cast.h" -#include "pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.h" -#include "pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.h" -#include "pre_activate/ascend/format_type/insert_transdata_for_runop.h" -#include "pre_activate/ascend/enhancer/getnext_memcpy_elimination.h" -#include "pre_activate/ascend/ir_fission/addn_fission.h" -#include "pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.h" -#include "pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.h" -#include "pre_activate/ascend/ir_fission/split_fission.h" -#include "pre_activate/ascend/format_type/modify_ops_attrs.h" -#include "pre_activate/ascend/format_type/remove_no_use_reshape_op.h" -#include "pre_activate/ascend/ir_fusion/add_input_to_output.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fission/bn_split.h" +#include "backend/optimizer/ascend/ir_fission/bn_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h" +#include "backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h" +#include "backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h" +#include "backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h" +#include "backend/optimizer/pass/communication_op_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/square_sum_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h" +#include "backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" +#include "backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h" +#include "backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h" +#include "backend/optimizer/ascend/ir_fission/transdata_split.h" +#include "backend/optimizer/ascend/ir_fission/topk_split.h" +#include "backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/mul_add_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h" +#include "backend/optimizer/ascend/ir_fusion/derelu_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h" +#include "backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" +#include "backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h" +#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h" +#include "backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.h" +#include "backend/optimizer/pass/getitem_tuple.h" +#include "backend/optimizer/pass/optimize_dependence.h" +#include "backend/optimizer/pass/erase_visit_attr.h" +#include "backend/optimizer/ascend/format_type/insert_cast.h" +#include "backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h" +#include "backend/optimizer/pass/eliminate_redundant_op.h" +#include "backend/optimizer/pass/common_subexpression_elimination.h" +#include "backend/optimizer/pass/fuse_graph_kernel.h" +#include "backend/optimizer/pass/fuse_basic.h" +#include "backend/optimizer/pass/add_atomic_clean.h" +#include "backend/optimizer/ascend/format_type/merge_cast_to_op.h" +#include "backend/optimizer/ascend/format_type/check_consistency.h" +#include "backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h" +#include "backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.h" +#include "backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.h" +#include "backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h" +#include "backend/optimizer/ascend/format_type/insert_transdata_for_runop.h" +#include "backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.h" +#include "backend/optimizer/ascend/ir_fission/addn_fission.h" +#include "backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h" +#include "backend/optimizer/ascend/ir_fission/split_fission.h" +#include "backend/optimizer/ascend/format_type/modify_ops_attrs.h" +#include "backend/optimizer/ascend/format_type/remove_no_use_reshape_op.h" +#include "backend/optimizer/ascend/ir_fusion/add_input_to_output.h" #include "utils/context/ms_context.h" #include "utils/config_manager.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/pre_activate/ascend/ascend_backend_optimization.h b/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.h similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ascend_backend_optimization.h rename to mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.h index 222c4b90b5..8194ab467b 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ascend_backend_optimization.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ASCEND_BACKEND_OPTIMIZATION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ASCEND_BACKEND_OPTIMIZATION_H_ #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { void RunOpAscendDataLayout(const std::shared_ptr &kernel_graph); diff --git a/mindspore/ccsrc/pre_activate/ascend/ascend_helper.cc b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ascend_helper.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc index 9c498bd736..fd4c0e5952 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ascend_helper.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/ascend/ascend_helper.h" #include #include "common/trans.h" #include "common/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" #include "utils/utils.h" -#include "device/kernel_info.h" -#include "kernel/oplib/oplib.h" -#include "kernel/common_utils.h" -#include "operator/ops.h" -#include "session/anf_runtime_algorithm.h" -#include "session/kernel_graph.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/common_utils.h" +#include "frontend/operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ascend_helper.h b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.h similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ascend_helper.h rename to mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.h index dc88ca2e52..cb308a09a0 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ascend_helper.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.h @@ -19,10 +19,10 @@ #include #include #include -#include "device/ascend/kernel_select_ascend.h" -#include "kernel/kernel_query.h" -#include "kernel/oplib/oplib.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/kernel_select_ascend.h" +#include "backend/kernel_compiler/kernel_query.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc index 94318d63ca..22183c9050 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h index 6cdc5885f6..dfc45b4688 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc index 1f7fef9e62..59915d43d4 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h index b5688f3a36..abaf264d2e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc index 6091eb572d..1bfff1b50e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h index 7d779d35f8..6bf74d5268 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc index 963f1885fe..144ab4b53f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h index 171352de9b..93aa324566 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc similarity index 89% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc index 63e7dcf6b8..a2ebfbe79e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h index 7a06faa624..224422530b 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc index a126143811..1a67e3c39b 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h index 062b8182fb..911cf744de 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc index d83b32a888..1eb26b12bc 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h index bf7e581dff..6dddd600c2 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc index 98a6838bed..285b8f6c07 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h index c2e72f26ff..6746dad984 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc index 2f04e16692..1e24cce0e4 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h index 54ff0f5982..ae63687631 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/fusion_base_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/fusion_base_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc index a516f04442..27a7a786d1 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/fusion_base_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include #include #include "debug/anf_ir_dump.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/fusion_base_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/fusion_base_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h index 8d6eca774c..dced2c2fa2 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/fusion_base_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h @@ -21,11 +21,11 @@ #include #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc index d1ef5dc83b..7fcc6e45e0 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h index 5baaa6db86..e0d08bb58d 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc index be4d2af1cb..58a219aec7 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h index 0e2510128a..40a45360a1 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/multi_output_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc index 623f0e3426..95955818eb 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" #include #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h index 42d896e96b..4d56eee7b3 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc index 0dcf2362bc..f2117f9374 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h index 41f06ba1f9..f3b97f8357 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc index 5bc0fdced7..d93b47b66c 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h" #include #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/fusion_id_allocator.h" +#include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h index c6c5fe88dc..371c206399 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/ub_pattern_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/ub_pattern_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc index faa5169c40..9685530705 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/ub_pattern_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/buffer_fusion/ub_pattern_fusion.h" +#include "backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h" #include #include #include @@ -23,11 +23,11 @@ #include #include #include -#include "kernel/kernel_fusion.h" +#include "backend/kernel_compiler/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" -#include "device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" +#include "runtime/device/kernel_info.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/ub_pattern_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h similarity index 85% rename from mindspore/ccsrc/pre_activate/ascend/buffer_fusion/ub_pattern_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h index 7099c92772..69eb0f43d4 100644 --- a/mindspore/ccsrc/pre_activate/ascend/buffer_fusion/ub_pattern_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h @@ -19,13 +19,13 @@ #include #include -#include "pre_activate/ascend/buffer_fusion/fusion_base_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "pre_activate/common/pass.h" -#include "pre_activate/common/fusion_id_allocator.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.cc index 6d0906363e..a729cdd0f9 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "pre_activate/ascend/enhancer/getnext_memcpy_elimination.h" +#include "backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.h" #include -#include "session/anf_runtime_algorithm.h" -#include "optimizer/opt.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/opt.h" namespace mindspore::opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.h b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.h rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.h index 523fc87a38..365088b34a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_GETNEXT_MEMCPY_ELIMINATION_H #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_GETNEXT_MEMCPY_ELIMINATION_H -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.cc index 01a3f789e7..bac9f54ace 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.h" +#include "backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.h" #include #include -#include "pre_activate/ascend/ascend_helper.h" -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.h b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.h rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.h index eb3b78d33f..6fefc32230 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_INSERT_MEMCPY_ASYNC_FOR_GETNEXT_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_INSERT_MEMCPY_ASYNC_FOR_GETNEXT_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc index 63ea59d744..2585006be6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.h" +#include "backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.h" #include #include #include #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "optimizer/opt.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/opt.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.h b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.h similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.h rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.h index e2f3b781ed..7bd730a84d 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_INSERT_MEMCPY_ASYNC_FOR_HCCL_OP_H_ #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.cc b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc similarity index 89% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.cc rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc index b73fe6c83c..be61833fe4 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.h" +#include "backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h" #include #include #include -#include "pre_activate/ascend/ascend_helper.h" -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "device/kernel_info.h" -#include "kernel//oplib/oplib.h" -#include "operator/ops.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler//oplib/oplib.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.h b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.h rename to mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h index bfc201ed11..6aed678ff2 100644 --- a/mindspore/ccsrc/pre_activate/ascend/enhancer/insert_pad_for_nms_with_mask.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_INSERT_PAD_FOR_NMS_WITH_MASK_H #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_INSERT_PAD_FOR_NMS_WITH_MASK_H -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc index b661df9d98..f508bb2868 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.h" +#include "backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.h" #include #include @@ -21,9 +21,9 @@ #include #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.h similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.h index ec23baf0ab..6bf1287ae7 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/chang_axis_of_reduce_kernel.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_CHANGE_AXIS_OF_REDUCE_KENRNEL_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_CHANGE_AXIS_OF_REDUCE_KENRNEL_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/check_consistency.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/format_type/check_consistency.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc index 7c8fb70fda..7da0027310 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/check_consistency.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/format_type/check_consistency.h" +#include "backend/optimizer/ascend/format_type/check_consistency.h" #include #include #include #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/check_consistency.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/format_type/check_consistency.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.h index e134547dc8..bf956895de 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/check_consistency.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_CHECK_CONSISTENCY_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_CHECK_CONSISTENCY_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc similarity index 89% rename from mindspore/ccsrc/pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc index c0f99ed415..48948dca06 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.h" +#include "backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h" #include -#include "session/anf_runtime_algorithm.h" -#include "kernel/kernel_build_info.h" -#include "kernel/kernel_query.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_query.h" namespace mindspore { namespace opt { const BaseRef ConvertUnSupportNodeToAICPU::DefinePattern() const { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h index 80cc8170ac..e534a851ad 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/convert_unsupported_transnode_to_aicpu.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h @@ -14,8 +14,8 @@ * limitations under the License. */ #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" #ifndef MINDSPORE_CONVERT_UNSUPPORTED_NODE_TO_AICPU_H #define MINDSPORE_CONVERT_UNSUPPORTED_NODE_TO_AICPU_H namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/deal_ref_trans_and_cast.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/format_type/deal_ref_trans_and_cast.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.cc index f909dae9e4..3dbe2d9f8a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/deal_ref_trans_and_cast.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/deal_ref_trans_and_cast.h" +#include "backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.h" #include #include #include #include -#include "kernel/oplib/oplib.h" -#include "session/anf_runtime_algorithm.h" -#include "session/kernel_graph.h" -#include "pre_activate/common/helper.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/deal_ref_trans_and_cast.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.h similarity index 89% rename from mindspore/ccsrc/pre_activate/ascend/format_type/deal_ref_trans_and_cast.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.h index 1b54a7b111..cb3b13dc49 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/deal_ref_trans_and_cast.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_trans_and_cast.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_DEAL_REF_TRANS_AND_CAST_H_ #include "ir/anf.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_cast.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/format_type/insert_cast.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.cc index 2b2749090a..c3f7900645 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_cast.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.cc @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/format_type/insert_cast.h" +#include "backend/optimizer/ascend/format_type/insert_cast.h" #include #include #include #include -#include "device/kernel_info.h" -#include "pre_activate/ascend/ascend_helper.h" -#include "pre_activate/common/helper.h" -#include "kernel/kernel_build_info.h" -#include "kernel/oplib/oplib.h" -#include "session/anf_runtime_algorithm.h" -#include "session/kernel_graph.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/optimizer/common/helper.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" #include "utils/utils.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_cast.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.h similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/format_type/insert_cast.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.h index a7f93ec8f3..19c282aac9 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_cast.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_INSERT_CAST_H_ #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pattern_engine.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" #include "ir/anf.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_trans_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/format_type/insert_trans_op.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc index 3f77c68f86..a22a1faa5f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_trans_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/insert_trans_op.h" +#include "backend/optimizer/ascend/format_type/insert_trans_op.h" #include #include #include "utils/utils.h" -#include "pre_activate/ascend/ascend_helper.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" -#include "kernel/oplib/oplib.h" +#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/oplib/oplib.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_trans_op.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.h similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/format_type/insert_trans_op.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.h index eb6cfa9542..0b21375327 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_trans_op.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.h @@ -20,9 +20,9 @@ #include #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_transdata_for_runop.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.cc similarity index 84% rename from mindspore/ccsrc/pre_activate/ascend/format_type/insert_transdata_for_runop.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.cc index 3df513a19f..d0b92b250d 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_transdata_for_runop.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/insert_transdata_for_runop.h" +#include "backend/optimizer/ascend/format_type/insert_transdata_for_runop.h" #include #include "utils/utils.h" -#include "pre_activate/ascend/ascend_helper.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" -#include "kernel/oplib/oplib.h" +#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/oplib/oplib.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_transdata_for_runop.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.h similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/format_type/insert_transdata_for_runop.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.h index f699cdd580..82ff5f2b9a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/insert_transdata_for_runop.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.h @@ -20,9 +20,9 @@ #include #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/merge_cast_to_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/format_type/merge_cast_to_op.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc index b1817cec3d..88e9fa77b8 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/merge_cast_to_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/merge_cast_to_op.h" +#include "backend/optimizer/ascend/format_type/merge_cast_to_op.h" #include #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/merge_cast_to_op.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.h similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/format_type/merge_cast_to_op.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.h index 7e05c8a02a..d0e467b7a3 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/merge_cast_to_op.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_MERGE_CAST_TO_OP_H #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/modify_ops_attrs.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/format_type/modify_ops_attrs.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc index 42061957b9..adca536f04 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/modify_ops_attrs.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/modify_ops_attrs.h" +#include "backend/optimizer/ascend/format_type/modify_ops_attrs.h" #include #include #include "utils/utils.h" -#include "pre_activate/common/helper.h" -#include "kernel/common_utils.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/modify_ops_attrs.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/format_type/modify_ops_attrs.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.h index 25ec94b6b4..f5608db05a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/modify_ops_attrs.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/modify_ops_attrs.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_MODIFY_OPS_ATTRS_H #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_MODIFY_OPS_ATTRS_H -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/rectify_do_mask_kernel_info.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/format_type/rectify_do_mask_kernel_info.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc index 571e70dca5..91b9326cc1 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/rectify_do_mask_kernel_info.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/rectify_do_mask_kernel_info.h" +#include "backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h" #include #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "kernel/kernel_build_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/rectify_do_mask_kernel_info.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/format_type/rectify_do_mask_kernel_info.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h index b03937db47..cc9333a013 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/rectify_do_mask_kernel_info.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h @@ -21,8 +21,8 @@ #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { class RectifyDoMaskKernelInfo : public PatternProcessPass { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/remove_no_use_reshape_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc similarity index 88% rename from mindspore/ccsrc/pre_activate/ascend/format_type/remove_no_use_reshape_op.cc rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc index dde40a5090..09992005a4 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/remove_no_use_reshape_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "pre_activate/ascend/format_type/remove_no_use_reshape_op.h" +#include "backend/optimizer/ascend/format_type/remove_no_use_reshape_op.h" #include #include -#include "pre_activate/common/helper.h" -#include "kernel/common_utils.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/format_type/remove_no_use_reshape_op.h b/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/format_type/remove_no_use_reshape_op.h rename to mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.h index 4942c2fc08..135f11f52c 100644 --- a/mindspore/ccsrc/pre_activate/ascend/format_type/remove_no_use_reshape_op.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_no_use_reshape_op.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_REMOVE_NO_USE_RESHAPE_OP_H #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_FORMAT_TYPE_REMOVE_NO_USE_RESHAPE_OP_H -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/addn_fission.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/addn_fission.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.cc index b9a86f7bcb..a3fd704bc5 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/addn_fission.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/addn_fission.h" +#include "backend/optimizer/ascend/ir_fission/addn_fission.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/addn_fission.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/addn_fission.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.h index 3c62391f9a..e04cdfdf7b 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/addn_fission.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_ADDN_FISSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_ADDN_FISSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_bert_fission.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_bert_fission.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.cc index e6a8864e46..f0edefd5f5 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_bert_fission.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/batch_norm_bert_fission.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h" #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_bert_fission.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_bert_fission.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h index fc214817fc..23f0e56035 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_bert_fission.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BATCH_NORM_BERT_FISSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BATCH_NORM_BERT_FISSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.cc index 5e41111660..97c67e4441 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h" #include -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h index a8eefdaa85..97100de284 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BATCH_NORM_GRAD_INFER_FISSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_split.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc index 270b02cb00..97122386c6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/batch_norm_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h" #include #include @@ -22,9 +22,9 @@ #include "utils/utils.h" #include "utils/context/ms_context.h" #include "common/utils.h" -#include "pre_activate/common/helper.h" -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_split.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_split.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h index e539fdb27c..e5378d8332 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/batch_norm_grad_split.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BATCH_NORM_GRAD_SPLIT_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BATCH_NORM_GRAD_SPLIT_H_ -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_grad_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_grad_split.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc index 6282ed4f76..6c4e226120 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_grad_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/bn_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/bn_grad_split.h" #include #include @@ -22,9 +22,9 @@ #include "utils/utils.h" #include "utils/context/ms_context.h" #include "common/utils.h" -#include "pre_activate/common/helper.h" -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_grad_split.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.h similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_grad_split.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.h index 17e1f9b98e..6fe78d4724 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_grad_split.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BN_GRAD_SPLIT_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BN_GRAD_SPLIT_H_ -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_split.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc index 66ffa24bf1..33670e5703 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/bn_split.h" +#include "backend/optimizer/ascend/ir_fission/bn_split.h" #include #include @@ -21,9 +21,9 @@ #include "utils/utils.h" #include "utils/context/ms_context.h" -#include "pre_activate/common/helper.h" -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_split.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.h similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_split.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.h index bc5975af17..4340ba0af6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/bn_split.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BN_SPLIT_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_BN_SPLIT_H_ -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/lars_v2_fission.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/lars_v2_fission.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.cc index 479e00e4c0..e8a778b36f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/lars_v2_fission.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/lars_v2_fission.h" +#include "backend/optimizer/ascend/ir_fission/lars_v2_fission.h" #include #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/lars_v2_fission.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/lars_v2_fission.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.h index 846d221c53..3a165f2b29 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/lars_v2_fission.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_LARS_V2_FISSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_LARS_V2_FISSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/layer_norm_grad_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/layer_norm_grad_split.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc index 1a25d83650..1d19def787 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/layer_norm_grad_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/layer_norm_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h" #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" #include "ir/primitive.h" #include "common/utils.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/layer_norm_grad_split.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/layer_norm_grad_split.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h index f442446b01..c1501b1593 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/layer_norm_grad_split.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h @@ -18,9 +18,9 @@ #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/single_batch_norm_fission.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/single_batch_norm_fission.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.cc index 159be2ac3b..133d51734f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/single_batch_norm_fission.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/single_batch_norm_fission.h" +#include "backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h" #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/single_batch_norm_fission.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/single_batch_norm_fission.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h index 145603132b..fb641c12d6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/single_batch_norm_fission.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_SINGLE_BATCH_NORM_FISSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_SINGLE_BATCH_NORM_FISSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/split_fission.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/split_fission.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.cc index 2ab1cb6130..063f81a1ca 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/split_fission.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/split_fission.h" +#include "backend/optimizer/ascend/ir_fission/split_fission.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/split_fission.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/split_fission.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.h index c2763bb714..6428a21e73 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/split_fission.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_SPLIT_FISSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_SPLIT_FISSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc index c8477353f9..6eeb7a61f7 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/topk_split.h" +#include "backend/optimizer/ascend/ir_fission/topk_split.h" #include #include #include #include -#include "pre_activate/common/helper.h" -#include "kernel/kernel_build_info.h" +#include "backend/optimizer/common/helper.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.h similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.h index e7293e1fa3..e005a83a2f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/topk_split.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_TOPK_SPLIT_H_ #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/transdata_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/transdata_split.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.cc index bfb7e50486..057cf8deed 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/transdata_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/transdata_split.h" +#include "backend/optimizer/ascend/ir_fission/transdata_split.h" #include -#include "pre_activate/ascend/ascend_helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/session/anf_runtime_algorithm.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fission/transdata_split.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.h similarity index 86% rename from mindspore/ccsrc/pre_activate/ascend/ir_fission/transdata_split.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.h index f450897db1..bc681944c3 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fission/transdata_split.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.h @@ -20,12 +20,12 @@ #include #include -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.cc index 4db08d0859..189ac94546 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/adam_apply_one_fusion.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { AnfNodePtr AdamApplyOneFusion::CreateAdamApplyOneNode(const FuncGraphPtr &func_graph, const EquivPtr &equiv) const { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h index 5ee8a86cfb..683a345cdb 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc index f6077c95f2..b1afa338d4 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" +#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h index 742295dd9c..2d599a8cc9 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h @@ -19,7 +19,7 @@ #include #include #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" #include "utils/utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/add_input_to_output.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/add_input_to_output.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.cc index 867f30b9d2..cc58d2b057 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/add_input_to_output.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/add_input_to_output.h" +#include "backend/optimizer/ascend/ir_fusion/add_input_to_output.h" #include #include -#include "pre_activate/ascend/ir_fusion/input_to_output_registry.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/oplib.h" +#include "backend/optimizer/ascend/ir_fusion/input_to_output_registry.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/add_input_to_output.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.h similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/add_input_to_output.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.h index d57b32f370..6e5560bfb0 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/add_input_to_output.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.h @@ -18,8 +18,8 @@ #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc index debe9e8351..51bcd880cd 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.h" +#include "backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "abstract/abstract_value.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h index 551fe0f6f9..46872aa959 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_BATCHNORM_TO_BNINFER_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc index e9d28c32dc..defb011396 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" +#include "backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "abstract/abstract_value.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h index 020dc1a999..0676f8a040 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_BATCHNORMGRAD_TO_BNINFERGRAD_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc index 2af3afbf19..1d89bfd388 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "common/utils.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h index 126480603e..9282b75527 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h @@ -18,7 +18,7 @@ #include #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_value_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_value_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.cc index df94e897ec..e1b0cb81e3 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_value_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/clip_by_value_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h" #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_value_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_value_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h index 309b7cedd0..05bf713bdd 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/clip_by_value_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_CLIP_BY_VALUE_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.cc index 41c0b21d10..6ccf3e29bd 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h" #include #include #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h index 170df5b0e4..932f0d2890 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_CONFUSION_MUL_GRAD_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.cc index 9e2c6374ce..a8cf0af465 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.h" +#include "backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h index a4d0d1ce7a..e3a86e22c9 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_CONFUSION_SOFTMAX_GRAD_RULE_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.cc index 252e586f62..0fe042dc4e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/derelu_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/derelu_fusion.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.h index e1811f4db4..7506960ecb 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/derelu_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_DERELU_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.cc similarity index 99% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.cc index efc9ee7934..dbff0374f3 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h" #include #include -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h index f476e96062..b3bbedc36e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/input_to_output_registry.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/input_to_output_registry.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.cc index b82efdf86a..2fb42f9bd6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/input_to_output_registry.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/input_to_output_registry.h" +#include "backend/optimizer/ascend/ir_fusion/input_to_output_registry.h" #include #include "utils/utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/input_to_output_registry.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h similarity index 100% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/input_to_output_registry.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_rule.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc index 42e37df3e4..fd9fd31f12 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h" #include #include #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" -#include "operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_rule.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_rule.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h index 0089c33f87..d14ce6e3fe 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_rule.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h @@ -23,9 +23,9 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc index 0e3cd28a66..4ef3fa269f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" #include -#include "session/anf_runtime_algorithm.h" -#include "optimizer/opt.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/opt.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h index 5d61975197..23114c37ee 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h @@ -19,8 +19,8 @@ #include #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc index 26828f2137..f21433b3c6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" #include #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "optimizer/opt.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/opt.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h index ff14a253dd..58f05c37ba 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h @@ -18,8 +18,8 @@ #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_right_rule.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_right_rule.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.cc index 5065c4c5ba..03bc1e0484 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_right_rule.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/lamb_next_right_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h" #include -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_right_rule.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_right_rule.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h index 3d15001da2..67687cc037 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_next_right_rule.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_LAMB_NEXT_RIGHT_RULE_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc index b5b6d2bb08..8e38c3cc2e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "common/utils.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h index cb3939549f..5ea01ccf65 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_LAMB_UPDATE_WITH_LR_RULE_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc index 43e1872163..59511a611a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h" #include #include #include #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h index ea614d3d2d..c5396178a5 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h @@ -23,9 +23,9 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc index b16387d8f1..fa1e92120d 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h index 2655c0f14d..5bf1608143 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h @@ -17,9 +17,9 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_LAYER_NORM_BETA_GAMMA_BACKPROP_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.cc similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.cc index e81c804b71..fdd390677a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h" #include -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h index 56675243de..8c762435a9 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_MATMUL_BIASADD_FUSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_MATMUL_BIASADD_FUSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.cc index e7a73a9c7f..90c5ac19a9 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h" #include #include #include -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h index c092e0ca22..8d36684a11 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_MOMENTUM_LOSSSCALE_FUSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_MOMENTUM_LOSSSCALE_FUSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_add_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_add_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.cc index 2536255fc1..2d766891a0 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_add_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/mul_add_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/mul_add_fusion.h" #include #include #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "optimizer/opt.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/opt.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_add_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_add_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.h index 4b4db2b312..0ad13e10e6 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_add_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_MUL_ADD_FUSION_H #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_MUL_ADD_FUSION_H -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.cc index a5e4675c8f..3567864e2f 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/mul_addn_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h" #include #include #include #include #include -#include "session/anf_runtime_algorithm.h" -#include "optimizer/opt.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/opt.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h index d03309bf73..484cb75237 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_PASS_MUL_ADDN_FUSION_H #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_PASS_MUL_ADDN_FUSION_H -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc index a3c87dad5d..9f44eb9d89 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h" #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "operator/ops.h" -#include "device/kernel_info.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "frontend/operator/ops.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h index 823ec083b1..0479fd3d63 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/parameter_and_transop_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h @@ -22,7 +22,7 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/refresh_parameter_format.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.cc similarity index 86% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/refresh_parameter_format.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.cc index 857670a384..ebaa429ebf 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/refresh_parameter_format.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/refresh_parameter_format.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "operator/ops.h" -#include "device/kernel_info.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "frontend/operator/ops.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/refresh_parameter_format.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/refresh_parameter_format.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h index 0ba688b134..122bdf55ca 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/refresh_parameter_format.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h @@ -21,7 +21,7 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/remove_reshape_pair.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc similarity index 92% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/remove_reshape_pair.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc index fa2815ff62..6f48eabbc5 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/remove_reshape_pair.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/remove_reshape_pair.h" +#include "backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h" #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/remove_reshape_pair.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h similarity index 90% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/remove_reshape_pair.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h index ddb25df70c..848713201a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/remove_reshape_pair.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h @@ -20,9 +20,9 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/reshape_transpose_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/reshape_transpose_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc index 9b13002798..02a866930c 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/reshape_transpose_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/reshape_transpose_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h" #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" -#include "operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/reshape_transpose_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/reshape_transpose_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h index 5abf3e0d53..a76538019e 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/reshape_transpose_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h @@ -22,9 +22,9 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.cc index f95406e5e1..a3706bfb68 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h" #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h similarity index 97% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h index 59032e6973..1b884b2726 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h @@ -18,7 +18,7 @@ #include #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/square_sum_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/square_sum_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc index 8c0335ecc1..67c881759a 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/square_sum_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/square_sum_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/square_sum_fusion.h" #include #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "operator/ops.h" -#include "pre_activate/common/helper.h" -#include "device/kernel_info.h" +#include "frontend/operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/square_sum_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/square_sum_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.h index 5a694a5585..54189606ba 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/square_sum_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_SQUARE_SUM_FUSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FUSION_SQUARE_SUM_FUSION_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_reshape_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc similarity index 93% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_reshape_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc index 250f86d9b1..46bf2a8604 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_reshape_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/transpose_reshape_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h" #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" -#include "operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_reshape_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h similarity index 91% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_reshape_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h index 8b979f869d..39b8fe4687 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_reshape_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h @@ -22,9 +22,9 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_transdata_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_transdata_fusion.cc rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc index e45fc2637f..b6da588e89 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_transdata_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/transpose_transdata_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h" #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_transdata_fusion.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h similarity index 89% rename from mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_transdata_fusion.h rename to mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h index 833588cf45..852d5194ec 100644 --- a/mindspore/ccsrc/pre_activate/ascend/ir_fusion/transpose_transdata_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h @@ -22,10 +22,10 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ascend_helper.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/common_backend_optimization.cc b/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc similarity index 83% rename from mindspore/ccsrc/pre_activate/common/common_backend_optimization.cc rename to mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc index b930ac69c9..887b9a76a1 100644 --- a/mindspore/ccsrc/pre_activate/common/common_backend_optimization.cc +++ b/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/common/common_backend_optimization.h" +#include "backend/optimizer/common/common_backend_optimization.h" #include #include -#include "pre_activate/common/optimizer.h" -#include "pre_activate/pass/convert_const_input_to_attr.h" -#include "pre_activate/pass/convert_tuple_output_to_maketuple.h" -#include "pre_activate/pass/convert_const_input_to_tensor_input.h" -#include "pre_activate/pass/convert_tuple_input_to_dynamic_input.h" -#include "pre_activate/pass/const_to_attr_strided_slice_grad.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/pass/convert_const_input_to_attr.h" +#include "backend/optimizer/pass/convert_tuple_output_to_maketuple.h" +#include "backend/optimizer/pass/convert_const_input_to_tensor_input.h" +#include "backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h" +#include "backend/optimizer/pass/const_to_attr_strided_slice_grad.h" #include "utils/context/ms_context.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/pre_activate/common/common_backend_optimization.h b/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.h similarity index 96% rename from mindspore/ccsrc/pre_activate/common/common_backend_optimization.h rename to mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.h index 6ce92da0dc..4127fc05de 100644 --- a/mindspore/ccsrc/pre_activate/common/common_backend_optimization.h +++ b/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_COMMON_COMMON_BACKEND_OPTIMIZATION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_COMMON_COMMON_BACKEND_OPTIMIZATION_H_ #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { void BackendCommonOptimization(const std::shared_ptr &kernel_graph); diff --git a/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.cc b/mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.cc similarity index 93% rename from mindspore/ccsrc/pre_activate/common/fusion_id_allocator.cc rename to mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.cc index 2b45fc6579..d21cabe54a 100644 --- a/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.cc +++ b/mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/common/fusion_id_allocator.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h b/mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.h similarity index 100% rename from mindspore/ccsrc/pre_activate/common/fusion_id_allocator.h rename to mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.h diff --git a/mindspore/ccsrc/pre_activate/common/helper.cc b/mindspore/ccsrc/backend/optimizer/common/helper.cc similarity index 99% rename from mindspore/ccsrc/pre_activate/common/helper.cc rename to mindspore/ccsrc/backend/optimizer/common/helper.cc index e1db0ed6ed..266130c6b1 100644 --- a/mindspore/ccsrc/pre_activate/common/helper.cc +++ b/mindspore/ccsrc/backend/optimizer/common/helper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" #include #include #include @@ -24,10 +24,10 @@ #include #include "utils/utils.h" #include "utils/base_ref.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "common/utils.h" -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/common/helper.h b/mindspore/ccsrc/backend/optimizer/common/helper.h similarity index 98% rename from mindspore/ccsrc/pre_activate/common/helper.h rename to mindspore/ccsrc/backend/optimizer/common/helper.h index 49a1d47d0c..a267e65b53 100644 --- a/mindspore/ccsrc/pre_activate/common/helper.h +++ b/mindspore/ccsrc/backend/optimizer/common/helper.h @@ -23,9 +23,9 @@ #include #include #include "ir/func_graph.h" -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "common/utils.h" -#include "pre_activate/common/pattern_engine.h" +#include "backend/optimizer/common/pattern_engine.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/node_pass.cc b/mindspore/ccsrc/backend/optimizer/common/node_pass.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/common/node_pass.cc rename to mindspore/ccsrc/backend/optimizer/common/node_pass.cc index 876da8667b..16f5284a57 100644 --- a/mindspore/ccsrc/pre_activate/common/node_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/common/node_pass.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/common/node_pass.h" +#include "backend/optimizer/common/node_pass.h" #include #include @@ -22,7 +22,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/manager.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/node_pass.h b/mindspore/ccsrc/backend/optimizer/common/node_pass.h similarity index 94% rename from mindspore/ccsrc/pre_activate/common/node_pass.h rename to mindspore/ccsrc/backend/optimizer/common/node_pass.h index 7750a59e59..780ae1a056 100644 --- a/mindspore/ccsrc/pre_activate/common/node_pass.h +++ b/mindspore/ccsrc/backend/optimizer/common/node_pass.h @@ -18,7 +18,7 @@ #include #include -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/optimizer.cc b/mindspore/ccsrc/backend/optimizer/common/optimizer.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/common/optimizer.cc rename to mindspore/ccsrc/backend/optimizer/common/optimizer.cc index 71a523ea1d..01e9111e86 100644 --- a/mindspore/ccsrc/pre_activate/common/optimizer.cc +++ b/mindspore/ccsrc/backend/optimizer/common/optimizer.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" #include #include @@ -23,8 +23,8 @@ #include #include -#include "pre_activate/common/pass_manager.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/common/optimizer.h b/mindspore/ccsrc/backend/optimizer/common/optimizer.h similarity index 95% rename from mindspore/ccsrc/pre_activate/common/optimizer.h rename to mindspore/ccsrc/backend/optimizer/common/optimizer.h index 1f9961df6b..0b03c9c0ee 100644 --- a/mindspore/ccsrc/pre_activate/common/optimizer.h +++ b/mindspore/ccsrc/backend/optimizer/common/optimizer.h @@ -24,11 +24,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/primitive.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/common/pattern_engine.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/common/pattern_engine.h" #include "utils/graph_utils.h" #include "common/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/pass.h b/mindspore/ccsrc/backend/optimizer/common/pass.h similarity index 94% rename from mindspore/ccsrc/pre_activate/common/pass.h rename to mindspore/ccsrc/backend/optimizer/common/pass.h index 3d2468cddb..6e35fb1dc4 100644 --- a/mindspore/ccsrc/pre_activate/common/pass.h +++ b/mindspore/ccsrc/backend/optimizer/common/pass.h @@ -19,7 +19,7 @@ #include #include "ir/anf.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/pass_manager.cc b/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/common/pass_manager.cc rename to mindspore/ccsrc/backend/optimizer/common/pass_manager.cc index 3213b8a6d2..f9f41237e0 100644 --- a/mindspore/ccsrc/pre_activate/common/pass_manager.cc +++ b/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/common/pass_manager.h" +#include "backend/optimizer/common/pass_manager.h" #include #include diff --git a/mindspore/ccsrc/pre_activate/common/pass_manager.h b/mindspore/ccsrc/backend/optimizer/common/pass_manager.h similarity index 93% rename from mindspore/ccsrc/pre_activate/common/pass_manager.h rename to mindspore/ccsrc/backend/optimizer/common/pass_manager.h index 38fe49b94c..51db27d250 100644 --- a/mindspore/ccsrc/pre_activate/common/pass_manager.h +++ b/mindspore/ccsrc/backend/optimizer/common/pass_manager.h @@ -21,8 +21,8 @@ #include #include -#include "pre_activate/common/pass.h" -#include "pre_activate/common/node_pass.h" +#include "backend/optimizer/common/pass.h" +#include "backend/optimizer/common/node_pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/common/pattern_engine.cc b/mindspore/ccsrc/backend/optimizer/common/pattern_engine.cc similarity index 99% rename from mindspore/ccsrc/pre_activate/common/pattern_engine.cc rename to mindspore/ccsrc/backend/optimizer/common/pattern_engine.cc index 42f966aa3d..bd4efd82ef 100644 --- a/mindspore/ccsrc/pre_activate/common/pattern_engine.cc +++ b/mindspore/ccsrc/backend/optimizer/common/pattern_engine.cc @@ -16,14 +16,14 @@ * limitations under the License. */ -#include "pre_activate/common/pattern_engine.h" +#include "backend/optimizer/common/pattern_engine.h" #include #include #include #include -#include "optimizer/opt.h" +#include "frontend/optimizer/opt.h" #include "ir/anf.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/pre_activate/common/pattern_engine.h b/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h similarity index 99% rename from mindspore/ccsrc/pre_activate/common/pattern_engine.h rename to mindspore/ccsrc/backend/optimizer/common/pattern_engine.h index ff38c50423..51fa8801b2 100644 --- a/mindspore/ccsrc/pre_activate/common/pattern_engine.h +++ b/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h @@ -33,7 +33,7 @@ #include #include -#include "pre_activate/common/visit.h" +#include "backend/optimizer/common/visit.h" #include "base/base.h" #include "utils/log_adapter.h" #include "utils/base_ref.h" diff --git a/mindspore/ccsrc/pre_activate/common/visit.cc b/mindspore/ccsrc/backend/optimizer/common/visit.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/common/visit.cc rename to mindspore/ccsrc/backend/optimizer/common/visit.cc index 179177dd67..d0b52609f8 100644 --- a/mindspore/ccsrc/pre_activate/common/visit.cc +++ b/mindspore/ccsrc/backend/optimizer/common/visit.cc @@ -16,14 +16,14 @@ * limitations under the License. */ -#include "pre_activate/common/visit.h" +#include "backend/optimizer/common/visit.h" #include #include #include #include -#include "pre_activate/common/pattern_engine.h" +#include "backend/optimizer/common/pattern_engine.h" #include "utils/any.h" #include "ir/anf.h" #include "ir/func_graph.h" diff --git a/mindspore/ccsrc/pre_activate/common/visit.h b/mindspore/ccsrc/backend/optimizer/common/visit.h similarity index 100% rename from mindspore/ccsrc/pre_activate/common/visit.h rename to mindspore/ccsrc/backend/optimizer/common/visit.h diff --git a/mindspore/ccsrc/pre_activate/gpu/adam_fusion.cc b/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/gpu/adam_fusion.cc rename to mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.cc index 8111ee429d..41e4abee27 100644 --- a/mindspore/ccsrc/pre_activate/gpu/adam_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/gpu/adam_fusion.h" +#include "backend/optimizer/gpu/adam_fusion.h" #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/gpu/adam_fusion.h b/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.h similarity index 97% rename from mindspore/ccsrc/pre_activate/gpu/adam_fusion.h rename to mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.h index d8c10a0986..f87defc04c 100644 --- a/mindspore/ccsrc/pre_activate/gpu/adam_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_GPU_IR_FUSION_ADAM_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/gpu/adam_weight_decay_fusion.cc b/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/gpu/adam_weight_decay_fusion.cc rename to mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.cc index c950cbd56f..c95945c980 100644 --- a/mindspore/ccsrc/pre_activate/gpu/adam_weight_decay_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/gpu/adam_weight_decay_fusion.h" +#include "backend/optimizer/gpu/adam_weight_decay_fusion.h" #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/gpu/adam_weight_decay_fusion.h b/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.h similarity index 97% rename from mindspore/ccsrc/pre_activate/gpu/adam_weight_decay_fusion.h rename to mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.h index 0ada5756e3..53477ec898 100644 --- a/mindspore/ccsrc/pre_activate/gpu/adam_weight_decay_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_GPU_IR_FUSION_ADAM_WEIGHT_DECAY_FUSION_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/kernel_refcount.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/mem_reuse/kernel_refcount.cc rename to mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.cc index c75860a8df..b531b0caa5 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/kernel_refcount.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/mem_reuse/kernel_refcount.h" +#include "backend/optimizer/mem_reuse/kernel_refcount.h" #include #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/kernel_refcount.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.h similarity index 100% rename from mindspore/ccsrc/pre_activate/mem_reuse/kernel_refcount.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.h diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_copy_manager.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_copy_manager.h similarity index 97% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_copy_manager.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_copy_manager.h index ea9947b41b..1952415515 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_copy_manager.h +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_copy_manager.h @@ -22,8 +22,8 @@ #include #include #include -#include "session/kernel_graph.h" -#include "kernel/kernel.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/kernel.h" using HostAddress = mindspore::kernel::Address; namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_dynamic_allocator.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_dynamic_allocator.cc rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc index 7c5e87b128..8f705be556 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_dynamic_allocator.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/mem_reuse/mem_dynamic_allocator.h" +#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" #include "common/utils.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_dynamic_allocator.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.h similarity index 100% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_dynamic_allocator.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.h diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc similarity index 99% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse.cc rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc index e050f3d590..263ceaec63 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pre_activate/mem_reuse/mem_reuse.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" #include #include -#include "pre_activate/mem_reuse/mem_reuse_checker.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace memreuse { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.h similarity index 95% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.h index 37281a7128..b286bcbc2c 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse.h +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.h @@ -19,10 +19,10 @@ #include #include #include -#include "pre_activate/mem_reuse/kernel_refcount.h" -#include "session/anf_runtime_algorithm.h" -#include "session/kernel_graph.h" -#include "kernel/tbe/tbe_utils.h" +#include "backend/optimizer/mem_reuse/kernel_refcount.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" using mindspore::kernel::tbe::TbeUtils; namespace mindspore { namespace memreuse { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_allocator.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_allocator.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_allocator.cc rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_allocator.cc index c50cb4b021..787d334a1a 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_allocator.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_allocator.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pre_activate/mem_reuse/mem_reuse_allocator.h" -#include "pre_activate/mem_reuse/mem_reuse.h" -#include "pre_activate/mem_reuse/mem_reuse_checker.h" +#include "backend/optimizer/mem_reuse/mem_reuse_allocator.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" #ifdef ENABLE_D -#include "device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_stream_assign.h" #endif namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_allocator.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_allocator.h similarity index 98% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_allocator.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_allocator.h index 321a36c824..ef1cfd3e11 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_allocator.h +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_allocator.h @@ -30,8 +30,8 @@ #include #include #include -#include "pre_activate/mem_reuse/kernel_refcount.h" -#include "pre_activate/mem_reuse/mem_reuse.h" +#include "backend/optimizer/mem_reuse/kernel_refcount.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" namespace mindspore { namespace memreuse { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_checker.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.cc similarity index 99% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_checker.cc rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.cc index 1421bc6a7d..b93bf42f9f 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_checker.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/mem_reuse/mem_reuse_checker.h" +#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" #include #include #include diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_checker.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.h similarity index 94% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_checker.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.h index 5fd3d0f5ae..3c4a00a3ca 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_reuse_checker.h +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.h @@ -22,11 +22,11 @@ #include #include #include -#include "mindspore/ccsrc/ir/anf.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/mem_reuse/mem_reuse.h" -#include "kernel/common_utils.h" -#include "pre_activate/mem_reuse/mem_reuse_allocator.h" +#include "mindspore/core/ir/anf.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/optimizer/mem_reuse/mem_reuse_allocator.h" namespace mindspore { namespace memreuse { constexpr auto kSend = "Send"; diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_swap_manager.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.cc similarity index 98% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_swap_manager.cc rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.cc index 14073bfbc9..41bf5460c3 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_swap_manager.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "pre_activate/mem_reuse/mem_swap_manager.h" +#include "backend/optimizer/mem_reuse/mem_swap_manager.h" #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/pre_activate/mem_reuse/mem_swap_manager.h b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.h similarity index 98% rename from mindspore/ccsrc/pre_activate/mem_reuse/mem_swap_manager.h rename to mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.h index 1969dadb54..d8620c8516 100644 --- a/mindspore/ccsrc/pre_activate/mem_reuse/mem_swap_manager.h +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.h @@ -23,7 +23,7 @@ #include #include #include -#include "pre_activate/mem_reuse/mem_copy_manager.h" +#include "backend/optimizer/mem_reuse/mem_copy_manager.h" using PerformPair = std::pair; namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/pass/add_atomic_clean.cc b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/add_atomic_clean.cc rename to mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc index 9df34a1c59..900dd0d563 100644 --- a/mindspore/ccsrc/pre_activate/pass/add_atomic_clean.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "pre_activate/pass/add_atomic_clean.h" +#include "backend/optimizer/pass/add_atomic_clean.h" #include #include #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/utils.h" #include "utils/graph_utils.h" #include "utils/log_adapter.h" -#include "session/anf_runtime_algorithm.h" -#include "session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/mindspore/ccsrc/pre_activate/pass/add_atomic_clean.h b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.h similarity index 95% rename from mindspore/ccsrc/pre_activate/pass/add_atomic_clean.h rename to mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.h index bb1edb0e35..7e3fbdb472 100644 --- a/mindspore/ccsrc/pre_activate/pass/add_atomic_clean.h +++ b/mindspore/ccsrc/backend/optimizer/pass/add_atomic_clean.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_ADD_ATOMIC_CLEAN_H_ #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/common_subexpression_elimination.cc b/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.cc similarity index 93% rename from mindspore/ccsrc/pre_activate/pass/common_subexpression_elimination.cc rename to mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.cc index 297a167aa8..a485b196af 100644 --- a/mindspore/ccsrc/pre_activate/pass/common_subexpression_elimination.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/common_subexpression_elimination.h" +#include "backend/optimizer/pass/common_subexpression_elimination.h" #include -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/common_subexpression_elimination.h b/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.h similarity index 94% rename from mindspore/ccsrc/pre_activate/pass/common_subexpression_elimination.h rename to mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.h index 18f433ab95..bac870e59f 100644 --- a/mindspore/ccsrc/pre_activate/pass/common_subexpression_elimination.h +++ b/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.h @@ -15,8 +15,8 @@ */ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_COMMON_SUBEXPRESSION_ELIMINATION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_COMMON_SUBEXPRESSION_ELIMINATION_H_ -#include "pre_activate/common/pass.h" -#include "optimizer/cse.h" +#include "backend/optimizer/common/pass.h" +#include "frontend/optimizer/cse.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/communication_op_fusion.cc b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/pass/communication_op_fusion.cc rename to mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc index aa4690abcb..3ba055880c 100644 --- a/mindspore/ccsrc/pre_activate/pass/communication_op_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/communication_op_fusion.h" +#include "backend/optimizer/pass/communication_op_fusion.h" #include #include #include #include "utils/graph_utils.h" -#include "operator/ops.h" -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/kernel_build_info.h" -#include "parallel/context.h" +#include "frontend/operator/ops.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "frontend/parallel/context.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/communication_op_fusion.h b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/communication_op_fusion.h rename to mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.h index d00180f97f..0e7cf9762d 100644 --- a/mindspore/ccsrc/pre_activate/pass/communication_op_fusion.h +++ b/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/pre_activate/pass/const_input_to_attr_registry.cc b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/pass/const_input_to_attr_registry.cc rename to mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc index af82f380f5..814ad9567c 100644 --- a/mindspore/ccsrc/pre_activate/pass/const_input_to_attr_registry.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/const_input_to_attr_registry.h" +#include "backend/optimizer/pass/const_input_to_attr_registry.h" #include #include "utils/utils.h" #include "utils/log_adapter.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/const_input_to_attr_registry.h b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h similarity index 100% rename from mindspore/ccsrc/pre_activate/pass/const_input_to_attr_registry.h rename to mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h diff --git a/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc b/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc rename to mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc index ec2d232584..51d399bbcd 100644 --- a/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/const_to_attr_strided_slice_grad.h" +#include "backend/optimizer/pass/const_to_attr_strided_slice_grad.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/context/ms_context.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.h b/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.h rename to mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.h index 2e364244bf..83b44d5f51 100644 --- a/mindspore/ccsrc/pre_activate/pass/const_to_attr_strided_slice_grad.h +++ b/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_CONST_TO_ATTR_STRIDED_SLICE_GRAD_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_attr.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc similarity index 84% rename from mindspore/ccsrc/pre_activate/pass/convert_const_input_to_attr.cc rename to mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc index 38d629c415..f2e35351b4 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_attr.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/convert_const_input_to_attr.h" +#include "backend/optimizer/pass/convert_const_input_to_attr.h" #include #include #include #include -#include "pre_activate/pass/const_input_to_attr_registry.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/pass/const_input_to_attr_registry.h" +#include "backend/optimizer/common/helper.h" #include "utils/utils.h" #include "utils/context/ms_context.h" -#include "operator/ops.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/common_utils.h" +#include "frontend/operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_attr.h b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/convert_const_input_to_attr.h rename to mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.h index e124ff8cf4..e6def42fa1 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_attr.h +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.h @@ -20,7 +20,7 @@ #include #include "ir/anf.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_tensor_input.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/pass/convert_const_input_to_tensor_input.cc rename to mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc index b4f98cc6d7..f204841f3c 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_tensor_input.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/convert_const_input_to_tensor_input.h" +#include "backend/optimizer/pass/convert_const_input_to_tensor_input.h" #include #include #include #include "utils/graph_utils.h" -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" -#include "session/kernel_graph.h" -#include "kernel/common_utils.h" -#include "device/kernel_info.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_tensor_input.h b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/convert_const_input_to_tensor_input.h rename to mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h index 1cc2bdf0ec..072652497a 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_const_input_to_tensor_input.h +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h @@ -18,7 +18,7 @@ #include #include "ir/anf.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_tuple_input_to_dynamic_input.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/pass/convert_tuple_input_to_dynamic_input.cc rename to mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.cc index a03087c1a4..b96a7af8f3 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_tuple_input_to_dynamic_input.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/convert_tuple_input_to_dynamic_input.h" +#include "backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h" #include #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" -#include "session/kernel_graph.h" -#include "kernel/common_utils.h" -#include "device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_tuple_input_to_dynamic_input.h b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/convert_tuple_input_to_dynamic_input.h rename to mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h index b3d8e25d6e..63d2415dc5 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_tuple_input_to_dynamic_input.h +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h @@ -20,7 +20,7 @@ #include #include "ir/anf.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_tuple_output_to_maketuple.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.cc similarity index 93% rename from mindspore/ccsrc/pre_activate/pass/convert_tuple_output_to_maketuple.cc rename to mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.cc index a5e51411bc..34ba83ef17 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_tuple_output_to_maketuple.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/convert_tuple_output_to_maketuple.h" +#include "backend/optimizer/pass/convert_tuple_output_to_maketuple.h" #include #include -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" -#include "session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/convert_tuple_output_to_maketuple.h b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/convert_tuple_output_to_maketuple.h rename to mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.h index a16ffaf674..9ff5ca91ed 100644 --- a/mindspore/ccsrc/pre_activate/pass/convert_tuple_output_to_maketuple.h +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.h @@ -20,7 +20,7 @@ #include #include "ir/anf.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/eliminate_redundant_op.cc b/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/eliminate_redundant_op.cc rename to mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc index 4d3dcfccc0..3ef912bcec 100644 --- a/mindspore/ccsrc/pre_activate/pass/eliminate_redundant_op.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "pre_activate/pass/eliminate_redundant_op.h" +#include "backend/optimizer/pass/eliminate_redundant_op.h" #include #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" -#include "operator/ops.h" -#include "kernel/common_utils.h" +#include "backend/optimizer/common/helper.h" +#include "frontend/operator/ops.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/eliminate_redundant_op.h b/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.h similarity index 94% rename from mindspore/ccsrc/pre_activate/pass/eliminate_redundant_op.h rename to mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.h index c44190f645..2fb4715cff 100644 --- a/mindspore/ccsrc/pre_activate/pass/eliminate_redundant_op.h +++ b/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.h @@ -22,8 +22,8 @@ #include #include #include "ir/anf.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/erase_visit_attr.cc b/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.cc similarity index 88% rename from mindspore/ccsrc/pre_activate/pass/erase_visit_attr.cc rename to mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.cc index 3b566b4f7c..8c6cb4beb5 100644 --- a/mindspore/ccsrc/pre_activate/pass/erase_visit_attr.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "pre_activate/pass/erase_visit_attr.h" +#include "backend/optimizer/pass/erase_visit_attr.h" #include #include -#include "kernel/common_utils.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/helper.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/erase_visit_attr.h b/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/erase_visit_attr.h rename to mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.h index a986aad83a..37b88a4e39 100644 --- a/mindspore/ccsrc/pre_activate/pass/erase_visit_attr.h +++ b/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_ERASE_VISIT_ATTR_H_ #include -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/fuse_basic.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc similarity index 97% rename from mindspore/ccsrc/pre_activate/pass/fuse_basic.cc rename to mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc index 84edd5c5e2..32655f1ec2 100644 --- a/mindspore/ccsrc/pre_activate/pass/fuse_basic.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.cc @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/fuse_basic.h" -#include "pre_activate/pass/fuse_graph_kernel.h" +#include "backend/optimizer/pass/fuse_basic.h" +#include "backend/optimizer/pass/fuse_graph_kernel.h" #include #include @@ -24,11 +24,11 @@ #include #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/utils.h" #include "utils/graph_utils.h" -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" #include "vm/segment_runner.h" #include "debug/draw.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/pre_activate/pass/fuse_basic.h b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.h similarity index 91% rename from mindspore/ccsrc/pre_activate/pass/fuse_basic.h rename to mindspore/ccsrc/backend/optimizer/pass/fuse_basic.h index fbbf5d9937..9b3916fe28 100644 --- a/mindspore/ccsrc/pre_activate/pass/fuse_basic.h +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_basic.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_FUSE_BASIC_H_ #include -#include "pre_activate/common/optimizer.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.cc b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc similarity index 99% rename from mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.cc rename to mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc index 0e287587a2..e04110d8a0 100644 --- a/mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.cc @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/fuse_graph_kernel.h" +#include "backend/optimizer/pass/fuse_graph_kernel.h" #include #include @@ -25,11 +25,11 @@ #include #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/utils.h" #include "utils/graph_utils.h" -#include "pre_activate/common/helper.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" #include "vm/segment_runner.h" #include "debug/draw.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.h b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.h rename to mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.h index a5a26765a3..e14661dfdf 100644 --- a/mindspore/ccsrc/pre_activate/pass/fuse_graph_kernel.h +++ b/mindspore/ccsrc/backend/optimizer/pass/fuse_graph_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "pre_activate/common/optimizer.h" -#include "session/kernel_graph.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/getitem_tuple.cc b/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc similarity index 94% rename from mindspore/ccsrc/pre_activate/pass/getitem_tuple.cc rename to mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc index af16017a7c..a51a6bab42 100644 --- a/mindspore/ccsrc/pre_activate/pass/getitem_tuple.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/getitem_tuple.h" +#include "backend/optimizer/pass/getitem_tuple.h" #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/utils.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/getitem_tuple.h b/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/getitem_tuple.h rename to mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.h index 0fc42a15dc..9a25b924bd 100644 --- a/mindspore/ccsrc/pre_activate/pass/getitem_tuple.h +++ b/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_GETITEM_TUPLE_SPLIT_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_GETITEM_TUPLE_SPLIT_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/optimize_dependence.cc b/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/optimize_dependence.cc rename to mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc index 1d5f909e7d..710e130a85 100644 --- a/mindspore/ccsrc/pre_activate/pass/optimize_dependence.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "pre_activate/pass/optimize_dependence.h" +#include "backend/optimizer/pass/optimize_dependence.h" #include #include #include -#include "pre_activate/common/helper.h" -#include "operator/ops.h" +#include "backend/optimizer/common/helper.h" +#include "frontend/operator/ops.h" #include "utils/utils.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/optimize_dependence.h b/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.h similarity index 96% rename from mindspore/ccsrc/pre_activate/pass/optimize_dependence.h rename to mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.h index 30027b790a..8ddd4d662e 100644 --- a/mindspore/ccsrc/pre_activate/pass/optimize_dependence.h +++ b/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_OPTIMIZE_DEPENDENCE_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_PASS_OPTIMIZE_DEPENDENCE_H_ -#include "pre_activate/common/optimizer.h" +#include "backend/optimizer/common/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/replace_node_by_proxy.cc b/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.cc similarity index 95% rename from mindspore/ccsrc/pre_activate/pass/replace_node_by_proxy.cc rename to mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.cc index fd342ec43c..cd34464cda 100644 --- a/mindspore/ccsrc/pre_activate/pass/replace_node_by_proxy.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "pre_activate/pass/replace_node_by_proxy.h" +#include "backend/optimizer/pass/replace_node_by_proxy.h" #include #include -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/kernel_build_info.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/pre_activate/pass/replace_node_by_proxy.h b/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.h similarity index 93% rename from mindspore/ccsrc/pre_activate/pass/replace_node_by_proxy.h rename to mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.h index 2549501a0a..382b08304f 100644 --- a/mindspore/ccsrc/pre_activate/pass/replace_node_by_proxy.h +++ b/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.h @@ -19,11 +19,11 @@ #include #include -#include "pre_activate/common/pass.h" +#include "backend/optimizer/common/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/session/CMakeLists.txt b/mindspore/ccsrc/backend/session/CMakeLists.txt similarity index 89% rename from mindspore/ccsrc/session/CMakeLists.txt rename to mindspore/ccsrc/backend/session/CMakeLists.txt index 782eb51183..b7b791ada9 100644 --- a/mindspore/ccsrc/session/CMakeLists.txt +++ b/mindspore/ccsrc/backend/session/CMakeLists.txt @@ -29,4 +29,4 @@ if (ENABLE_D) endif () set_property(SOURCE ${_SESSION_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_SESSION) -add_library(_mindspore_session_obj OBJECT ${_SESSION_SRC_LIST}) +add_library(_mindspore_backend_session_obj OBJECT ${_SESSION_SRC_LIST}) diff --git a/mindspore/ccsrc/session/anf_runtime_algorithm.cc b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc similarity index 99% rename from mindspore/ccsrc/session/anf_runtime_algorithm.cc rename to mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc index 81ad02e787..0e5af203bc 100644 --- a/mindspore/ccsrc/session/anf_runtime_algorithm.cc +++ b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include #include #include #include #include "ir/anf.h" #include "ir/func_graph.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/utils.h" -#include "device/kernel_info.h" -#include "device/device_address.h" -#include "pre_activate/common/helper.h" -#include "kernel/kernel.h" -#include "kernel/kernel_build_info.h" +#include "runtime/device/kernel_info.h" +#include "runtime/device/device_address.h" +#include "backend/optimizer/common/helper.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "common/utils.h" #include "common/trans.h" diff --git a/mindspore/ccsrc/session/anf_runtime_algorithm.h b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h similarity index 98% rename from mindspore/ccsrc/session/anf_runtime_algorithm.h rename to mindspore/ccsrc/backend/session/anf_runtime_algorithm.h index 3238b1cecc..6bfc714d66 100644 --- a/mindspore/ccsrc/session/anf_runtime_algorithm.h +++ b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h @@ -27,12 +27,12 @@ #include "ir/dtype.h" #include "base/base.h" #include "ir/primitive.h" -#include "device/device_address.h" -#include "kernel/kernel.h" -#include "kernel/kernel_build_info.h" -#include "operator/ops.h" +#include "runtime/device/device_address.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "frontend/operator/ops.h" #include "utils/contract.h" -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/session/ascend_control_parser.cc b/mindspore/ccsrc/backend/session/ascend_control_parser.cc similarity index 99% rename from mindspore/ccsrc/session/ascend_control_parser.cc rename to mindspore/ccsrc/backend/session/ascend_control_parser.cc index 0c97116c6e..656a6b40ed 100644 --- a/mindspore/ccsrc/session/ascend_control_parser.cc +++ b/mindspore/ccsrc/backend/session/ascend_control_parser.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "session/ascend_control_parser.h" +#include "backend/session/ascend_control_parser.h" #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/union_find_set.h" -#include "device/ascend/ascend_label_assign.h" +#include "runtime/device/ascend/ascend_label_assign.h" static constexpr size_t kCNodePrim = 0; static constexpr size_t kCNodeCallArg = 1; diff --git a/mindspore/ccsrc/session/ascend_control_parser.h b/mindspore/ccsrc/backend/session/ascend_control_parser.h similarity index 98% rename from mindspore/ccsrc/session/ascend_control_parser.h rename to mindspore/ccsrc/backend/session/ascend_control_parser.h index 7530f2019e..bd35d68b36 100644 --- a/mindspore/ccsrc/session/ascend_control_parser.h +++ b/mindspore/ccsrc/backend/session/ascend_control_parser.h @@ -20,7 +20,7 @@ #include #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "utils/base_ref.h" #include "utils/contract.h" #include "utils/union_find_set.h" diff --git a/mindspore/ccsrc/session/ascend_inference_session.cc b/mindspore/ccsrc/backend/session/ascend_inference_session.cc similarity index 93% rename from mindspore/ccsrc/session/ascend_inference_session.cc rename to mindspore/ccsrc/backend/session/ascend_inference_session.cc index 8593d0104a..d251eb2039 100644 --- a/mindspore/ccsrc/session/ascend_inference_session.cc +++ b/mindspore/ccsrc/backend/session/ascend_inference_session.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/ascend_inference_session.h" -#include "operator/ops.h" +#include "backend/session/ascend_inference_session.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/anf.h" #include "ir/param_value.h" -#include "device/kernel_runtime.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_runtime.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" #include "common/trans.h" -#include "kernel/tbe/tbe_python_funcs.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" #include "utils/config_manager.h" #include "utils/base_ref_extends.h" diff --git a/mindspore/ccsrc/session/ascend_inference_session.h b/mindspore/ccsrc/backend/session/ascend_inference_session.h similarity index 86% rename from mindspore/ccsrc/session/ascend_inference_session.h rename to mindspore/ccsrc/backend/session/ascend_inference_session.h index e8ccff3f17..5364ae8d4e 100644 --- a/mindspore/ccsrc/session/ascend_inference_session.h +++ b/mindspore/ccsrc/backend/session/ascend_inference_session.h @@ -24,11 +24,11 @@ #include #include #include -#include "session/ascend_session.h" -#include "session/kernel_graph.h" -#include "kernel/kernel.h" -#include "session/session_factory.h" -#include "session/ascend_control_parser.h" +#include "backend/session/ascend_session.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/session_factory.h" +#include "backend/session/ascend_control_parser.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/session/ascend_session.cc b/mindspore/ccsrc/backend/session/ascend_session.cc similarity index 98% rename from mindspore/ccsrc/session/ascend_session.cc rename to mindspore/ccsrc/backend/session/ascend_session.cc index 9505eb20ff..9995518c00 100644 --- a/mindspore/ccsrc/session/ascend_session.cc +++ b/mindspore/ccsrc/backend/session/ascend_session.cc @@ -13,37 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/ascend_session.h" +#include "backend/session/ascend_session.h" #include #include #include #include #include #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/anf.h" #include "common/trans.h" -#include "device/kernel_runtime.h" -#include "device/ascend/kernel_select_ascend.h" -#include "device/ascend/kernel_build_ascend.h" -#include "device/ascend/ascend_kernel_runtime.h" -#include "device/ascend/ascend_device_address.h" -#include "pre_activate/ascend/ascend_backend_optimization.h" -#include "pre_activate/common/common_backend_optimization.h" -#include "device/kernel_adjust.h" -#include "device/ascend/ascend_stream_assign.h" -#include "device/ascend/ascend_label_assign.h" +#include "runtime/device/kernel_runtime.h" +#include "runtime/device/ascend/kernel_select_ascend.h" +#include "runtime/device/ascend/kernel_build_ascend.h" +#include "runtime/device/ascend/ascend_kernel_runtime.h" +#include "runtime/device/ascend/ascend_device_address.h" +#include "backend/optimizer/ascend/ascend_backend_optimization.h" +#include "backend/optimizer/common/common_backend_optimization.h" +#include "runtime/device/kernel_adjust.h" +#include "runtime/device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_label_assign.h" #include "predict/predict.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "ir/scalar.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" #include "debug/draw.h" #include "common/utils.h" -#include "pre_activate/common/helper.h" -#include "device/kernel_runtime_manager.h" -#include "kernel/tbe/tbe_python_funcs.h" +#include "backend/optimizer/common/helper.h" +#include "runtime/device/kernel_runtime_manager.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" #include "utils/config_manager.h" #include "utils/base_ref_extends.h" #include "debug/tensor_load.h" diff --git a/mindspore/ccsrc/session/ascend_session.h b/mindspore/ccsrc/backend/session/ascend_session.h similarity index 97% rename from mindspore/ccsrc/session/ascend_session.h rename to mindspore/ccsrc/backend/session/ascend_session.h index 8a6df2bd26..f8ec7e8545 100755 --- a/mindspore/ccsrc/session/ascend_session.h +++ b/mindspore/ccsrc/backend/session/ascend_session.h @@ -24,11 +24,11 @@ #include #include #include -#include "session/session_basic.h" -#include "session/kernel_graph.h" -#include "kernel/kernel.h" -#include "session/session_factory.h" -#include "session/ascend_control_parser.h" +#include "backend/session/session_basic.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/session/session_factory.h" +#include "backend/session/ascend_control_parser.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/session/cpu_session.cc b/mindspore/ccsrc/backend/session/cpu_session.cc similarity index 94% rename from mindspore/ccsrc/session/cpu_session.cc rename to mindspore/ccsrc/backend/session/cpu_session.cc index 1927df2f49..ca1c78d206 100644 --- a/mindspore/ccsrc/session/cpu_session.cc +++ b/mindspore/ccsrc/backend/session/cpu_session.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "session/cpu_session.h" +#include "backend/session/cpu_session.h" #include #include "ir/tensor.h" #include "ir/anf.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "common/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_runtime.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_runtime.h" #include "predict/predict.h" -#include "kernel/cpu/cpu_kernel_factory.h" -#include "device/cpu/kernel_select_cpu.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "runtime/device/cpu/kernel_select_cpu.h" #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif diff --git a/mindspore/ccsrc/session/cpu_session.h b/mindspore/ccsrc/backend/session/cpu_session.h similarity index 90% rename from mindspore/ccsrc/session/cpu_session.h rename to mindspore/ccsrc/backend/session/cpu_session.h index 36b987e840..b0dbd1cc2b 100644 --- a/mindspore/ccsrc/session/cpu_session.h +++ b/mindspore/ccsrc/backend/session/cpu_session.h @@ -18,10 +18,10 @@ #include #include #include -#include "session/session_basic.h" -#include "session/kernel_graph.h" -#include "device/cpu/cpu_kernel_runtime.h" -#include "session/session_factory.h" +#include "backend/session/session_basic.h" +#include "backend/session/kernel_graph.h" +#include "runtime/device/cpu/cpu_kernel_runtime.h" +#include "backend/session/session_factory.h" namespace mindspore { namespace session { class CPUSession : public SessionBasic { diff --git a/mindspore/ccsrc/session/gpu_session.cc b/mindspore/ccsrc/backend/session/gpu_session.cc similarity index 93% rename from mindspore/ccsrc/session/gpu_session.cc rename to mindspore/ccsrc/backend/session/gpu_session.cc index 8d6d176970..1f109e0a6a 100644 --- a/mindspore/ccsrc/session/gpu_session.cc +++ b/mindspore/ccsrc/backend/session/gpu_session.cc @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/gpu_session.h" -#include "device/gpu/kernel_info_setter.h" -#include "device/gpu/gpu_kernel_build.h" -#include "device/gpu/gpu_kernel_runtime.h" -#include "device/gpu/gpu_stream_assign.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/common/helper.h" -#include "pre_activate/pass/communication_op_fusion.h" -#include "pre_activate/pass/getitem_tuple.h" -#include "pre_activate/gpu/adam_weight_decay_fusion.h" -#include "pre_activate/gpu/adam_fusion.h" -#include "device/kernel_runtime_manager.h" +#include "backend/session/gpu_session.h" +#include "runtime/device/gpu/kernel_info_setter.h" +#include "runtime/device/gpu/gpu_kernel_build.h" +#include "runtime/device/gpu/gpu_kernel_runtime.h" +#include "runtime/device/gpu/gpu_stream_assign.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/common/helper.h" +#include "backend/optimizer/pass/communication_op_fusion.h" +#include "backend/optimizer/pass/getitem_tuple.h" +#include "backend/optimizer/gpu/adam_weight_decay_fusion.h" +#include "backend/optimizer/gpu/adam_fusion.h" +#include "runtime/device/kernel_runtime_manager.h" #include "predict/predict.h" #include "common/utils.h" #include "common/trans.h" diff --git a/mindspore/ccsrc/session/gpu_session.h b/mindspore/ccsrc/backend/session/gpu_session.h similarity index 95% rename from mindspore/ccsrc/session/gpu_session.h rename to mindspore/ccsrc/backend/session/gpu_session.h index 4e46c2138d..7e07dfbcbd 100644 --- a/mindspore/ccsrc/session/gpu_session.h +++ b/mindspore/ccsrc/backend/session/gpu_session.h @@ -18,9 +18,9 @@ #include #include -#include "session/session_basic.h" -#include "session/kernel_graph.h" -#include "session/session_factory.h" +#include "backend/session/session_basic.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/session_factory.h" using KernelGraph = mindspore::session::KernelGraph; namespace mindspore { diff --git a/mindspore/ccsrc/session/kernel_graph.cc b/mindspore/ccsrc/backend/session/kernel_graph.cc similarity index 99% rename from mindspore/ccsrc/session/kernel_graph.cc rename to mindspore/ccsrc/backend/session/kernel_graph.cc index c8cc6fbbee..0bf447751b 100644 --- a/mindspore/ccsrc/session/kernel_graph.cc +++ b/mindspore/ccsrc/backend/session/kernel_graph.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include #include #include #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/param_value.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" -#include "kernel/kernel_build_info.h" -#include "device/kernel_runtime_manager.h" -#include "kernel/common_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "runtime/device/kernel_runtime_manager.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/session/kernel_graph.h b/mindspore/ccsrc/backend/session/kernel_graph.h similarity index 99% rename from mindspore/ccsrc/session/kernel_graph.h rename to mindspore/ccsrc/backend/session/kernel_graph.h index 2e46cfa76a..f353ed1dda 100644 --- a/mindspore/ccsrc/session/kernel_graph.h +++ b/mindspore/ccsrc/backend/session/kernel_graph.h @@ -29,7 +29,7 @@ #include "ir/anf.h" #include "utils/graph_utils.h" #include "utils/contract.h" -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/session/session.cc b/mindspore/ccsrc/backend/session/session.cc similarity index 96% rename from mindspore/ccsrc/session/session.cc rename to mindspore/ccsrc/backend/session/session.cc index ae70fc77aa..95484a1113 100644 --- a/mindspore/ccsrc/session/session.cc +++ b/mindspore/ccsrc/backend/session/session.cc @@ -17,17 +17,17 @@ #include #include #include "include/inference.h" -#include "session/session.h" +#include "backend/session/session.h" #include "utils/load_onnx/anf_converter.h" -#include "session/session_basic.h" -#include "session/session_factory.h" +#include "backend/session/session_basic.h" +#include "backend/session/session_factory.h" #include "utils/base_ref_utils.h" -#include "kernel/oplib/oplib.h" +#include "backend/kernel_compiler/oplib/oplib.h" #ifdef ENABLE_D #include "utils/context/ms_context.h" -#include "session/ascend_session.h" +#include "backend/session/ascend_session.h" #else -#include "session/cpu_session.h" +#include "backend/session/cpu_session.h" #endif namespace py = pybind11; diff --git a/mindspore/ccsrc/session/session.h b/mindspore/ccsrc/backend/session/session.h similarity index 97% rename from mindspore/ccsrc/session/session.h rename to mindspore/ccsrc/backend/session/session.h index b608163067..6ea9cfaa47 100644 --- a/mindspore/ccsrc/session/session.h +++ b/mindspore/ccsrc/backend/session/session.h @@ -23,7 +23,7 @@ #include #include -#include "session/session_basic.h" +#include "backend/session/session_basic.h" #include "ir/anf.h" #include "include/inference.h" diff --git a/mindspore/ccsrc/session/session_basic.cc b/mindspore/ccsrc/backend/session/session_basic.cc similarity index 99% rename from mindspore/ccsrc/session/session_basic.cc rename to mindspore/ccsrc/backend/session/session_basic.cc index 59cc0dd020..a7960c4695 100644 --- a/mindspore/ccsrc/session/session_basic.cc +++ b/mindspore/ccsrc/backend/session/session_basic.cc @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/session_basic.h" +#include "backend/session/session_basic.h" #include #include #include #include -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" #include "ir/manager.h" #include "ir/param_value.h" -#include "kernel/common_utils.h" -#include "operator/ops.h" +#include "backend/kernel_compiler/common_utils.h" +#include "frontend/operator/ops.h" #include "common/trans.h" #include "utils/context/ms_context.h" #include "utils/config_manager.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/oplib.h" -#include "pre_activate/common/common_backend_optimization.h" -#include "pre_activate/pass/const_input_to_attr_registry.h" -#include "pre_activate/common/helper.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/optimizer/common/common_backend_optimization.h" +#include "backend/optimizer/pass/const_input_to_attr_registry.h" +#include "backend/optimizer/common/helper.h" #include "common/utils.h" #include "ir/dtype.h" #include "ir/anf.h" diff --git a/mindspore/ccsrc/session/session_basic.h b/mindspore/ccsrc/backend/session/session_basic.h similarity index 97% rename from mindspore/ccsrc/session/session_basic.h rename to mindspore/ccsrc/backend/session/session_basic.h index 8f8f88e65a..c662e3978b 100755 --- a/mindspore/ccsrc/session/session_basic.h +++ b/mindspore/ccsrc/backend/session/session_basic.h @@ -24,14 +24,14 @@ #include #include "utils/base_ref_extends.h" -#include "session/session_context.h" -#include "session/kernel_graph.h" +#include "backend/session/session_context.h" +#include "backend/session/kernel_graph.h" #include "ir/anf.h" #include "ir/tensor.h" #include "utils/any.h" #include "utils/contract.h" -#include "pynative/pynative_execute.h" -#include "device/kernel_info.h" +#include "pipeline/pynative/pynative_execute.h" +#include "runtime/device/kernel_info.h" #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif diff --git a/mindspore/ccsrc/session/session_context.cc b/mindspore/ccsrc/backend/session/session_context.cc similarity index 95% rename from mindspore/ccsrc/session/session_context.cc rename to mindspore/ccsrc/backend/session/session_context.cc index 2b6ebf6b84..f5ec49c090 100644 --- a/mindspore/ccsrc/session/session_context.cc +++ b/mindspore/ccsrc/backend/session/session_context.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/session_context.h" +#include "backend/session/session_context.h" namespace mindspore { namespace session { std::shared_ptr Context::GetInstance() { diff --git a/mindspore/ccsrc/session/session_context.h b/mindspore/ccsrc/backend/session/session_context.h similarity index 97% rename from mindspore/ccsrc/session/session_context.h rename to mindspore/ccsrc/backend/session/session_context.h index 78794c348e..22cc0c813a 100644 --- a/mindspore/ccsrc/session/session_context.h +++ b/mindspore/ccsrc/backend/session/session_context.h @@ -23,7 +23,7 @@ #include #include "ir/tensor.h" -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" #include "utils/context/ms_context.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/session/session_factory.cc b/mindspore/ccsrc/backend/session/session_factory.cc similarity index 96% rename from mindspore/ccsrc/session/session_factory.cc rename to mindspore/ccsrc/backend/session/session_factory.cc index 4cd0481f8c..8a8f9a9cea 100644 --- a/mindspore/ccsrc/session/session_factory.cc +++ b/mindspore/ccsrc/backend/session/session_factory.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "session/session_factory.h" +#include "backend/session/session_factory.h" #include #include #include diff --git a/mindspore/ccsrc/session/session_factory.h b/mindspore/ccsrc/backend/session/session_factory.h similarity index 97% rename from mindspore/ccsrc/session/session_factory.h rename to mindspore/ccsrc/backend/session/session_factory.h index 99db0afeb7..054f03cf4b 100644 --- a/mindspore/ccsrc/session/session_factory.h +++ b/mindspore/ccsrc/backend/session/session_factory.h @@ -22,7 +22,7 @@ #include #include #include "common/utils.h" -#include "session/session_basic.h" +#include "backend/session/session_basic.h" namespace mindspore { namespace session { using SessionCreator = std::function()>; diff --git a/mindspore/ccsrc/common.h b/mindspore/ccsrc/common.h index a545be32c7..6b882a15d4 100644 --- a/mindspore/ccsrc/common.h +++ b/mindspore/ccsrc/common.h @@ -25,11 +25,11 @@ #include "abstract/dshape.h" #include "abstract/abstract_value.h" -#include "pipeline/static_analysis/abstract_function.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/parse.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/resolve.h" +#include "pipeline/jit/static_analysis/abstract_function.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/parse.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/resolve.h" namespace py = pybind11; #endif // MINDSPORE_CCSRC_COMMON_H_ diff --git a/mindspore/ccsrc/common/trans.cc b/mindspore/ccsrc/common/trans.cc index 9cf6eb3a5a..1841826ca9 100644 --- a/mindspore/ccsrc/common/trans.cc +++ b/mindspore/ccsrc/common/trans.cc @@ -18,9 +18,9 @@ #include #include #include "common/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/kernel.h" -#include "device/convert_tensor_utils.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel.h" +#include "runtime/device/convert_tensor_utils.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/common/trans.h b/mindspore/ccsrc/common/trans.h index a8fc7c8a00..286c76afd0 100644 --- a/mindspore/ccsrc/common/trans.h +++ b/mindspore/ccsrc/common/trans.h @@ -24,7 +24,7 @@ #include #include #include "ir/dtype.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "ir/dtype/type.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/core/client.h b/mindspore/ccsrc/dataset/core/client.h deleted file mode 100644 index 96553c9169..0000000000 --- a/mindspore/ccsrc/dataset/core/client.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2019 Huawei Technologies Co., Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef DATASET_CORE_CLIENT_H_ -#define DATASET_CORE_CLIENT_H_ - -// client.h -// Include file for DE client functions - -#include "dataset/core/constants.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/source/mindrecord_op.h" -#include "dataset/engine/datasetops/source/tf_reader_op.h" - -#ifdef ENABLE_PYTHON -#include "dataset/engine/datasetops/barrier_op.h" -#include "dataset/engine/datasetops/filter_op.h" -#include "dataset/engine/datasetops/source/generator_op.h" -#include "dataset/engine/datasetops/build_vocab_op.h" -#endif - -#include "dataset/engine/datasetops/batch_op.h" -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/datasetops/device_queue_op.h" -#include "dataset/engine/datasetops/map_op.h" -#include "dataset/engine/datasetops/project_op.h" -#include "dataset/engine/datasetops/rename_op.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/datasetops/skip_op.h" -#include "dataset/engine/datasetops/shuffle_op.h" -#include "dataset/engine/datasetops/take_op.h" -#include "dataset/engine/datasetops/zip_op.h" -#include "dataset/engine/datasetops/concat_op.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/util/status.h" - -namespace mindspore { -namespace dataset { -// This is a one-time global initializer that needs to be called at the -// start of any minddata applications. -extern Status GlobalInit(); -} // namespace dataset -} // namespace mindspore - -#endif // DATASET_CORE_CLIENT_H_ diff --git a/mindspore/ccsrc/dataset/include/utils/log_adapter.h b/mindspore/ccsrc/dataset/include/utils/log_adapter.h deleted file mode 120000 index 5cecc45938..0000000000 --- a/mindspore/ccsrc/dataset/include/utils/log_adapter.h +++ /dev/null @@ -1 +0,0 @@ -../../../utils/log_adapter.h \ No newline at end of file diff --git a/mindspore/ccsrc/dataset/include/utils/overload.h b/mindspore/ccsrc/dataset/include/utils/overload.h deleted file mode 120000 index d163e52748..0000000000 --- a/mindspore/ccsrc/dataset/include/utils/overload.h +++ /dev/null @@ -1 +0,0 @@ -../../../utils/overload.h \ No newline at end of file diff --git a/mindspore/ccsrc/debug/anf_ir_dump.cc b/mindspore/ccsrc/debug/anf_ir_dump.cc index fc32e0fb5f..c7f2e2b14d 100644 --- a/mindspore/ccsrc/debug/anf_ir_dump.cc +++ b/mindspore/ccsrc/debug/anf_ir_dump.cc @@ -24,9 +24,9 @@ #include "ir/primitive.h" #include "ir/func_graph.h" -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" #include "utils/graph_utils.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { const std::string ToShortString(const TypeId &typeId) { diff --git a/mindspore/ccsrc/debug/anf_ir_utils.cc b/mindspore/ccsrc/debug/anf_ir_utils.cc index 894e59fe4b..273a6f6458 100644 --- a/mindspore/ccsrc/debug/anf_ir_utils.cc +++ b/mindspore/ccsrc/debug/anf_ir_utils.cc @@ -28,17 +28,17 @@ #include "ir/meta_func_graph.h" #include "ir/param_value.h" #include "ir/tensor_py.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/resolve.h" -#include "operator/composite/composite.h" -#include "operator/composite/map.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/resolve.h" +#include "frontend/operator/composite/composite.h" +#include "frontend/operator/composite/map.h" #include "utils/ordered_map.h" #include "utils/ordered_set.h" #include "utils/utils.h" #include "debug/trace.h" #include "debug/label.h" #include "utils/context/ms_context.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" using mindspore::tensor::TensorPy; diff --git a/mindspore/ccsrc/debug/anf_ir_utils.h b/mindspore/ccsrc/debug/anf_ir_utils.h index 4503692eb9..ed5e3b8a5d 100644 --- a/mindspore/ccsrc/debug/anf_ir_utils.h +++ b/mindspore/ccsrc/debug/anf_ir_utils.h @@ -28,9 +28,9 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/meta_func_graph.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/resolve.h" -#include "operator/composite/composite.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/resolve.h" +#include "frontend/operator/composite/composite.h" #include "utils/symbolic.h" #include "utils/ordered_map.h" #include "utils/ordered_set.h" diff --git a/mindspore/ccsrc/debug/debugger/debugger.cc b/mindspore/ccsrc/debug/debugger/debugger.cc index c061fba6e7..369f33d79c 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.cc +++ b/mindspore/ccsrc/debug/debugger/debugger.cc @@ -19,8 +19,8 @@ #include #include #include "debug/debugger/debugger.h" -#include "pipeline/pipeline.h" -#include "session/anf_runtime_algorithm.h" +#include "pipeline/jit/pipeline.h" +#include "backend/session/anf_runtime_algorithm.h" using debugger::EventReply; using debugger::GraphProto; diff --git a/mindspore/ccsrc/debug/debugger/debugger.h b/mindspore/ccsrc/debug/debugger/debugger.h index 9b03d6b0b7..da1f325291 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.h +++ b/mindspore/ccsrc/debug/debugger/debugger.h @@ -19,7 +19,7 @@ #include #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "debug/debugger/grpc_client.h" #include "debug/debug_services.h" diff --git a/mindspore/ccsrc/debug/draw.cc b/mindspore/ccsrc/debug/draw.cc index 6cbd5b7f5f..ff8132fb28 100644 --- a/mindspore/ccsrc/debug/draw.cc +++ b/mindspore/ccsrc/debug/draw.cc @@ -29,7 +29,7 @@ #include "ir/primitive.h" #include "utils/graph_utils.h" #include "utils/utils.h" -#include "operator/composite/composite.h" +#include "frontend/operator/composite/composite.h" #include "ir/tensor.h" namespace py = pybind11; diff --git a/mindspore/ccsrc/debug/draw.h b/mindspore/ccsrc/debug/draw.h index 7804c6e94a..cb670fe0f6 100644 --- a/mindspore/ccsrc/debug/draw.h +++ b/mindspore/ccsrc/debug/draw.h @@ -22,7 +22,7 @@ #include #include "ir/anf.h" #include "utils/any.h" -#include "pipeline/parse/resolve.h" +#include "pipeline/jit/parse/resolve.h" namespace mindspore { namespace draw { diff --git a/mindspore/ccsrc/debug/trace.cc b/mindspore/ccsrc/debug/trace.cc index e12a7b1209..b8d3f0a7c7 100644 --- a/mindspore/ccsrc/debug/trace.cc +++ b/mindspore/ccsrc/debug/trace.cc @@ -29,10 +29,10 @@ #include "ir/meta_func_graph.h" #include "utils/graph_utils.h" -#include "operator/composite/composite.h" +#include "frontend/operator/composite/composite.h" #include "ir/tensor.h" #include "debug/anf_ir_utils.h" -#include "pipeline/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/evaluator.h" namespace mindspore { // namespace to support debug trace infomation diff --git a/mindspore/ccsrc/debug/trace.h b/mindspore/ccsrc/debug/trace.h index 9583997e93..7cf45abe30 100644 --- a/mindspore/ccsrc/debug/trace.h +++ b/mindspore/ccsrc/debug/trace.h @@ -27,7 +27,7 @@ #include "debug/info.h" #include "ir/anf.h" #include "ir/func_graph.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/any.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/CMakeLists.txt b/mindspore/ccsrc/frontend/operator/CMakeLists.txt similarity index 72% rename from mindspore/ccsrc/operator/CMakeLists.txt rename to mindspore/ccsrc/frontend/operator/CMakeLists.txt index 88bcf0e532..0b6dd77c69 100644 --- a/mindspore/ccsrc/operator/CMakeLists.txt +++ b/mindspore/ccsrc/frontend/operator/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB_RECURSE _OPERATOR_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") set_property(SOURCE ${_OPERATOR_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ANALYZER) -add_library(_mindspore_operator_obj OBJECT ${_OPERATOR_SRC_FILES}) +add_library(_mindspore_frontend_operator_obj OBJECT ${_OPERATOR_SRC_FILES}) diff --git a/mindspore/ccsrc/operator/cc_implementations.cc b/mindspore/ccsrc/frontend/operator/cc_implementations.cc similarity index 99% rename from mindspore/ccsrc/operator/cc_implementations.cc rename to mindspore/ccsrc/frontend/operator/cc_implementations.cc index 52b71f410f..3ec3455be7 100644 --- a/mindspore/ccsrc/operator/cc_implementations.cc +++ b/mindspore/ccsrc/frontend/operator/cc_implementations.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "operator/cc_implementations.h" +#include "frontend/operator/cc_implementations.h" #include #include #include diff --git a/mindspore/ccsrc/operator/cc_implementations.h b/mindspore/ccsrc/frontend/operator/cc_implementations.h similarity index 100% rename from mindspore/ccsrc/operator/cc_implementations.h rename to mindspore/ccsrc/frontend/operator/cc_implementations.h diff --git a/mindspore/ccsrc/operator/composite/composite.cc b/mindspore/ccsrc/frontend/operator/composite/composite.cc similarity index 99% rename from mindspore/ccsrc/operator/composite/composite.cc rename to mindspore/ccsrc/frontend/operator/composite/composite.cc index db3055ad9a..7d2573e50a 100644 --- a/mindspore/ccsrc/operator/composite/composite.cc +++ b/mindspore/ccsrc/frontend/operator/composite/composite.cc @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "operator/composite/composite.h" +#include "frontend/operator/composite/composite.h" #include #include #include @@ -25,11 +25,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "abstract/abstract_value.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include "abstract/dshape.h" #include "abstract/param_validator.h" -#include "operator/cc_implementations.h" -#include "optimizer/opt.h" +#include "frontend/operator/cc_implementations.h" +#include "frontend/optimizer/opt.h" #include "utils/symbolic.h" #include "pybind_api/api_register.h" #include "./common.h" diff --git a/mindspore/ccsrc/operator/composite/composite.h b/mindspore/ccsrc/frontend/operator/composite/composite.h similarity index 95% rename from mindspore/ccsrc/operator/composite/composite.h rename to mindspore/ccsrc/frontend/operator/composite/composite.h index 5944c81fb0..3821192dba 100644 --- a/mindspore/ccsrc/operator/composite/composite.h +++ b/mindspore/ccsrc/frontend/operator/composite/composite.h @@ -26,12 +26,12 @@ #include #include #include -#include "operator/composite/zip_operation.h" -#include "operator/composite/list_append_operation.h" -#include "operator/composite/do_signature.h" -#include "operator/composite/unpack_call.h" -#include "operator/composite/multitype_funcgraph.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "frontend/operator/composite/zip_operation.h" +#include "frontend/operator/composite/list_append_operation.h" +#include "frontend/operator/composite/do_signature.h" +#include "frontend/operator/composite/unpack_call.h" +#include "frontend/operator/composite/multitype_funcgraph.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/misc.h" #include "utils/any.h" #include "ir/dtype.h" diff --git a/mindspore/ccsrc/operator/composite/do_signature.cc b/mindspore/ccsrc/frontend/operator/composite/do_signature.cc similarity index 98% rename from mindspore/ccsrc/operator/composite/do_signature.cc rename to mindspore/ccsrc/frontend/operator/composite/do_signature.cc index 90ecfdb9f9..50be3c5b29 100644 --- a/mindspore/ccsrc/operator/composite/do_signature.cc +++ b/mindspore/ccsrc/frontend/operator/composite/do_signature.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "operator/composite/do_signature.h" +#include "frontend/operator/composite/do_signature.h" #include #include @@ -22,8 +22,8 @@ #include "ir/anf.h" #include "abstract/dshape.h" #include "abstract/param_validator.h" -#include "operator/cc_implementations.h" -#include "optimizer/opt.h" +#include "frontend/operator/cc_implementations.h" +#include "frontend/optimizer/opt.h" #include "utils/symbolic.h" #include "./common.h" #include "pybind_api/api_register.h" diff --git a/mindspore/ccsrc/operator/composite/do_signature.h b/mindspore/ccsrc/frontend/operator/composite/do_signature.h similarity index 97% rename from mindspore/ccsrc/operator/composite/do_signature.h rename to mindspore/ccsrc/frontend/operator/composite/do_signature.h index 97f6d7e7a5..9139be806a 100644 --- a/mindspore/ccsrc/operator/composite/do_signature.h +++ b/mindspore/ccsrc/frontend/operator/composite/do_signature.h @@ -25,7 +25,7 @@ #include #include -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/misc.h" #include "utils/any.h" #include "ir/dtype.h" diff --git a/mindspore/ccsrc/operator/composite/list_append_operation.cc b/mindspore/ccsrc/frontend/operator/composite/list_append_operation.cc similarity index 95% rename from mindspore/ccsrc/operator/composite/list_append_operation.cc rename to mindspore/ccsrc/frontend/operator/composite/list_append_operation.cc index 076ae5d41b..3dfe2e23d0 100644 --- a/mindspore/ccsrc/operator/composite/list_append_operation.cc +++ b/mindspore/ccsrc/frontend/operator/composite/list_append_operation.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "operator/composite/list_append_operation.h" +#include "frontend/operator/composite/list_append_operation.h" #include #include #include #include "abstract/param_validator.h" -#include "optimizer/opt.h" +#include "frontend/optimizer/opt.h" #include "pybind_api/api_register.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/composite/list_append_operation.h b/mindspore/ccsrc/frontend/operator/composite/list_append_operation.h similarity index 100% rename from mindspore/ccsrc/operator/composite/list_append_operation.h rename to mindspore/ccsrc/frontend/operator/composite/list_append_operation.h diff --git a/mindspore/ccsrc/operator/composite/map.cc b/mindspore/ccsrc/frontend/operator/composite/map.cc similarity index 98% rename from mindspore/ccsrc/operator/composite/map.cc rename to mindspore/ccsrc/frontend/operator/composite/map.cc index eb8b4b6df1..a5f674187b 100644 --- a/mindspore/ccsrc/operator/composite/map.cc +++ b/mindspore/ccsrc/frontend/operator/composite/map.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "operator/composite/map.h" +#include "frontend/operator/composite/map.h" #include #include #include @@ -23,11 +23,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "abstract/abstract_value.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include "abstract/dshape.h" #include "pybind_api/api_register.h" #include "debug/trace.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "./common.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/composite/map.h b/mindspore/ccsrc/frontend/operator/composite/map.h similarity index 98% rename from mindspore/ccsrc/operator/composite/map.h rename to mindspore/ccsrc/frontend/operator/composite/map.h index 02d374214a..428014f9c4 100644 --- a/mindspore/ccsrc/operator/composite/map.h +++ b/mindspore/ccsrc/frontend/operator/composite/map.h @@ -24,7 +24,7 @@ #include "ir/dtype.h" #include "ir/meta_func_graph.h" -#include "operator/composite/multitype_funcgraph.h" +#include "frontend/operator/composite/multitype_funcgraph.h" namespace mindspore { // namespace to support composite operators definition diff --git a/mindspore/ccsrc/operator/composite/multitype_funcgraph.cc b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc similarity index 97% rename from mindspore/ccsrc/operator/composite/multitype_funcgraph.cc rename to mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc index bc51bb6395..ba0d3d9ebb 100644 --- a/mindspore/ccsrc/operator/composite/multitype_funcgraph.cc +++ b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc @@ -17,7 +17,7 @@ * limitations under the License. */ -#include "operator/composite/multitype_funcgraph.h" +#include "frontend/operator/composite/multitype_funcgraph.h" #include #include #include @@ -25,11 +25,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "abstract/abstract_value.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include "abstract/dshape.h" #include "abstract/param_validator.h" -#include "operator/cc_implementations.h" -#include "optimizer/opt.h" +#include "frontend/operator/cc_implementations.h" +#include "frontend/optimizer/opt.h" #include "utils/context/ms_context.h" #include "utils/symbolic.h" #include "pybind_api/api_register.h" diff --git a/mindspore/ccsrc/operator/composite/multitype_funcgraph.h b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.h similarity index 97% rename from mindspore/ccsrc/operator/composite/multitype_funcgraph.h rename to mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.h index ababf21883..2139a0e9d1 100644 --- a/mindspore/ccsrc/operator/composite/multitype_funcgraph.h +++ b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.h @@ -26,7 +26,7 @@ #include #include #include -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/misc.h" #include "ir/dtype.h" #include "ir/meta_func_graph.h" diff --git a/mindspore/ccsrc/operator/composite/unpack_call.cc b/mindspore/ccsrc/frontend/operator/composite/unpack_call.cc similarity index 96% rename from mindspore/ccsrc/operator/composite/unpack_call.cc rename to mindspore/ccsrc/frontend/operator/composite/unpack_call.cc index 96298c9250..2c9e0b538f 100644 --- a/mindspore/ccsrc/operator/composite/unpack_call.cc +++ b/mindspore/ccsrc/frontend/operator/composite/unpack_call.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "operator/composite/unpack_call.h" +#include "frontend/operator/composite/unpack_call.h" #include #include @@ -22,9 +22,9 @@ #include "abstract/abstract_value.h" #include "abstract/dshape.h" #include "abstract/param_validator.h" -#include "operator/cc_implementations.h" +#include "frontend/operator/cc_implementations.h" #include "ir/anf.h" -#include "optimizer/opt.h" +#include "frontend/optimizer/opt.h" #include "utils/symbolic.h" #include "pybind_api/api_register.h" diff --git a/mindspore/ccsrc/operator/composite/unpack_call.h b/mindspore/ccsrc/frontend/operator/composite/unpack_call.h similarity index 96% rename from mindspore/ccsrc/operator/composite/unpack_call.h rename to mindspore/ccsrc/frontend/operator/composite/unpack_call.h index 8c055a9386..79c2600f36 100644 --- a/mindspore/ccsrc/operator/composite/unpack_call.h +++ b/mindspore/ccsrc/frontend/operator/composite/unpack_call.h @@ -25,7 +25,7 @@ #include #include -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/misc.h" #include "utils/any.h" #include "ir/dtype.h" diff --git a/mindspore/ccsrc/operator/composite/zip_operation.cc b/mindspore/ccsrc/frontend/operator/composite/zip_operation.cc similarity index 96% rename from mindspore/ccsrc/operator/composite/zip_operation.cc rename to mindspore/ccsrc/frontend/operator/composite/zip_operation.cc index 89118c7b3b..9e2b6d28b2 100644 --- a/mindspore/ccsrc/operator/composite/zip_operation.cc +++ b/mindspore/ccsrc/frontend/operator/composite/zip_operation.cc @@ -16,14 +16,14 @@ * limitations under the License. */ -#include "operator/composite/zip_operation.h" +#include "frontend/operator/composite/zip_operation.h" #include #include "abstract/abstract_value.h" #include "ir/anf.h" #include "abstract/dshape.h" -#include "operator/cc_implementations.h" -#include "optimizer/opt.h" +#include "frontend/operator/cc_implementations.h" +#include "frontend/optimizer/opt.h" #include "pybind_api/api_register.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/composite/zip_operation.h b/mindspore/ccsrc/frontend/operator/composite/zip_operation.h similarity index 97% rename from mindspore/ccsrc/operator/composite/zip_operation.h rename to mindspore/ccsrc/frontend/operator/composite/zip_operation.h index 1a3fa1f5fe..96697cb472 100644 --- a/mindspore/ccsrc/operator/composite/zip_operation.h +++ b/mindspore/ccsrc/frontend/operator/composite/zip_operation.h @@ -27,7 +27,7 @@ #include #include -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/misc.h" #include "utils/any.h" #include "ir/dtype.h" diff --git a/mindspore/ccsrc/operator/ops.cc b/mindspore/ccsrc/frontend/operator/ops.cc similarity index 99% rename from mindspore/ccsrc/operator/ops.cc rename to mindspore/ccsrc/frontend/operator/ops.cc index b682847ed7..5c7672ee3c 100755 --- a/mindspore/ccsrc/operator/ops.cc +++ b/mindspore/ccsrc/frontend/operator/ops.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include #include diff --git a/mindspore/ccsrc/operator/ops.h b/mindspore/ccsrc/frontend/operator/ops.h similarity index 100% rename from mindspore/ccsrc/operator/ops.h rename to mindspore/ccsrc/frontend/operator/ops.h diff --git a/mindspore/ccsrc/operator/ops_extends.cc b/mindspore/ccsrc/frontend/operator/ops_extends.cc similarity index 90% rename from mindspore/ccsrc/operator/ops_extends.cc rename to mindspore/ccsrc/frontend/operator/ops_extends.cc index d415b45adf..c406682c3e 100755 --- a/mindspore/ccsrc/operator/ops_extends.cc +++ b/mindspore/ccsrc/frontend/operator/ops_extends.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include #include -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/data_converter.h" namespace mindspore { // namespace to support primitive operators diff --git a/mindspore/ccsrc/operator/prim_arrays.cc b/mindspore/ccsrc/frontend/operator/prim_arrays.cc similarity index 98% rename from mindspore/ccsrc/operator/prim_arrays.cc rename to mindspore/ccsrc/frontend/operator/prim_arrays.cc index 4e2e2ebd1f..caaf1d1b2a 100644 --- a/mindspore/ccsrc/operator/prim_arrays.cc +++ b/mindspore/ccsrc/frontend/operator/prim_arrays.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "abstract/utils.h" -#include "operator/cc_implementations.h" +#include "frontend/operator/cc_implementations.h" #include "abstract/param_validator.h" namespace mindspore { diff --git a/mindspore/ccsrc/operator/prim_debug.cc b/mindspore/ccsrc/frontend/operator/prim_debug.cc similarity index 94% rename from mindspore/ccsrc/operator/prim_debug.cc rename to mindspore/ccsrc/frontend/operator/prim_debug.cc index 014797fb20..718dadf5c1 100644 --- a/mindspore/ccsrc/operator/prim_debug.cc +++ b/mindspore/ccsrc/frontend/operator/prim_debug.cc @@ -15,8 +15,8 @@ */ #include "abstract/param_validator.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "abstract/utils.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/operator/prim_maths.cc b/mindspore/ccsrc/frontend/operator/prim_maths.cc similarity index 95% rename from mindspore/ccsrc/operator/prim_maths.cc rename to mindspore/ccsrc/frontend/operator/prim_maths.cc index e073a3630b..e4543a3821 100644 --- a/mindspore/ccsrc/operator/prim_maths.cc +++ b/mindspore/ccsrc/frontend/operator/prim_maths.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "abstract/utils.h" #include "abstract/param_validator.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/operator/prim_nn.cc b/mindspore/ccsrc/frontend/operator/prim_nn.cc similarity index 99% rename from mindspore/ccsrc/operator/prim_nn.cc rename to mindspore/ccsrc/frontend/operator/prim_nn.cc index 729674cace..96c86d815d 100644 --- a/mindspore/ccsrc/operator/prim_nn.cc +++ b/mindspore/ccsrc/frontend/operator/prim_nn.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "abstract/utils.h" #include "abstract/param_validator.h" diff --git a/mindspore/ccsrc/operator/prim_others.cc b/mindspore/ccsrc/frontend/operator/prim_others.cc similarity index 99% rename from mindspore/ccsrc/operator/prim_others.cc rename to mindspore/ccsrc/frontend/operator/prim_others.cc index f181fcacf7..530ad6a10c 100644 --- a/mindspore/ccsrc/operator/prim_others.cc +++ b/mindspore/ccsrc/frontend/operator/prim_others.cc @@ -19,9 +19,9 @@ #include "ir/dtype.h" #include "common/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "abstract/param_validator.h" -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" #include "abstract/utils.h" #include "utils/context/ms_context.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/operator/prim_statement.cc b/mindspore/ccsrc/frontend/operator/prim_statement.cc similarity index 99% rename from mindspore/ccsrc/operator/prim_statement.cc rename to mindspore/ccsrc/frontend/operator/prim_statement.cc index 3760814554..bb421bdf8a 100644 --- a/mindspore/ccsrc/operator/prim_statement.cc +++ b/mindspore/ccsrc/frontend/operator/prim_statement.cc @@ -15,8 +15,8 @@ */ #include "abstract/param_validator.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "abstract/utils.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/operator/prim_structures.cc b/mindspore/ccsrc/frontend/operator/prim_structures.cc similarity index 99% rename from mindspore/ccsrc/operator/prim_structures.cc rename to mindspore/ccsrc/frontend/operator/prim_structures.cc index 6501e6a843..b602b07a0c 100644 --- a/mindspore/ccsrc/operator/prim_structures.cc +++ b/mindspore/ccsrc/frontend/operator/prim_structures.cc @@ -16,10 +16,10 @@ * limitations under the License. */ -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" #include "abstract/utils.h" #include "abstract/param_validator.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/convert_utils.h" #include "ir/tensor_py.h" diff --git a/mindspore/ccsrc/operator/prim_to_function.cc b/mindspore/ccsrc/frontend/operator/prim_to_function.cc similarity index 98% rename from mindspore/ccsrc/operator/prim_to_function.cc rename to mindspore/ccsrc/frontend/operator/prim_to_function.cc index 733cdbdb73..7b9592e80e 100644 --- a/mindspore/ccsrc/operator/prim_to_function.cc +++ b/mindspore/ccsrc/frontend/operator/prim_to_function.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "operator/prim_to_function.h" +#include "frontend/operator/prim_to_function.h" #include #include #include diff --git a/mindspore/ccsrc/operator/prim_to_function.h b/mindspore/ccsrc/frontend/operator/prim_to_function.h similarity index 100% rename from mindspore/ccsrc/operator/prim_to_function.h rename to mindspore/ccsrc/frontend/operator/prim_to_function.h diff --git a/mindspore/ccsrc/optimizer/CMakeLists.txt b/mindspore/ccsrc/frontend/optimizer/CMakeLists.txt similarity index 71% rename from mindspore/ccsrc/optimizer/CMakeLists.txt rename to mindspore/ccsrc/frontend/optimizer/CMakeLists.txt index 44af01735a..14fda83052 100644 --- a/mindspore/ccsrc/optimizer/CMakeLists.txt +++ b/mindspore/ccsrc/frontend/optimizer/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB_RECURSE _OPTIMIZER_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") set_property(SOURCE ${_OPTIMIZER_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_OPTIMIZER) -add_library(_mindspore_optimizer_obj OBJECT ${_OPTIMIZER_SRC_FILES}) +add_library(_mindspore_frontend_optimizer_obj OBJECT ${_OPTIMIZER_SRC_FILES}) diff --git a/mindspore/ccsrc/optimizer/ad/adjoint.cc b/mindspore/ccsrc/frontend/optimizer/ad/adjoint.cc similarity index 97% rename from mindspore/ccsrc/optimizer/ad/adjoint.cc rename to mindspore/ccsrc/frontend/optimizer/ad/adjoint.cc index ed89aba20e..60ccf28df4 100644 --- a/mindspore/ccsrc/optimizer/ad/adjoint.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/adjoint.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "optimizer/ad/adjoint.h" +#include "frontend/optimizer/ad/adjoint.h" #include #include #include "ir/anf.h" -#include "optimizer/ad/dfunctor.h" +#include "frontend/optimizer/ad/dfunctor.h" namespace mindspore { namespace ad { diff --git a/mindspore/ccsrc/optimizer/ad/adjoint.h b/mindspore/ccsrc/frontend/optimizer/ad/adjoint.h similarity index 97% rename from mindspore/ccsrc/optimizer/ad/adjoint.h rename to mindspore/ccsrc/frontend/optimizer/ad/adjoint.h index b2dae8e66f..37986e6810 100644 --- a/mindspore/ccsrc/optimizer/ad/adjoint.h +++ b/mindspore/ccsrc/frontend/optimizer/ad/adjoint.h @@ -22,7 +22,7 @@ #include #include "ir/anf.h" -#include "optimizer/opt.h" +#include "frontend/optimizer/opt.h" namespace mindspore { namespace ad { diff --git a/mindspore/ccsrc/optimizer/ad/dfunctor.cc b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc similarity index 98% rename from mindspore/ccsrc/optimizer/ad/dfunctor.cc rename to mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc index 308f1dd352..b314b22f81 100644 --- a/mindspore/ccsrc/optimizer/ad/dfunctor.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "optimizer/ad/dfunctor.h" +#include "frontend/optimizer/ad/dfunctor.h" #include #include @@ -25,12 +25,12 @@ #include "debug/info.h" #include "ir/func_graph_cloner.h" #include "ir/manager.h" -#include "pipeline/resource.h" -#include "pipeline/parse/parse.h" -#include "optimizer/ad/adjoint.h" -#include "optimizer/opt.h" -#include "operator/ops.h" -#include "operator/composite/composite.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/parse/parse.h" +#include "frontend/optimizer/ad/adjoint.h" +#include "frontend/optimizer/opt.h" +#include "frontend/operator/ops.h" +#include "frontend/operator/composite/composite.h" #include "utils/symbolic.h" #include "utils/context/ms_context.h" #include "./common.h" diff --git a/mindspore/ccsrc/optimizer/ad/dfunctor.h b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h similarity index 98% rename from mindspore/ccsrc/optimizer/ad/dfunctor.h rename to mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h index 09c0f54fc8..9ee93334e8 100644 --- a/mindspore/ccsrc/optimizer/ad/dfunctor.h +++ b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.h @@ -28,9 +28,9 @@ #include "ir/anf.h" #include "ir/meta_func_graph.h" #include "ir/func_graph_cloner.h" -#include "pipeline/resource.h" -#include "optimizer/ad/adjoint.h" -#include "operator/ops.h" +#include "pipeline/jit/resource.h" +#include "frontend/optimizer/ad/adjoint.h" +#include "frontend/operator/ops.h" #include "debug/trace.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/ad/grad.cc b/mindspore/ccsrc/frontend/optimizer/ad/grad.cc similarity index 96% rename from mindspore/ccsrc/optimizer/ad/grad.cc rename to mindspore/ccsrc/frontend/optimizer/ad/grad.cc index d141dc6eea..ef2d7d400a 100644 --- a/mindspore/ccsrc/optimizer/ad/grad.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/grad.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "optimizer/ad/grad.h" -#include "optimizer/ad/dfunctor.h" +#include "frontend/optimizer/ad/grad.h" +#include "frontend/optimizer/ad/dfunctor.h" #include "ir/func_graph_cloner.h" #include "utils/context/ms_context.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/optimizer/ad/grad.h b/mindspore/ccsrc/frontend/optimizer/ad/grad.h similarity index 97% rename from mindspore/ccsrc/optimizer/ad/grad.h rename to mindspore/ccsrc/frontend/optimizer/ad/grad.h index a878aa9df7..ee9ab79ffb 100644 --- a/mindspore/ccsrc/optimizer/ad/grad.h +++ b/mindspore/ccsrc/frontend/optimizer/ad/grad.h @@ -22,7 +22,7 @@ #include "ir/anf.h" #include "ir/meta_func_graph.h" -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" namespace mindspore { namespace ad { diff --git a/mindspore/ccsrc/optimizer/ad/kprim.cc b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc similarity index 97% rename from mindspore/ccsrc/optimizer/ad/kprim.cc rename to mindspore/ccsrc/frontend/optimizer/ad/kprim.cc index bdec1dc93c..5ca2ca6c43 100644 --- a/mindspore/ccsrc/optimizer/ad/kprim.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc @@ -24,12 +24,12 @@ #include "ir/meta_func_graph.h" #include "ir/func_graph_cloner.h" #include "ir/manager.h" -#include "pipeline/resource.h" -#include "pipeline/parse/parse.h" -#include "optimizer/ad/dfunctor.h" -#include "optimizer/opt.h" -#include "operator/ops.h" -#include "operator/composite/composite.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/parse/parse.h" +#include "frontend/optimizer/ad/dfunctor.h" +#include "frontend/optimizer/opt.h" +#include "frontend/operator/ops.h" +#include "frontend/operator/composite/composite.h" #include "utils/symbolic.h" #include "utils/primitive_utils.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/optimizer/clean.cc b/mindspore/ccsrc/frontend/optimizer/clean.cc similarity index 99% rename from mindspore/ccsrc/optimizer/clean.cc rename to mindspore/ccsrc/frontend/optimizer/clean.cc index bb52273568..45a271f692 100644 --- a/mindspore/ccsrc/optimizer/clean.cc +++ b/mindspore/ccsrc/frontend/optimizer/clean.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "optimizer/clean.h" +#include "frontend/optimizer/clean.h" #include #include #include @@ -24,7 +24,7 @@ #include #include "./common.h" #include "debug/trace.h" -#include "operator/composite/composite.h" +#include "frontend/operator/composite/composite.h" namespace mindspore { /* namespace to support opt */ diff --git a/mindspore/ccsrc/optimizer/clean.h b/mindspore/ccsrc/frontend/optimizer/clean.h similarity index 97% rename from mindspore/ccsrc/optimizer/clean.h rename to mindspore/ccsrc/frontend/optimizer/clean.h index 672ee78414..54faabaa63 100644 --- a/mindspore/ccsrc/optimizer/clean.h +++ b/mindspore/ccsrc/frontend/optimizer/clean.h @@ -21,7 +21,7 @@ #include #include "ir/anf.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/any.h" #include "ir/manager.h" #include "abstract/dshape.h" diff --git a/mindspore/ccsrc/optimizer/control_depend.cc b/mindspore/ccsrc/frontend/optimizer/control_depend.cc similarity index 98% rename from mindspore/ccsrc/optimizer/control_depend.cc rename to mindspore/ccsrc/frontend/optimizer/control_depend.cc index 0b5c85b1e0..8cc9bdb7f4 100644 --- a/mindspore/ccsrc/optimizer/control_depend.cc +++ b/mindspore/ccsrc/frontend/optimizer/control_depend.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "optimizer/control_depend.h" +#include "frontend/optimizer/control_depend.h" #include #include @@ -22,7 +22,7 @@ #include #include -#include "optimizer/optimizer.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/control_depend.h b/mindspore/ccsrc/frontend/optimizer/control_depend.h similarity index 100% rename from mindspore/ccsrc/optimizer/control_depend.h rename to mindspore/ccsrc/frontend/optimizer/control_depend.h diff --git a/mindspore/ccsrc/optimizer/cse.cc b/mindspore/ccsrc/frontend/optimizer/cse.cc similarity index 99% rename from mindspore/ccsrc/optimizer/cse.cc rename to mindspore/ccsrc/frontend/optimizer/cse.cc index 0b675cca72..4d968d6d74 100644 --- a/mindspore/ccsrc/optimizer/cse.cc +++ b/mindspore/ccsrc/frontend/optimizer/cse.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "optimizer/cse.h" +#include "frontend/optimizer/cse.h" #include #include #include diff --git a/mindspore/ccsrc/optimizer/cse.h b/mindspore/ccsrc/frontend/optimizer/cse.h similarity index 97% rename from mindspore/ccsrc/optimizer/cse.h rename to mindspore/ccsrc/frontend/optimizer/cse.h index 57163cc5c9..140f592715 100644 --- a/mindspore/ccsrc/optimizer/cse.h +++ b/mindspore/ccsrc/frontend/optimizer/cse.h @@ -24,7 +24,7 @@ #include #include "ir/anf.h" #include "ir/manager.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { /* namespace to support opt */ diff --git a/mindspore/ccsrc/optimizer/graph_kernel_reuse.cc b/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.cc similarity index 98% rename from mindspore/ccsrc/optimizer/graph_kernel_reuse.cc rename to mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.cc index dc20ad925e..c157777040 100644 --- a/mindspore/ccsrc/optimizer/graph_kernel_reuse.cc +++ b/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "optimizer/graph_kernel_reuse.h" +#include "frontend/optimizer/graph_kernel_reuse.h" #include #include #include diff --git a/mindspore/ccsrc/optimizer/graph_kernel_reuse.h b/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.h similarity index 93% rename from mindspore/ccsrc/optimizer/graph_kernel_reuse.h rename to mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.h index ed5cc93d18..a79ef3ce6d 100644 --- a/mindspore/ccsrc/optimizer/graph_kernel_reuse.h +++ b/mindspore/ccsrc/frontend/optimizer/graph_kernel_reuse.h @@ -17,12 +17,11 @@ #ifndef MINDSPORE_CCSRC_OPTIMIZER_GRAPH_KERNEL_OP_REUSE_H #define MINDSPORE_CCSRC_OPTIMIZER_GRAPH_KERNEL_OP_REUSE_H -#include #include #include #include - -#include "optimizer/optimizer.h" +#include "mindspore/ccsrc/backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass.cc b/mindspore/ccsrc/frontend/optimizer/irpass.cc similarity index 85% rename from mindspore/ccsrc/optimizer/irpass.cc rename to mindspore/ccsrc/frontend/optimizer/irpass.cc index 166151751f..efc3795a4c 100644 --- a/mindspore/ccsrc/optimizer/irpass.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass.cc @@ -16,33 +16,33 @@ #include -#include "optimizer/irpass.h" -#include "optimizer/irpass/arithmetic_simplify.h" -#include "optimizer/irpass/branch_culling.h" -#include "optimizer/irpass/cast_eliminate.h" -#include "optimizer/irpass/convert.h" -#include "optimizer/irpass/env_item_eliminate.h" -#include "optimizer/irpass/grad_var_prepare.h" -#include "optimizer/irpass/gradient_eliminate.h" -#include "optimizer/irpass/inline.h" -#include "optimizer/irpass/incorporate_call.h" -#include "optimizer/irpass/incorporate_getitem.h" -#include "optimizer/irpass/item_tuple_eliminate.h" -#include "optimizer/irpass/mark_interface_fusion.h" -#include "optimizer/irpass/merge_addn.h" -#include "optimizer/irpass/minmax_grad.h" -#include "optimizer/irpass/param_replace.h" -#include "optimizer/irpass/partial_eliminate.h" -#include "optimizer/irpass/reduce_eliminate.h" -#include "optimizer/irpass/ref_eliminate.h" -#include "optimizer/irpass/reshape_eliminate.h" -#include "optimizer/irpass/special_op_eliminate.h" -#include "optimizer/irpass/specialize_transform.h" -#include "optimizer/irpass/symbol_resolver.h" -#include "optimizer/irpass/tile_eliminate.h" -#include "optimizer/irpass/transpose_eliminate.h" -#include "optimizer/opt.h" -#include "optimizer/irpass/indexed_slices_eliminate.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/irpass/arithmetic_simplify.h" +#include "frontend/optimizer/irpass/branch_culling.h" +#include "frontend/optimizer/irpass/cast_eliminate.h" +#include "frontend/optimizer/irpass/convert.h" +#include "frontend/optimizer/irpass/env_item_eliminate.h" +#include "frontend/optimizer/irpass/grad_var_prepare.h" +#include "frontend/optimizer/irpass/gradient_eliminate.h" +#include "frontend/optimizer/irpass/inline.h" +#include "frontend/optimizer/irpass/incorporate_call.h" +#include "frontend/optimizer/irpass/incorporate_getitem.h" +#include "frontend/optimizer/irpass/item_tuple_eliminate.h" +#include "frontend/optimizer/irpass/mark_interface_fusion.h" +#include "frontend/optimizer/irpass/merge_addn.h" +#include "frontend/optimizer/irpass/minmax_grad.h" +#include "frontend/optimizer/irpass/param_replace.h" +#include "frontend/optimizer/irpass/partial_eliminate.h" +#include "frontend/optimizer/irpass/reduce_eliminate.h" +#include "frontend/optimizer/irpass/ref_eliminate.h" +#include "frontend/optimizer/irpass/reshape_eliminate.h" +#include "frontend/optimizer/irpass/special_op_eliminate.h" +#include "frontend/optimizer/irpass/specialize_transform.h" +#include "frontend/optimizer/irpass/symbol_resolver.h" +#include "frontend/optimizer/irpass/tile_eliminate.h" +#include "frontend/optimizer/irpass/transpose_eliminate.h" +#include "frontend/optimizer/opt.h" +#include "frontend/optimizer/irpass/indexed_slices_eliminate.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass.h b/mindspore/ccsrc/frontend/optimizer/irpass.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass.h rename to mindspore/ccsrc/frontend/optimizer/irpass.h index 782eae6124..4af8c0789d 100644 --- a/mindspore/ccsrc/optimizer/irpass.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass.h @@ -19,8 +19,8 @@ #include -#include "optimizer/optimizer.h" -#include "optimizer/opt.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/opt.h" #include "ir/visitor.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.cc b/mindspore/ccsrc/frontend/optimizer/irpass/arithmetic_simplify.cc similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.cc rename to mindspore/ccsrc/frontend/optimizer/irpass/arithmetic_simplify.cc index b111a6b67a..83f7fae582 100644 --- a/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass/arithmetic_simplify.cc @@ -19,13 +19,13 @@ #include #include -#include "optimizer/irpass/arithmetic_simplify.h" +#include "frontend/optimizer/irpass/arithmetic_simplify.h" #include "ir/optimizer_caller.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/irpass/prim_eliminate.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/irpass/prim_eliminate.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h b/mindspore/ccsrc/frontend/optimizer/irpass/arithmetic_simplify.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h rename to mindspore/ccsrc/frontend/optimizer/irpass/arithmetic_simplify.h index f4bdb0d655..3088231396 100644 --- a/mindspore/ccsrc/optimizer/irpass/arithmetic_simplify.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/arithmetic_simplify.h @@ -23,10 +23,10 @@ #include "ir/optimizer_caller.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/irpass/prim_eliminate.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/irpass/prim_eliminate.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/branch_culling.cc b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc similarity index 99% rename from mindspore/ccsrc/optimizer/irpass/branch_culling.cc rename to mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc index 726f4a28b0..dc580f6b63 100644 --- a/mindspore/ccsrc/optimizer/irpass/branch_culling.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "optimizer/irpass/branch_culling.h" +#include "frontend/optimizer/irpass/branch_culling.h" #include #include @@ -22,7 +22,7 @@ #include "ir/func_graph.h" #include "ir/func_graph_cloner.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/branch_culling.h b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/branch_culling.h rename to mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h index 2b5b30bdbf..b3f3fe4733 100644 --- a/mindspore/ccsrc/optimizer/irpass/branch_culling.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/branch_culling.h @@ -24,8 +24,8 @@ #include "ir/func_graph_cloner.h" #include "ir/optimizer_caller.h" #include "ir/pattern_matcher.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/cast_eliminate.cc b/mindspore/ccsrc/frontend/optimizer/irpass/cast_eliminate.cc similarity index 90% rename from mindspore/ccsrc/optimizer/irpass/cast_eliminate.cc rename to mindspore/ccsrc/frontend/optimizer/irpass/cast_eliminate.cc index a497f3d5bd..ddb84806e1 100644 --- a/mindspore/ccsrc/optimizer/irpass/cast_eliminate.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass/cast_eliminate.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "optimizer/irpass/cast_eliminate.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass/cast_eliminate.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/func_graph.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/parse/python_adapter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/cast_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/cast_eliminate.h similarity index 96% rename from mindspore/ccsrc/optimizer/irpass/cast_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/cast_eliminate.h index d98d0b677b..d5222d4310 100644 --- a/mindspore/ccsrc/optimizer/irpass/cast_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/cast_eliminate.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_OPTIMIZER_IRPASS_CAST_ELIMINATE_H_ #include "ir/visitor.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/convert.h b/mindspore/ccsrc/frontend/optimizer/irpass/convert.h similarity index 94% rename from mindspore/ccsrc/optimizer/irpass/convert.h rename to mindspore/ccsrc/frontend/optimizer/irpass/convert.h index 3049bafb1e..d887874203 100644 --- a/mindspore/ccsrc/optimizer/irpass/convert.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/convert.h @@ -19,11 +19,11 @@ #include -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" #include "ir/func_graph.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/env_item_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h similarity index 99% rename from mindspore/ccsrc/optimizer/irpass/env_item_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h index 3f100dcaec..14fd8743ff 100644 --- a/mindspore/ccsrc/optimizer/irpass/env_item_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/env_item_eliminate.h @@ -27,9 +27,9 @@ #include "ir/func_graph_cloner.h" #include "ir/optimizer_caller.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "utils/symbolic.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/irpass/grad_var_prepare.cc b/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc similarity index 95% rename from mindspore/ccsrc/optimizer/irpass/grad_var_prepare.cc rename to mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc index 317d67e792..44c1b62fa5 100644 --- a/mindspore/ccsrc/optimizer/irpass/grad_var_prepare.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "optimizer/irpass/grad_var_prepare.h" +#include "frontend/optimizer/irpass/grad_var_prepare.h" #include #include #include #include -#include "operator/composite/composite.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/composite/composite.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" #include "ir/func_graph.h" #include "ir/func_graph_cloner.h" diff --git a/mindspore/ccsrc/optimizer/irpass/grad_var_prepare.h b/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h similarity index 90% rename from mindspore/ccsrc/optimizer/irpass/grad_var_prepare.h rename to mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h index 9713017d12..f6992a87c6 100644 --- a/mindspore/ccsrc/optimizer/irpass/grad_var_prepare.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/grad_var_prepare.h @@ -22,10 +22,10 @@ #include #include -#include "operator/composite/composite.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/composite/composite.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" #include "ir/func_graph.h" #include "ir/func_graph_cloner.h" diff --git a/mindspore/ccsrc/optimizer/irpass/gradient_eliminate.cc b/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.cc similarity index 97% rename from mindspore/ccsrc/optimizer/irpass/gradient_eliminate.cc rename to mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.cc index 3347fa9dc0..0d98cffa37 100644 --- a/mindspore/ccsrc/optimizer/irpass/gradient_eliminate.cc +++ b/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "optimizer/irpass/gradient_eliminate.h" +#include "frontend/optimizer/irpass/gradient_eliminate.h" #include diff --git a/mindspore/ccsrc/optimizer/irpass/gradient_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h similarity index 91% rename from mindspore/ccsrc/optimizer/irpass/gradient_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h index 671d9bde49..82312d9e37 100644 --- a/mindspore/ccsrc/optimizer/irpass/gradient_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h @@ -21,12 +21,12 @@ #include #include -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" #include "common/utils.h" -#include "operator/ops.h" -#include "optimizer/ad/grad.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/ad/grad.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/incorporate_call.h b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h similarity index 97% rename from mindspore/ccsrc/optimizer/irpass/incorporate_call.h rename to mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h index 5842b7bfd6..2f6404458f 100644 --- a/mindspore/ccsrc/optimizer/irpass/incorporate_call.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_call.h @@ -22,12 +22,12 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" #include "ir/func_graph.h" #include "ir/func_graph_cloner.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h similarity index 99% rename from mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h rename to mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h index b6c8fb0e18..828e205e4f 100644 --- a/mindspore/ccsrc/optimizer/irpass/incorporate_getitem.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/incorporate_getitem.h @@ -27,9 +27,9 @@ #include "ir/func_graph_cloner.h" #include "ir/optimizer_caller.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/indexed_slices_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/indexed_slices_eliminate.h similarity index 94% rename from mindspore/ccsrc/optimizer/irpass/indexed_slices_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/indexed_slices_eliminate.h index 630d567549..dfe345fe01 100644 --- a/mindspore/ccsrc/optimizer/irpass/indexed_slices_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/indexed_slices_eliminate.h @@ -20,10 +20,10 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/inline.h b/mindspore/ccsrc/frontend/optimizer/irpass/inline.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/inline.h rename to mindspore/ccsrc/frontend/optimizer/irpass/inline.h index 4b48d604d9..8cafb268b4 100644 --- a/mindspore/ccsrc/optimizer/irpass/inline.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/inline.h @@ -21,12 +21,12 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" #include "ir/func_graph.h" #include "ir/func_graph_cloner.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/item_tuple_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/item_tuple_eliminate.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/item_tuple_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/item_tuple_eliminate.h index 202951a254..acd6844ee7 100644 --- a/mindspore/ccsrc/optimizer/irpass/item_tuple_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/item_tuple_eliminate.h @@ -23,9 +23,9 @@ #include "ir/optimizer_caller.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/mark_interface_fusion.h b/mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h similarity index 92% rename from mindspore/ccsrc/optimizer/irpass/mark_interface_fusion.h rename to mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h index 6f2bcc187f..8d3839bd9e 100644 --- a/mindspore/ccsrc/optimizer/irpass/mark_interface_fusion.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/mark_interface_fusion.h @@ -21,13 +21,13 @@ #include #include -#include "session/anf_runtime_algorithm.h" -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/graph_utils.h" -#include "operator/composite/composite.h" +#include "frontend/operator/composite/composite.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/merge_addn.h b/mindspore/ccsrc/frontend/optimizer/irpass/merge_addn.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/merge_addn.h rename to mindspore/ccsrc/frontend/optimizer/irpass/merge_addn.h index e1e4b8878b..a3cf6e2231 100644 --- a/mindspore/ccsrc/optimizer/irpass/merge_addn.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/merge_addn.h @@ -21,10 +21,10 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/minmax_grad.h b/mindspore/ccsrc/frontend/optimizer/irpass/minmax_grad.h similarity index 96% rename from mindspore/ccsrc/optimizer/irpass/minmax_grad.h rename to mindspore/ccsrc/frontend/optimizer/irpass/minmax_grad.h index a426a9fb9b..658a287234 100644 --- a/mindspore/ccsrc/optimizer/irpass/minmax_grad.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/minmax_grad.h @@ -20,10 +20,10 @@ #include #include -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/param_replace.h b/mindspore/ccsrc/frontend/optimizer/irpass/param_replace.h similarity index 92% rename from mindspore/ccsrc/optimizer/irpass/param_replace.h rename to mindspore/ccsrc/frontend/optimizer/irpass/param_replace.h index c0c4c832d7..999376e528 100644 --- a/mindspore/ccsrc/optimizer/irpass/param_replace.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/param_replace.h @@ -19,11 +19,11 @@ #include -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "pipeline/parse/parse.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/parse/parse.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/partial_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/partial_eliminate.h similarity index 95% rename from mindspore/ccsrc/optimizer/irpass/partial_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/partial_eliminate.h index bc8ef9d8f3..32fc5abc7d 100644 --- a/mindspore/ccsrc/optimizer/irpass/partial_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/partial_eliminate.h @@ -21,10 +21,10 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/prim_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/prim_eliminate.h similarity index 94% rename from mindspore/ccsrc/optimizer/irpass/prim_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/prim_eliminate.h index 725c30a6b9..d8c96825c9 100644 --- a/mindspore/ccsrc/optimizer/irpass/prim_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/prim_eliminate.h @@ -17,8 +17,8 @@ #ifndef MINDSPORE_CCSRC_OPTIMIZER_IRPASS_PRIM_ELIMINATE_H_ #define MINDSPORE_CCSRC_OPTIMIZER_IRPASS_PRIM_ELIMINATE_H_ -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/reduce_eliminate.h similarity index 97% rename from mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/reduce_eliminate.h index cea002111c..78b7d3f4f1 100644 --- a/mindspore/ccsrc/optimizer/irpass/reduce_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/reduce_eliminate.h @@ -21,10 +21,10 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "abstract/dshape.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/irpass/ref_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/ref_eliminate.h similarity index 97% rename from mindspore/ccsrc/optimizer/irpass/ref_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/ref_eliminate.h index 6d81b401c3..86eb4e761d 100644 --- a/mindspore/ccsrc/optimizer/irpass/ref_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/ref_eliminate.h @@ -20,8 +20,8 @@ #include #include "ir/pattern_matcher.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/reshape_eliminate.h similarity index 97% rename from mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/reshape_eliminate.h index e10ff5c678..27d4bdad3d 100644 --- a/mindspore/ccsrc/optimizer/irpass/reshape_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/reshape_eliminate.h @@ -22,9 +22,9 @@ #include "ir/func_graph.h" #include "ir/optimizer_caller.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "abstract/dshape.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/irpass/special_op_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/special_op_eliminate.h similarity index 97% rename from mindspore/ccsrc/optimizer/irpass/special_op_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/special_op_eliminate.h index b6a4e1c852..01efa85e8d 100644 --- a/mindspore/ccsrc/optimizer/irpass/special_op_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/special_op_eliminate.h @@ -25,10 +25,10 @@ #include "ir/optimizer_caller.h" #include "ir/pattern_matcher.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "optimizer/irpass/prim_eliminate.h" -#include "optimizer/optimizer.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/irpass/prim_eliminate.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/specialize_transform.h b/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h similarity index 98% rename from mindspore/ccsrc/optimizer/irpass/specialize_transform.h rename to mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h index 3db9e7bd51..d8a15f6d83 100644 --- a/mindspore/ccsrc/optimizer/irpass/specialize_transform.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/specialize_transform.h @@ -24,13 +24,13 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" #include "ir/manager.h" #include "ir/func_graph.h" #include "ir/func_graph_cloner.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/symbol_resolver.h b/mindspore/ccsrc/frontend/optimizer/irpass/symbol_resolver.h similarity index 92% rename from mindspore/ccsrc/optimizer/irpass/symbol_resolver.h rename to mindspore/ccsrc/frontend/optimizer/irpass/symbol_resolver.h index 7b35cf5451..de9e533550 100644 --- a/mindspore/ccsrc/optimizer/irpass/symbol_resolver.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/symbol_resolver.h @@ -20,12 +20,12 @@ #include #include -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/parse/python_adapter.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/parse/python_adapter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/tile_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/tile_eliminate.h similarity index 94% rename from mindspore/ccsrc/optimizer/irpass/tile_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/tile_eliminate.h index 86ac5bab73..f561e04c10 100644 --- a/mindspore/ccsrc/optimizer/irpass/tile_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/tile_eliminate.h @@ -20,10 +20,10 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/irpass/transpose_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/transpose_eliminate.h similarity index 94% rename from mindspore/ccsrc/optimizer/irpass/transpose_eliminate.h rename to mindspore/ccsrc/frontend/optimizer/irpass/transpose_eliminate.h index de196ea619..70b8898462 100644 --- a/mindspore/ccsrc/optimizer/irpass/transpose_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/transpose_eliminate.h @@ -20,10 +20,10 @@ #include #include -#include "optimizer/irpass.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/optimizer.h" #include "ir/visitor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/opt.cc b/mindspore/ccsrc/frontend/optimizer/opt.cc similarity index 98% rename from mindspore/ccsrc/optimizer/opt.cc rename to mindspore/ccsrc/frontend/optimizer/opt.cc index 5e893cf1aa..44917106fa 100644 --- a/mindspore/ccsrc/optimizer/opt.cc +++ b/mindspore/ccsrc/frontend/optimizer/opt.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "optimizer/opt.h" +#include "frontend/optimizer/opt.h" #include #include @@ -24,7 +24,7 @@ #include "ir/anf.h" #include "ir/manager.h" -#include "optimizer/optimizer.h" +#include "frontend/optimizer/optimizer.h" #include "utils/log_adapter.h" #include "utils/ordered_set.h" diff --git a/mindspore/ccsrc/optimizer/opt.h b/mindspore/ccsrc/frontend/optimizer/opt.h similarity index 98% rename from mindspore/ccsrc/optimizer/opt.h rename to mindspore/ccsrc/frontend/optimizer/opt.h index 6601d969d2..f440cc71dc 100644 --- a/mindspore/ccsrc/optimizer/opt.h +++ b/mindspore/ccsrc/frontend/optimizer/opt.h @@ -24,7 +24,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/optimizer_caller.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { /* namespace to support opt */ diff --git a/mindspore/ccsrc/optimizer/optimizer.h b/mindspore/ccsrc/frontend/optimizer/optimizer.h similarity index 98% rename from mindspore/ccsrc/optimizer/optimizer.h rename to mindspore/ccsrc/frontend/optimizer/optimizer.h index a98a59caf2..a1f11e74d0 100644 --- a/mindspore/ccsrc/optimizer/optimizer.h +++ b/mindspore/ccsrc/frontend/optimizer/optimizer.h @@ -31,9 +31,9 @@ #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" #include "debug/trace.h" -#include "optimizer/opt.h" -#include "pipeline/resource.h" -#include "pipeline/action.h" +#include "frontend/optimizer/opt.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/action.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/optimizer/pass_group.cc b/mindspore/ccsrc/frontend/optimizer/pass_group.cc similarity index 97% rename from mindspore/ccsrc/optimizer/pass_group.cc rename to mindspore/ccsrc/frontend/optimizer/pass_group.cc index 2d1ab07f7d..3619396215 100644 --- a/mindspore/ccsrc/optimizer/pass_group.cc +++ b/mindspore/ccsrc/frontend/optimizer/pass_group.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "optimizer/pass_group.h" +#include "frontend/optimizer/pass_group.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/pass_group.h b/mindspore/ccsrc/frontend/optimizer/pass_group.h similarity index 98% rename from mindspore/ccsrc/optimizer/pass_group.h rename to mindspore/ccsrc/frontend/optimizer/pass_group.h index 895f5a4128..08fa8018d6 100644 --- a/mindspore/ccsrc/optimizer/pass_group.h +++ b/mindspore/ccsrc/frontend/optimizer/pass_group.h @@ -21,7 +21,7 @@ #include #include -#include "optimizer/py_pass.h" +#include "frontend/optimizer/py_pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/py_pass.cc b/mindspore/ccsrc/frontend/optimizer/py_pass.cc similarity index 98% rename from mindspore/ccsrc/optimizer/py_pass.cc rename to mindspore/ccsrc/frontend/optimizer/py_pass.cc index 842ccb75b9..c1bf40fcbb 100644 --- a/mindspore/ccsrc/optimizer/py_pass.cc +++ b/mindspore/ccsrc/frontend/optimizer/py_pass.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "optimizer/py_pass.h" +#include "frontend/optimizer/py_pass.h" #include #include #include @@ -22,8 +22,8 @@ #include "ir/func_graph.h" #include "ir/manager.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/resource.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/resource.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/py_pass.h b/mindspore/ccsrc/frontend/optimizer/py_pass.h similarity index 100% rename from mindspore/ccsrc/optimizer/py_pass.h rename to mindspore/ccsrc/frontend/optimizer/py_pass.h diff --git a/mindspore/ccsrc/optimizer/py_pass_manager.cc b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.cc similarity index 96% rename from mindspore/ccsrc/optimizer/py_pass_manager.cc rename to mindspore/ccsrc/frontend/optimizer/py_pass_manager.cc index 1c36e93c9a..86d7067d1c 100644 --- a/mindspore/ccsrc/optimizer/py_pass_manager.cc +++ b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "optimizer/py_pass_manager.h" +#include "frontend/optimizer/py_pass_manager.h" #include #include @@ -21,7 +21,7 @@ #include #include "ir/manager.h" -#include "optimizer/pass_group.h" +#include "frontend/optimizer/pass_group.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/optimizer/py_pass_manager.h b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h similarity index 94% rename from mindspore/ccsrc/optimizer/py_pass_manager.h rename to mindspore/ccsrc/frontend/optimizer/py_pass_manager.h index f7218d5ab2..84868862a7 100644 --- a/mindspore/ccsrc/optimizer/py_pass_manager.h +++ b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h @@ -27,9 +27,9 @@ #include "utils/graph_utils.h" #include "common/utils.h" -#include "pipeline/parse/resolve.h" -#include "optimizer/py_pass.h" -#include "optimizer/pass_group.h" +#include "pipeline/jit/parse/resolve.h" +#include "frontend/optimizer/py_pass.h" +#include "frontend/optimizer/pass_group.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/parallel/CMakeLists.txt b/mindspore/ccsrc/frontend/parallel/CMakeLists.txt similarity index 86% rename from mindspore/ccsrc/parallel/CMakeLists.txt rename to mindspore/ccsrc/frontend/parallel/CMakeLists.txt index 76ac2cfcd7..d2a099cf41 100644 --- a/mindspore/ccsrc/parallel/CMakeLists.txt +++ b/mindspore/ccsrc/frontend/parallel/CMakeLists.txt @@ -5,4 +5,4 @@ if (ENABLE_DUMP_PROTO) endif () set_property(SOURCE ${_PARALLEL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PARALLEL) -add_library(_mindspore_parallel_obj OBJECT ${_PARALLEL_SRC_FILES}) +add_library(_mindspore_frontend_parallel_obj OBJECT ${_PARALLEL_SRC_FILES}) diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_fusion.cc similarity index 98% rename from mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_fusion.cc index 30173e533c..70ae5a7d20 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.cc +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_fusion.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "parallel/allreduce_fusion/allreduce_fusion.h" +#include "frontend/parallel/allreduce_fusion/allreduce_fusion.h" #include #include #include #include #include "ir/func_graph.h" -#include "parallel/costmodel_context.h" -#include "parallel/graph_util/node_info.h" -#include "parallel/status.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/costmodel_context.h" +#include "frontend/parallel/graph_util/node_info.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/step_parallel.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_fusion.h similarity index 96% rename from mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_fusion.h index 43a9935095..7383c477a6 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_fusion.h +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_fusion.h @@ -20,8 +20,8 @@ #include #include #include "ir/anf.h" -#include "parallel/allreduce_fusion/allreduce_graph.h" -#include "parallel/status.h" +#include "frontend/parallel/allreduce_fusion/allreduce_graph.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_graph.cc similarity index 98% rename from mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_graph.cc index 2a98a38add..ca47b0fa97 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.cc +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_graph.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "parallel/allreduce_fusion/allreduce_graph.h" +#include "frontend/parallel/allreduce_fusion/allreduce_graph.h" #include #include #include "ir/anf.h" -#include "parallel/allreduce_fusion/allreduce_node.h" +#include "frontend/parallel/allreduce_fusion/allreduce_node.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_graph.h similarity index 97% rename from mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_graph.h index b2084b735c..a47039f070 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_graph.h +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_graph.h @@ -24,8 +24,8 @@ #include #include #include "ir/anf.h" -#include "parallel/allreduce_fusion/allreduce_node.h" -#include "parallel/status.h" +#include "frontend/parallel/allreduce_fusion/allreduce_node.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.cc b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_node.cc similarity index 96% rename from mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.cc rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_node.cc index 113d4ec59b..1c478887df 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.cc +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_node.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "parallel/allreduce_fusion/allreduce_node.h" +#include "frontend/parallel/allreduce_fusion/allreduce_node.h" #include -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_node.h similarity index 98% rename from mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_node.h index db1c4e3f2e..6538381f27 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/allreduce_node.h +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/allreduce_node.h @@ -22,7 +22,7 @@ #include #include #include "ir/anf.h" -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/step_allreduce_fusion.cc similarity index 90% rename from mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/step_allreduce_fusion.cc index 999c4a85a9..b669fa7782 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.cc +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/step_allreduce_fusion.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "parallel/allreduce_fusion/step_allreduce_fusion.h" +#include "frontend/parallel/allreduce_fusion/step_allreduce_fusion.h" #include #include -#include "optimizer/optimizer.h" -#include "parallel/allreduce_fusion/allreduce_fusion.h" -#include "parallel/context.h" -#include "parallel/graph_util/graph_info.h" -#include "parallel/status.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/parallel/allreduce_fusion/allreduce_fusion.h" +#include "frontend/parallel/context.h" +#include "frontend/parallel/graph_util/graph_info.h" +#include "frontend/parallel/status.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.h b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/step_allreduce_fusion.h similarity index 96% rename from mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.h rename to mindspore/ccsrc/frontend/parallel/allreduce_fusion/step_allreduce_fusion.h index 2343a7a2fe..2612e71984 100644 --- a/mindspore/ccsrc/parallel/allreduce_fusion/step_allreduce_fusion.h +++ b/mindspore/ccsrc/frontend/parallel/allreduce_fusion/step_allreduce_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_PARALLEL_ALLREDUCE_FUSION_STEP_ALLREDUCE_FUSION_H_ #define MINDSPORE_CCSRC_PARALLEL_ALLREDUCE_FUSION_STEP_ALLREDUCE_FUSION_H_ -#include "optimizer/optimizer.h" +#include "frontend/optimizer/optimizer.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/costmodel.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/costmodel.cc similarity index 97% rename from mindspore/ccsrc/parallel/auto_parallel/costmodel.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/costmodel.cc index 65e9acf714..531a5cd7f6 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/costmodel.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/costmodel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/auto_parallel/costmodel.h" #include #include #include -#include "parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/costmodel.h similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/costmodel.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/costmodel.h index 8b92e18cd8..cc4508681b 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/costmodel.h @@ -22,8 +22,8 @@ #include #include #include -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_info.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/dp_algo_costmodel.cc similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/dp_algo_costmodel.cc index 72451fab57..9408596111 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/dp_algo_costmodel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/auto_parallel/dp_algo_costmodel.h" +#include "frontend/parallel/auto_parallel/dp_algo_costmodel.h" #include #include diff --git a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/dp_algo_costmodel.h similarity index 98% rename from mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/dp_algo_costmodel.h index e3fbfba5a7..812f375f0b 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/dp_algo_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/dp_algo_costmodel.h @@ -21,8 +21,8 @@ #include #include #include "ir/value.h" -#include "parallel/auto_parallel/edge_costmodel.h" -#include "parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.cc similarity index 98% rename from mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.cc index 60256a3ae3..e3f1de7207 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" #include #include #include #include -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h similarity index 97% rename from mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h index 2a5ed3b2a4..3fffd1b86d 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/edge_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h @@ -23,10 +23,10 @@ #include #include #include "common/utils.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/tensor_layout/tensor_info.h" -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/tensor_layout/tensor_info.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.cc similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.cc index d5523aaa62..1c1fc3a700 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.cc @@ -21,9 +21,9 @@ #include #include -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/ops_info/reshape_info.h" -#include "parallel/step_auto_parallel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/ops_info/reshape_info.h" +#include "frontend/parallel/step_auto_parallel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h similarity index 97% rename from mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h index 3b8b389d81..87f13e3383 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/graph_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h @@ -22,12 +22,12 @@ #include #include #include -#include "../../common.h" +#include "mindspore/ccsrc/common.h" #include "common/utils.h" -#include "parallel/auto_parallel/edge_costmodel.h" -#include "parallel/costmodel_context.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/ops_info/tmp_identity_info.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/costmodel_context.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/ops_info/tmp_identity_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/operator_costmodel.cc similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/operator_costmodel.cc index 8ebfdb7d13..aaf3fdff3c 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/operator_costmodel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" #include #include -#include "parallel/device_matrix.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/operator_costmodel.h similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/operator_costmodel.h index a08a4dbb13..dda597bd1f 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/operator_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/operator_costmodel.h @@ -19,8 +19,8 @@ #include #include -#include "parallel/device_manager.h" -#include "parallel/tensor_layout/tensor_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/tensor_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_cost.cc similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_cost.cc index 9fb79ceee4..0a7e6c59d4 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_cost.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/auto_parallel/rec_core/rec_cost.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_cost.h" #include #include diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_cost.h similarity index 98% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_cost.h index fb4fc27164..563bf4598a 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_cost.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_cost.h @@ -23,8 +23,8 @@ #include #include -#include "parallel/auto_parallel/rec_core/rec_graph.h" -#include "parallel/auto_parallel/rec_core/rec_strategy.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.cc similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.cc index 828523fed1..68b776155a 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "parallel/auto_parallel/rec_core/rec_generate_strategy.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.h" #include #include #include #include "ir/value.h" -#include "parallel/auto_parallel/rec_core/rec_parse_graph.h" -#include "parallel/auto_parallel/rec_core/rec_partition.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_parse_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_partition.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.h similarity index 98% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.h index e82efe6798..9acd05e0a9 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_generate_strategy.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.h @@ -22,8 +22,8 @@ #include #include -#include "parallel/auto_parallel/rec_core/rec_graph.h" -#include "parallel/ops_info/operator_info.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_graph.h" +#include "frontend/parallel/ops_info/operator_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_graph.h similarity index 94% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_graph.h index 9007218d15..15b8220016 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_graph.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_graph.h @@ -21,8 +21,8 @@ #include #include -#include "parallel/auto_parallel/rec_core/rec_strategy.h" -#include "parallel/auto_parallel/rec_core/rec_tensor.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_strategy.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_tensor.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_parse_graph.cc similarity index 95% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_parse_graph.cc index 0e6a3411e3..a393c825df 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_parse_graph.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/auto_parallel/rec_core/rec_parse_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_parse_graph.h" #include #include @@ -22,9 +22,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/rec_core/rec_graph.h" -#include "parallel/auto_parallel/rec_core/rec_tensor.h" -#include "parallel/ops_info/operator_info.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_tensor.h" +#include "frontend/parallel/ops_info/operator_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_parse_graph.h similarity index 98% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_parse_graph.h index 6112579d51..4d0c02f5fe 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_parse_graph.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_parse_graph.h @@ -24,8 +24,8 @@ #include #include -#include "parallel/auto_parallel/rec_core/rec_graph.h" -#include "parallel/ops_info/operator_info.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_graph.h" +#include "frontend/parallel/ops_info/operator_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.cc similarity index 99% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.cc index d5200f54d8..97d230a49f 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.cc +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/auto_parallel/rec_core/rec_partition.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_partition.h" #include #include @@ -25,7 +25,7 @@ #include #include "ir/anf.h" -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.h similarity index 87% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.h index c98f3317f8..528163e4d3 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_partition.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.h @@ -25,10 +25,10 @@ #include #include -#include "parallel/auto_parallel/rec_core/rec_cost.h" -#include "parallel/auto_parallel/rec_core/rec_graph.h" -#include "parallel/auto_parallel/rec_core/rec_strategy.h" -#include "parallel/status.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_cost.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_strategy.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_strategy.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_strategy.h similarity index 100% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_strategy.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_strategy.h diff --git a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_tensor.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_tensor.h similarity index 94% rename from mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_tensor.h rename to mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_tensor.h index 51ffca4023..315c52c867 100644 --- a/mindspore/ccsrc/parallel/auto_parallel/rec_core/rec_tensor.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_tensor.h @@ -17,7 +17,7 @@ #ifndef PARALLEL_AUTO_PARALLEL_REC_TENSOR_H_ #define PARALLEL_AUTO_PARALLEL_REC_TENSOR_H_ -#include "parallel/auto_parallel/rec_core/rec_strategy.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/context.cc b/mindspore/ccsrc/frontend/parallel/context.cc similarity index 98% rename from mindspore/ccsrc/parallel/context.cc rename to mindspore/ccsrc/frontend/parallel/context.cc index 062d814aa0..7164660be0 100644 --- a/mindspore/ccsrc/parallel/context.cc +++ b/mindspore/ccsrc/frontend/parallel/context.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/context.h" +#include "frontend/parallel/context.h" #include #include @@ -25,7 +25,7 @@ #include #include "common/utils.h" -#include "parallel/device_manager.h" +#include "frontend/parallel/device_manager.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/context.h b/mindspore/ccsrc/frontend/parallel/context.h similarity index 98% rename from mindspore/ccsrc/parallel/context.h rename to mindspore/ccsrc/frontend/parallel/context.h index 76166f50cf..1bb40d5c29 100644 --- a/mindspore/ccsrc/parallel/context.h +++ b/mindspore/ccsrc/frontend/parallel/context.h @@ -23,8 +23,8 @@ #include #include -#include "parallel/ops_info/ops_utils.h" -#include "parallel/status.h" +#include "frontend/parallel/ops_info/ops_utils.h" +#include "frontend/parallel/status.h" #include "utils/convert_utils.h" #include "ir/anf.h" #include "ir/func_graph.h" diff --git a/mindspore/ccsrc/parallel/costmodel_context.cc b/mindspore/ccsrc/frontend/parallel/costmodel_context.cc similarity index 96% rename from mindspore/ccsrc/parallel/costmodel_context.cc rename to mindspore/ccsrc/frontend/parallel/costmodel_context.cc index 92aff29557..67d087eabd 100644 --- a/mindspore/ccsrc/parallel/costmodel_context.cc +++ b/mindspore/ccsrc/frontend/parallel/costmodel_context.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "parallel/costmodel_context.h" +#include "frontend/parallel/costmodel_context.h" #include -#include "parallel/allreduce_fusion/allreduce_fusion.h" -#include "parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/allreduce_fusion/allreduce_fusion.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/costmodel_context.h b/mindspore/ccsrc/frontend/parallel/costmodel_context.h similarity index 100% rename from mindspore/ccsrc/parallel/costmodel_context.h rename to mindspore/ccsrc/frontend/parallel/costmodel_context.h diff --git a/mindspore/ccsrc/parallel/device.h b/mindspore/ccsrc/frontend/parallel/device.h similarity index 97% rename from mindspore/ccsrc/parallel/device.h rename to mindspore/ccsrc/frontend/parallel/device.h index 8c3174ae55..c9633623d2 100644 --- a/mindspore/ccsrc/parallel/device.h +++ b/mindspore/ccsrc/frontend/parallel/device.h @@ -21,7 +21,7 @@ #include #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/device_manager.cc b/mindspore/ccsrc/frontend/parallel/device_manager.cc similarity index 99% rename from mindspore/ccsrc/parallel/device_manager.cc rename to mindspore/ccsrc/frontend/parallel/device_manager.cc index 45628bec65..d3657afdb8 100644 --- a/mindspore/ccsrc/parallel/device_manager.cc +++ b/mindspore/ccsrc/frontend/parallel/device_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/device_manager.h" +#include "frontend/parallel/device_manager.h" #include #include @@ -23,7 +23,7 @@ #include #include -#include "parallel/step_parallel.h" +#include "frontend/parallel/step_parallel.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/device_manager.h b/mindspore/ccsrc/frontend/parallel/device_manager.h similarity index 95% rename from mindspore/ccsrc/parallel/device_manager.h rename to mindspore/ccsrc/frontend/parallel/device_manager.h index 3afafe6a9c..654acd9dff 100644 --- a/mindspore/ccsrc/parallel/device_manager.h +++ b/mindspore/ccsrc/frontend/parallel/device_manager.h @@ -26,11 +26,11 @@ #include #include "common/utils.h" -#include "parallel/device.h" -#include "parallel/device_matrix.h" -#include "parallel/group_manager.h" -#include "parallel/status.h" -#include "parallel/strategy.h" +#include "frontend/parallel/device.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/group_manager.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/strategy.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/device_matrix.cc b/mindspore/ccsrc/frontend/parallel/device_matrix.cc similarity index 97% rename from mindspore/ccsrc/parallel/device_matrix.cc rename to mindspore/ccsrc/frontend/parallel/device_matrix.cc index 3c9467a223..9cc85d9701 100644 --- a/mindspore/ccsrc/parallel/device_matrix.cc +++ b/mindspore/ccsrc/frontend/parallel/device_matrix.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/device_matrix.h" +#include "frontend/parallel/device_matrix.h" #include #include @@ -23,8 +23,8 @@ #include #include -#include "parallel/ops_info/operator_info.h" -#include "parallel/status.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/status.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/device_matrix.h b/mindspore/ccsrc/frontend/parallel/device_matrix.h similarity index 97% rename from mindspore/ccsrc/parallel/device_matrix.h rename to mindspore/ccsrc/frontend/parallel/device_matrix.h index 295bf33836..f1e7acec39 100644 --- a/mindspore/ccsrc/parallel/device_matrix.h +++ b/mindspore/ccsrc/frontend/parallel/device_matrix.h @@ -21,7 +21,7 @@ #include #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/dynamic_creator.h b/mindspore/ccsrc/frontend/parallel/dynamic_creator.h similarity index 97% rename from mindspore/ccsrc/parallel/dynamic_creator.h rename to mindspore/ccsrc/frontend/parallel/dynamic_creator.h index 352c7449a5..3ba40fade9 100644 --- a/mindspore/ccsrc/parallel/dynamic_creator.h +++ b/mindspore/ccsrc/frontend/parallel/dynamic_creator.h @@ -22,8 +22,8 @@ #include #include -#include "parallel/ops_info/ops_info_head_files.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/ops_info/ops_info_head_files.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/graph_util/generate_graph.cc b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc similarity index 99% rename from mindspore/ccsrc/parallel/graph_util/generate_graph.cc rename to mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc index 7bd2fa808d..30c25e5f26 100644 --- a/mindspore/ccsrc/parallel/graph_util/generate_graph.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/graph_util/generate_graph.h" +#include "frontend/parallel/graph_util/generate_graph.h" #include #include diff --git a/mindspore/ccsrc/parallel/graph_util/generate_graph.h b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h similarity index 93% rename from mindspore/ccsrc/parallel/graph_util/generate_graph.h rename to mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h index 71227a6e7b..b3ef54a22e 100644 --- a/mindspore/ccsrc/parallel/graph_util/generate_graph.h +++ b/mindspore/ccsrc/frontend/parallel/graph_util/generate_graph.h @@ -25,9 +25,9 @@ #include #include "./common.h" -#include "optimizer/opt.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/optimizer/opt.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc b/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc similarity index 92% rename from mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc rename to mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc index 32cd106d8e..21298697f4 100644 --- a/mindspore/ccsrc/parallel/graph_util/get_parallel_info.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/graph_util/get_parallel_info.h" +#include "frontend/parallel/graph_util/get_parallel_info.h" #include #include @@ -23,10 +23,10 @@ #include "common/utils.h" #include "ir/func_graph.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/graph_util/graph_info.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/graph_util/graph_info.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/graph_util/get_parallel_info.h b/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.h similarity index 100% rename from mindspore/ccsrc/parallel/graph_util/get_parallel_info.h rename to mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.h diff --git a/mindspore/ccsrc/parallel/graph_util/graph_info.cc b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/graph_util/graph_info.cc rename to mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc index 175413c0fd..45a88c3a23 100644 --- a/mindspore/ccsrc/parallel/graph_util/graph_info.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/graph_util/graph_info.h" +#include "frontend/parallel/graph_util/graph_info.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" #include "debug/draw.h" diff --git a/mindspore/ccsrc/parallel/graph_util/graph_info.h b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.h similarity index 100% rename from mindspore/ccsrc/parallel/graph_util/graph_info.h rename to mindspore/ccsrc/frontend/parallel/graph_util/graph_info.h diff --git a/mindspore/ccsrc/parallel/graph_util/node_info.cc b/mindspore/ccsrc/frontend/parallel/graph_util/node_info.cc similarity index 92% rename from mindspore/ccsrc/parallel/graph_util/node_info.cc rename to mindspore/ccsrc/frontend/parallel/graph_util/node_info.cc index 1bc62f8807..e50df2818b 100644 --- a/mindspore/ccsrc/parallel/graph_util/node_info.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/node_info.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "parallel/graph_util/node_info.h" +#include "frontend/parallel/graph_util/node_info.h" #include #include "ir/anf.h" #include "ir/param_value.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/python_adapter.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/graph_util/node_info.h b/mindspore/ccsrc/frontend/parallel/graph_util/node_info.h similarity index 100% rename from mindspore/ccsrc/parallel/graph_util/node_info.h rename to mindspore/ccsrc/frontend/parallel/graph_util/node_info.h diff --git a/mindspore/ccsrc/parallel/group_manager.cc b/mindspore/ccsrc/frontend/parallel/group_manager.cc similarity index 97% rename from mindspore/ccsrc/parallel/group_manager.cc rename to mindspore/ccsrc/frontend/parallel/group_manager.cc index 1562cbc140..8929af7b0b 100644 --- a/mindspore/ccsrc/parallel/group_manager.cc +++ b/mindspore/ccsrc/frontend/parallel/group_manager.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "parallel/group_manager.h" +#include "frontend/parallel/group_manager.h" #include #include -#include "parallel/device_manager.h" -#include "parallel/ops_info/ops_utils.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/ops_info/ops_utils.h" #include "utils/comm_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/group_manager.h b/mindspore/ccsrc/frontend/parallel/group_manager.h similarity index 96% rename from mindspore/ccsrc/parallel/group_manager.h rename to mindspore/ccsrc/frontend/parallel/group_manager.h index f763d483cc..b9cf9663b0 100644 --- a/mindspore/ccsrc/parallel/group_manager.h +++ b/mindspore/ccsrc/frontend/parallel/group_manager.h @@ -22,8 +22,8 @@ #include #include -#include "parallel/device.h" -#include "parallel/status.h" +#include "frontend/parallel/device.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/node_check.cc b/mindspore/ccsrc/frontend/parallel/node_check.cc similarity index 97% rename from mindspore/ccsrc/parallel/node_check.cc rename to mindspore/ccsrc/frontend/parallel/node_check.cc index 6b920f82ec..de29417a4d 100644 --- a/mindspore/ccsrc/parallel/node_check.cc +++ b/mindspore/ccsrc/frontend/parallel/node_check.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "parallel/node_check.h" +#include "frontend/parallel/node_check.h" #include #include -#include "parallel/ops_info/ops_utils.h" +#include "frontend/parallel/ops_info/ops_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/node_check.h b/mindspore/ccsrc/frontend/parallel/node_check.h similarity index 100% rename from mindspore/ccsrc/parallel/node_check.h rename to mindspore/ccsrc/frontend/parallel/node_check.h diff --git a/mindspore/ccsrc/parallel/ops_info/activation_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/activation_info.cc similarity index 99% rename from mindspore/ccsrc/parallel/ops_info/activation_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/activation_info.cc index 6bc33677a6..35cac1480c 100644 --- a/mindspore/ccsrc/parallel/ops_info/activation_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/activation_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/activation_info.h" +#include "frontend/parallel/ops_info/activation_info.h" #include #include @@ -22,9 +22,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/activation_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/activation_info.h similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/activation_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/activation_info.h index cd66bf8e8b..a74707efbe 100644 --- a/mindspore/ccsrc/parallel/ops_info/activation_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/activation_info.h @@ -23,9 +23,9 @@ #include #include -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/arithmetic_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/arithmetic_info.cc index 02c26ea965..1dd9c899ca 100644 --- a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/arithmetic_info.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "parallel/ops_info/arithmetic_info.h" +#include "frontend/parallel/ops_info/arithmetic_info.h" #include #include #include #include -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/arithmetic_info.h similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/arithmetic_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/arithmetic_info.h index 27caacc30c..1d347e4ec1 100644 --- a/mindspore/ccsrc/parallel/ops_info/arithmetic_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/arithmetic_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/batch_parallel_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/batch_parallel_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/batch_parallel_info.cc index dac3b0a675..64aceb90f6 100644 --- a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/batch_parallel_info.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "parallel/ops_info/batch_parallel_info.h" +#include "frontend/parallel/ops_info/batch_parallel_info.h" #include #include #include #include "ir/value.h" -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/batch_parallel_info.h similarity index 96% rename from mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/batch_parallel_info.h index db6cb206d5..0ba30c385a 100644 --- a/mindspore/ccsrc/parallel/ops_info/batch_parallel_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/batch_parallel_info.h @@ -22,8 +22,8 @@ #include #include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/bias_add_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/bias_add_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/bias_add_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/bias_add_info.cc index 005edaf7c7..e8b3afba16 100644 --- a/mindspore/ccsrc/parallel/ops_info/bias_add_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/bias_add_info.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "parallel/ops_info/bias_add_info.h" +#include "frontend/parallel/ops_info/bias_add_info.h" #include #include #include #include -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/bias_add_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/bias_add_info.h similarity index 92% rename from mindspore/ccsrc/parallel/ops_info/bias_add_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/bias_add_info.h index 37f555a258..3ede65a3ba 100644 --- a/mindspore/ccsrc/parallel/ops_info/bias_add_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/bias_add_info.h @@ -24,9 +24,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/comparison_function_info.h similarity index 93% rename from mindspore/ccsrc/parallel/ops_info/comparison_function_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/comparison_function_info.h index 8dd2976b04..2829889846 100644 --- a/mindspore/ccsrc/parallel/ops_info/comparison_function_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/comparison_function_info.h @@ -22,9 +22,9 @@ #include #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/arithmetic_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/arithmetic_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/dropout_do_mask_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/dropout_do_mask_info.cc index e88868c772..3b411ccb0e 100644 --- a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/dropout_do_mask_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/dropout_do_mask_info.h" +#include "frontend/parallel/ops_info/dropout_do_mask_info.h" #include #include @@ -22,11 +22,11 @@ #include #include "ir/value.h" -#include "pipeline/resource.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "pipeline/jit/resource.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/dropout_do_mask_info.h similarity index 93% rename from mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/dropout_do_mask_info.h index c51a0a9513..ea7d590071 100644 --- a/mindspore/ccsrc/parallel/ops_info/dropout_do_mask_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/dropout_do_mask_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/elementary_function_info.h similarity index 93% rename from mindspore/ccsrc/parallel/ops_info/elementary_function_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/elementary_function_info.h index 2172c5cd89..e25da9e743 100644 --- a/mindspore/ccsrc/parallel/ops_info/elementary_function_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/elementary_function_info.h @@ -21,9 +21,9 @@ #include #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/gather_v2_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/gather_v2_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_info.cc index 078be08128..4e6e947f68 100644 --- a/mindspore/ccsrc/parallel/ops_info/gather_v2_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/gather_v2_info.h" +#include "frontend/parallel/ops_info/gather_v2_info.h" #include #include @@ -22,10 +22,10 @@ #include "ir/tensor.h" #include "ir/value.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/device_matrix.h" -#include "parallel/graph_util/generate_graph.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/graph_util/generate_graph.h" +#include "frontend/parallel/strategy.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/gather_v2_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_info.h similarity index 94% rename from mindspore/ccsrc/parallel/ops_info/gather_v2_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_info.h index f7aeb6a0d9..b3dc0fab87 100644 --- a/mindspore/ccsrc/parallel/ops_info/gather_v2_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/gather_v2_p_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.cc similarity index 99% rename from mindspore/ccsrc/parallel/ops_info/gather_v2_p_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.cc index 680d6f3ed6..eb3c9900f8 100644 --- a/mindspore/ccsrc/parallel/ops_info/gather_v2_p_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/gather_v2_p_info.h" +#include "frontend/parallel/ops_info/gather_v2_p_info.h" #include #include @@ -22,8 +22,8 @@ #include #include -#include "parallel/device_matrix.h" -#include "parallel/graph_util/generate_graph.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/graph_util/generate_graph.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/gather_v2_p_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.h similarity index 95% rename from mindspore/ccsrc/parallel/ops_info/gather_v2_p_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.h index 16d5c85622..eb26c616d0 100644 --- a/mindspore/ccsrc/parallel/ops_info/gather_v2_p_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/get_next_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/get_next_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/get_next_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/get_next_info.cc index 0fb49364f0..3606732156 100644 --- a/mindspore/ccsrc/parallel/ops_info/get_next_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/get_next_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/get_next_info.h" +#include "frontend/parallel/ops_info/get_next_info.h" #include #include @@ -22,10 +22,10 @@ #include #include "ir/value.h" -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" -#include "parallel/context.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/context.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/get_next_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/get_next_info.h similarity index 93% rename from mindspore/ccsrc/parallel/ops_info/get_next_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/get_next_info.h index ba209910b7..36e7a0fcb3 100644 --- a/mindspore/ccsrc/parallel/ops_info/get_next_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/get_next_info.h @@ -22,9 +22,9 @@ #include #include -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/l2_normalize_info.cc similarity index 94% rename from mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/l2_normalize_info.cc index 8716997d9f..126fdcf84e 100644 --- a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/l2_normalize_info.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "parallel/ops_info/l2_normalize_info.h" +#include "frontend/parallel/ops_info/l2_normalize_info.h" #include #include #include #include -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/l2_normalize_info.h similarity index 90% rename from mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/l2_normalize_info.h index ca063d01d8..c74dde4b4b 100644 --- a/mindspore/ccsrc/parallel/ops_info/l2_normalize_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/l2_normalize_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/layer_norm_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/layer_norm_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/layer_norm_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/layer_norm_info.cc index 5bdd24090f..62d7c6d61e 100644 --- a/mindspore/ccsrc/parallel/ops_info/layer_norm_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/layer_norm_info.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "parallel/ops_info/layer_norm_info.h" +#include "frontend/parallel/ops_info/layer_norm_info.h" #include #include -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/layer_norm_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/layer_norm_info.h similarity index 94% rename from mindspore/ccsrc/parallel/ops_info/layer_norm_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/layer_norm_info.h index 50117b8185..9ee11bb215 100644 --- a/mindspore/ccsrc/parallel/ops_info/layer_norm_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/layer_norm_info.h @@ -22,9 +22,9 @@ #include #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/loss_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/loss_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/loss_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/loss_info.cc index 0ba325c0cd..889f204fb0 100644 --- a/mindspore/ccsrc/parallel/ops_info/loss_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/loss_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/loss_info.h" +#include "frontend/parallel/ops_info/loss_info.h" #include #include @@ -22,9 +22,9 @@ #include #include "ir/value.h" -#include "parallel/device_matrix.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/loss_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/loss_info.h similarity index 94% rename from mindspore/ccsrc/parallel/ops_info/loss_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/loss_info.h index 2679c2d62b..7e5478bedf 100644 --- a/mindspore/ccsrc/parallel/ops_info/loss_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/loss_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/matmul_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/matmul_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc index 7d1ab8dc0f..60a3d60b39 100644 --- a/mindspore/ccsrc/parallel/ops_info/matmul_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/matmul_info.h" +#include "frontend/parallel/ops_info/matmul_info.h" #include #include @@ -24,10 +24,10 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/matmul_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h similarity index 95% rename from mindspore/ccsrc/parallel/ops_info/matmul_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h index cb3e54a048..d4e144c2b6 100644 --- a/mindspore/ccsrc/parallel/ops_info/matmul_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h @@ -24,9 +24,9 @@ #include "common/utils.h" #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/onehot_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/onehot_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/onehot_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/onehot_info.cc index ea2d045104..15acb085f5 100644 --- a/mindspore/ccsrc/parallel/ops_info/onehot_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/onehot_info.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "parallel/ops_info/onehot_info.h" +#include "frontend/parallel/ops_info/onehot_info.h" #include #include #include #include "ir/value.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/device_matrix.h" -#include "parallel/graph_util/generate_graph.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/graph_util/generate_graph.h" +#include "frontend/parallel/strategy.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/onehot_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/onehot_info.h similarity index 93% rename from mindspore/ccsrc/parallel/ops_info/onehot_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/onehot_info.h index 3c8a64f954..dfd7e6cbaf 100644 --- a/mindspore/ccsrc/parallel/ops_info/onehot_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/onehot_info.h @@ -23,9 +23,9 @@ #include #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc similarity index 99% rename from mindspore/ccsrc/parallel/ops_info/operator_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc index f9b294898c..3dd47b1de6 100644 --- a/mindspore/ccsrc/parallel/ops_info/operator_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/operator_info.h" +#include "frontend/parallel/ops_info/operator_info.h" #include #include @@ -27,9 +27,9 @@ #include "ir/dtype.h" #include "ir/tensor.h" #include "ir/value.h" -#include "parallel/auto_parallel/edge_costmodel.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/context.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/context.h" #include "utils/context/ms_context.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/ops_info/operator_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/operator_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h index a3e6bc2c06..8641c47491 100644 --- a/mindspore/ccsrc/parallel/ops_info/operator_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h @@ -27,14 +27,14 @@ #include "common/utils.h" #include "base/base.h" -#include "parallel/auto_parallel/costmodel.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/group_manager.h" -#include "parallel/ops_info/ops_utils.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_info.h" +#include "frontend/parallel/auto_parallel/costmodel.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/group_manager.h" +#include "frontend/parallel/ops_info/ops_utils.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_info.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/parallel/ops_info/ops_info_head_files.h b/mindspore/ccsrc/frontend/parallel/ops_info/ops_info_head_files.h new file mode 100644 index 0000000000..bc732ed234 --- /dev/null +++ b/mindspore/ccsrc/frontend/parallel/ops_info/ops_info_head_files.h @@ -0,0 +1,41 @@ +/** + * Copyright 2019 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPS_INFO_HEAD_FILES_H_ +#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPS_INFO_HEAD_FILES_H_ + +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/ops_info/arithmetic_info.h" +#include "frontend/parallel/ops_info/batch_parallel_info.h" +#include "frontend/parallel/ops_info/bias_add_info.h" +#include "frontend/parallel/ops_info/comparison_function_info.h" +#include "frontend/parallel/ops_info/dropout_do_mask_info.h" +#include "frontend/parallel/ops_info/elementary_function_info.h" +#include "frontend/parallel/ops_info/gather_v2_info.h" +#include "frontend/parallel/ops_info/get_next_info.h" +#include "frontend/parallel/ops_info/l2_normalize_info.h" +#include "frontend/parallel/ops_info/layer_norm_info.h" +#include "frontend/parallel/ops_info/loss_info.h" +#include "frontend/parallel/ops_info/matmul_info.h" +#include "frontend/parallel/ops_info/onehot_info.h" +#include "frontend/parallel/ops_info/prelu_info.h" +#include "frontend/parallel/ops_info/reduce_method_info.h" +#include "frontend/parallel/ops_info/reshape_info.h" +#include "frontend/parallel/ops_info/transpose_info.h" +#include "frontend/parallel/ops_info/virtual_dataset_info.h" +#include "frontend/parallel/ops_info/gather_v2_p_info.h" + +#endif // MINDSPORE_CCSRC_PARALLEL_OPS_INFO_HEAD_FILES_H_ diff --git a/mindspore/ccsrc/parallel/ops_info/ops_utils.h b/mindspore/ccsrc/frontend/parallel/ops_info/ops_utils.h similarity index 100% rename from mindspore/ccsrc/parallel/ops_info/ops_utils.h rename to mindspore/ccsrc/frontend/parallel/ops_info/ops_utils.h diff --git a/mindspore/ccsrc/parallel/ops_info/prelu_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/prelu_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/prelu_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/prelu_info.cc index 14483e97a1..57b35b69f7 100644 --- a/mindspore/ccsrc/parallel/ops_info/prelu_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/prelu_info.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "parallel/ops_info/prelu_info.h" +#include "frontend/parallel/ops_info/prelu_info.h" #include #include #include -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/step_parallel.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/ops_info/prelu_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/prelu_info.h similarity index 95% rename from mindspore/ccsrc/parallel/ops_info/prelu_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/prelu_info.h index 28e149fad7..e6e5e23bac 100644 --- a/mindspore/ccsrc/parallel/ops_info/prelu_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/prelu_info.h @@ -23,8 +23,8 @@ #include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/reduce_method_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/reduce_method_info.cc index 7304666a77..0488dceeca 100644 --- a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/reduce_method_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ops_info/reduce_method_info.h" +#include "frontend/parallel/ops_info/reduce_method_info.h" #include #include @@ -22,9 +22,9 @@ #include #include "ir/value.h" -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/reduce_method_info.h similarity index 96% rename from mindspore/ccsrc/parallel/ops_info/reduce_method_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/reduce_method_info.h index 796c7e457b..ed9ab0721d 100644 --- a/mindspore/ccsrc/parallel/ops_info/reduce_method_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/reduce_method_info.h @@ -24,9 +24,9 @@ #include "ir/tensor.h" #include "ir/value.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/reshape_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/reshape_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/reshape_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/reshape_info.cc index 57e1a76d0a..fb62c1d02c 100644 --- a/mindspore/ccsrc/parallel/ops_info/reshape_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/reshape_info.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "parallel/ops_info/reshape_info.h" +#include "frontend/parallel/ops_info/reshape_info.h" #include #include -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/step_parallel.h" -#include "parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/ops_info/reshape_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/reshape_info.h similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/reshape_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/reshape_info.h index 77a1f8e7f1..2463b440f8 100644 --- a/mindspore/ccsrc/parallel/ops_info/reshape_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/reshape_info.h @@ -24,8 +24,8 @@ #include #include -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/tmp_identity_info.cc similarity index 98% rename from mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/tmp_identity_info.cc index 772a4f83f6..ed6eaa89f1 100644 --- a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/tmp_identity_info.cc @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "parallel/ops_info/tmp_identity_info.h" +#include "frontend/parallel/ops_info/tmp_identity_info.h" #include #include diff --git a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/tmp_identity_info.h similarity index 93% rename from mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/tmp_identity_info.h index f7895d0511..7f73f81180 100644 --- a/mindspore/ccsrc/parallel/ops_info/tmp_identity_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/tmp_identity_info.h @@ -21,9 +21,9 @@ #include #include -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/transpose_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/transpose_info.cc similarity index 97% rename from mindspore/ccsrc/parallel/ops_info/transpose_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/transpose_info.cc index 49bbae0cb4..b6bb875abc 100644 --- a/mindspore/ccsrc/parallel/ops_info/transpose_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/transpose_info.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "parallel/ops_info/transpose_info.h" +#include "frontend/parallel/ops_info/transpose_info.h" #include #include -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/step_parallel.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/ops_info/transpose_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/transpose_info.h similarity index 95% rename from mindspore/ccsrc/parallel/ops_info/transpose_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/transpose_info.h index 50b76bde65..d3b62dc234 100644 --- a/mindspore/ccsrc/parallel/ops_info/transpose_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/transpose_info.h @@ -23,8 +23,8 @@ #include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/virtual_dataset_info.cc similarity index 96% rename from mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.cc rename to mindspore/ccsrc/frontend/parallel/ops_info/virtual_dataset_info.cc index ce8b04d802..3b89d7c84c 100644 --- a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/virtual_dataset_info.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "parallel/ops_info/virtual_dataset_info.h" +#include "frontend/parallel/ops_info/virtual_dataset_info.h" #include #include #include -#include "parallel/device_manager.h" -#include "parallel/device_matrix.h" -#include "parallel/step_parallel.h" -#include "parallel/context.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/context.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/virtual_dataset_info.h similarity index 95% rename from mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h rename to mindspore/ccsrc/frontend/parallel/ops_info/virtual_dataset_info.h index 312ac7a6a4..fe54954be0 100644 --- a/mindspore/ccsrc/parallel/ops_info/virtual_dataset_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/virtual_dataset_info.h @@ -23,8 +23,8 @@ #include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/strategy.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ps/common.h b/mindspore/ccsrc/frontend/parallel/ps/common.h similarity index 100% rename from mindspore/ccsrc/parallel/ps/common.h rename to mindspore/ccsrc/frontend/parallel/ps/common.h diff --git a/mindspore/ccsrc/parallel/ps/optimizer_info.cc b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info.cc similarity index 99% rename from mindspore/ccsrc/parallel/ps/optimizer_info.cc rename to mindspore/ccsrc/frontend/parallel/ps/optimizer_info.cc index 98d36ad038..e16c713e3c 100644 --- a/mindspore/ccsrc/parallel/ps/optimizer_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ps/optimizer_info.h" +#include "frontend/parallel/ps/optimizer_info.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ps/optimizer_info.h b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info.h similarity index 97% rename from mindspore/ccsrc/parallel/ps/optimizer_info.h rename to mindspore/ccsrc/frontend/parallel/ps/optimizer_info.h index b7c130764d..bb9a64acdb 100644 --- a/mindspore/ccsrc/parallel/ps/optimizer_info.h +++ b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info.h @@ -18,8 +18,8 @@ #define MINDSPORE_MINDSPORE_CCSRC_PARALLEL_PS_OPTIMIZER_INFO_H_ #include -#include "kernel/kernel.h" -#include "parallel/ps/common.h" +#include "backend/kernel_compiler/kernel.h" +#include "frontend/parallel/ps/common.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ps/optimizer_info_builder.cc b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.cc similarity index 99% rename from mindspore/ccsrc/parallel/ps/optimizer_info_builder.cc rename to mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.cc index 02c99c4959..159a50793e 100644 --- a/mindspore/ccsrc/parallel/ps/optimizer_info_builder.cc +++ b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ps/optimizer_info_builder.h" +#include "frontend/parallel/ps/optimizer_info_builder.h" #include #include #include diff --git a/mindspore/ccsrc/parallel/ps/optimizer_info_builder.h b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.h similarity index 94% rename from mindspore/ccsrc/parallel/ps/optimizer_info_builder.h rename to mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.h index 0703f5e755..c5aae32921 100644 --- a/mindspore/ccsrc/parallel/ps/optimizer_info_builder.h +++ b/mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.h @@ -18,9 +18,9 @@ #include #include -#include "kernel/kernel.h" -#include "kernel/ps/pserver_kernel.h" -#include "parallel/ps/optimizer_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/ps/pserver_kernel.h" +#include "frontend/parallel/ps/optimizer_info.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ps/parameter_server.h b/mindspore/ccsrc/frontend/parallel/ps/parameter_server.h similarity index 93% rename from mindspore/ccsrc/parallel/ps/parameter_server.h rename to mindspore/ccsrc/frontend/parallel/ps/parameter_server.h index 4d3aa41306..1afb4c9fa6 100755 --- a/mindspore/ccsrc/parallel/ps/parameter_server.h +++ b/mindspore/ccsrc/frontend/parallel/ps/parameter_server.h @@ -29,23 +29,23 @@ #include #include #include "ir/func_graph.h" -#include "session/session_basic.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" -#include "session/session_factory.h" -#include "parallel/ps/common.h" -#include "parallel/ps/optimizer_info.h" -#include "parallel/ps/optimizer_info_builder.h" -#include "parallel/ps/util.h" -#include "device/cpu/kernel_select_cpu.h" +#include "backend/session/session_basic.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/session_factory.h" +#include "frontend/parallel/ps/common.h" +#include "frontend/parallel/ps/optimizer_info.h" +#include "frontend/parallel/ps/optimizer_info_builder.h" +#include "frontend/parallel/ps/util.h" +#include "runtime/device/cpu/kernel_select_cpu.h" #include "utils/context/ms_context.h" -#include "kernel/kernel.h" -#include "kernel/ps/pserver_kernel.h" -#include "kernel/cpu/cpu_kernel_factory.h" -#include "kernel/ps/sparse_apply_adam_ps_kernel.h" -#include "kernel/ps/sparse_apply_ftrl_ps_kernel.h" -#include "kernel/ps/apply_momentum_ps_kernel.h" -#include "kernel/ps/embedding_look_up_ps_kernel.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/ps/pserver_kernel.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/ps/sparse_apply_adam_ps_kernel.h" +#include "backend/kernel_compiler/ps/sparse_apply_ftrl_ps_kernel.h" +#include "backend/kernel_compiler/ps/apply_momentum_ps_kernel.h" +#include "backend/kernel_compiler/ps/embedding_look_up_ps_kernel.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ps/scheduler.cc b/mindspore/ccsrc/frontend/parallel/ps/scheduler.cc similarity index 91% rename from mindspore/ccsrc/parallel/ps/scheduler.cc rename to mindspore/ccsrc/frontend/parallel/ps/scheduler.cc index 81cd5f9358..274b7259b0 100755 --- a/mindspore/ccsrc/parallel/ps/scheduler.cc +++ b/mindspore/ccsrc/frontend/parallel/ps/scheduler.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/ps/scheduler.h" +#include "frontend/parallel/ps/scheduler.h" #include #include "ps/ps.h" diff --git a/mindspore/ccsrc/parallel/ps/scheduler.h b/mindspore/ccsrc/frontend/parallel/ps/scheduler.h similarity index 100% rename from mindspore/ccsrc/parallel/ps/scheduler.h rename to mindspore/ccsrc/frontend/parallel/ps/scheduler.h diff --git a/mindspore/ccsrc/parallel/ps/util.cc b/mindspore/ccsrc/frontend/parallel/ps/util.cc similarity index 97% rename from mindspore/ccsrc/parallel/ps/util.cc rename to mindspore/ccsrc/frontend/parallel/ps/util.cc index dbc258284e..fc63e88901 100644 --- a/mindspore/ccsrc/parallel/ps/util.cc +++ b/mindspore/ccsrc/frontend/parallel/ps/util.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "parallel/ps/util.h" +#include "frontend/parallel/ps/util.h" #include -#include "parallel/ps/common.h" +#include "frontend/parallel/ps/common.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/ps/util.h b/mindspore/ccsrc/frontend/parallel/ps/util.h similarity index 96% rename from mindspore/ccsrc/parallel/ps/util.h rename to mindspore/ccsrc/frontend/parallel/ps/util.h index b55ced0c97..8947ad36de 100644 --- a/mindspore/ccsrc/parallel/ps/util.h +++ b/mindspore/ccsrc/frontend/parallel/ps/util.h @@ -20,7 +20,7 @@ #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ps/worker.h b/mindspore/ccsrc/frontend/parallel/ps/worker.h similarity index 98% rename from mindspore/ccsrc/parallel/ps/worker.h rename to mindspore/ccsrc/frontend/parallel/ps/worker.h index b9d0cdcc85..9ecbc28fc5 100644 --- a/mindspore/ccsrc/parallel/ps/worker.h +++ b/mindspore/ccsrc/frontend/parallel/ps/worker.h @@ -24,9 +24,9 @@ #include #include "ps/ps.h" #include "utils/log_adapter.h" -#include "parallel/ps/util.h" -#include "parallel/ps/common.h" -#include "parallel/ps/worker_proxy.h" +#include "frontend/parallel/ps/util.h" +#include "frontend/parallel/ps/common.h" +#include "frontend/parallel/ps/worker_proxy.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/ps/worker_proxy.h b/mindspore/ccsrc/frontend/parallel/ps/worker_proxy.h similarity index 99% rename from mindspore/ccsrc/parallel/ps/worker_proxy.h rename to mindspore/ccsrc/frontend/parallel/ps/worker_proxy.h index 8ffdde84ea..a0f58d39a4 100644 --- a/mindspore/ccsrc/parallel/ps/worker_proxy.h +++ b/mindspore/ccsrc/frontend/parallel/ps/worker_proxy.h @@ -23,7 +23,7 @@ #include #include #include "ps/ps.h" -#include "parallel/ps/util.h" +#include "frontend/parallel/ps/util.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/status.h b/mindspore/ccsrc/frontend/parallel/status.h similarity index 100% rename from mindspore/ccsrc/parallel/status.h rename to mindspore/ccsrc/frontend/parallel/status.h diff --git a/mindspore/ccsrc/parallel/step_auto_parallel.cc b/mindspore/ccsrc/frontend/parallel/step_auto_parallel.cc similarity index 98% rename from mindspore/ccsrc/parallel/step_auto_parallel.cc rename to mindspore/ccsrc/frontend/parallel/step_auto_parallel.cc index cda2407cd1..8d54eb454a 100644 --- a/mindspore/ccsrc/parallel/step_auto_parallel.cc +++ b/mindspore/ccsrc/frontend/parallel/step_auto_parallel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/step_auto_parallel.h" +#include "frontend/parallel/step_auto_parallel.h" #include #include @@ -30,21 +30,21 @@ #include "ir/anf.h" #include "ir/param_value.h" #include "ir/tensor.h" -#include "optimizer/opt.h" -#include "optimizer/optimizer.h" -#include "parallel/auto_parallel/dp_algo_costmodel.h" -#include "parallel/auto_parallel/edge_costmodel.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/auto_parallel/rec_core/rec_generate_strategy.h" -#include "parallel/auto_parallel/rec_core/rec_parse_graph.h" -#include "parallel/auto_parallel/rec_core/rec_partition.h" -#include "parallel/context.h" -#include "parallel/ops_info/tmp_identity_info.h" -#include "parallel/ops_info/reshape_info.h" -#include "parallel/step_parallel.h" -#include "parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/pipeline.h" +#include "frontend/optimizer/opt.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/parallel/auto_parallel/dp_algo_costmodel.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_parse_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_partition.h" +#include "frontend/parallel/context.h" +#include "frontend/parallel/ops_info/tmp_identity_info.h" +#include "frontend/parallel/ops_info/reshape_info.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/pipeline.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/step_auto_parallel.h b/mindspore/ccsrc/frontend/parallel/step_auto_parallel.h similarity index 95% rename from mindspore/ccsrc/parallel/step_auto_parallel.h rename to mindspore/ccsrc/frontend/parallel/step_auto_parallel.h index c923e5770f..f87d49b736 100644 --- a/mindspore/ccsrc/parallel/step_auto_parallel.h +++ b/mindspore/ccsrc/frontend/parallel/step_auto_parallel.h @@ -22,9 +22,9 @@ #include #include #include "ir/anf.h" -#include "optimizer/opt.h" -#include "parallel/status.h" -#include "pipeline/pipeline.h" +#include "frontend/optimizer/opt.h" +#include "frontend/parallel/status.h" +#include "pipeline/jit/pipeline.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/step_parallel.cc b/mindspore/ccsrc/frontend/parallel/step_parallel.cc similarity index 99% rename from mindspore/ccsrc/parallel/step_parallel.cc rename to mindspore/ccsrc/frontend/parallel/step_parallel.cc index c79cc82d15..e9ff347fa3 100644 --- a/mindspore/ccsrc/parallel/step_parallel.cc +++ b/mindspore/ccsrc/frontend/parallel/step_parallel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/step_parallel.h" +#include "frontend/parallel/step_parallel.h" #include #include @@ -29,21 +29,21 @@ #include "ir/tensor.h" #include "ir/param_value.h" -#include "operator/ops.h" -#include "optimizer/optimizer.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/context.h" -#include "parallel/device_manager.h" -#include "parallel/dynamic_creator.h" -#include "parallel/graph_util/generate_graph.h" -#include "parallel/graph_util/graph_info.h" -#include "parallel/graph_util/node_info.h" -#include "parallel/node_check.h" -#include "parallel/ops_info/matmul_info.h" -#include "parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/context.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/dynamic_creator.h" +#include "frontend/parallel/graph_util/generate_graph.h" +#include "frontend/parallel/graph_util/graph_info.h" +#include "frontend/parallel/graph_util/node_info.h" +#include "frontend/parallel/node_check.h" +#include "frontend/parallel/ops_info/matmul_info.h" +#include "frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" #include "utils/comm_manager.h" #include "utils/symbolic.h" -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" using mindspore::tensor::Tensor; diff --git a/mindspore/ccsrc/parallel/step_parallel.h b/mindspore/ccsrc/frontend/parallel/step_parallel.h similarity index 97% rename from mindspore/ccsrc/parallel/step_parallel.h rename to mindspore/ccsrc/frontend/parallel/step_parallel.h index 308473dcd7..f9fe67ea6b 100644 --- a/mindspore/ccsrc/parallel/step_parallel.h +++ b/mindspore/ccsrc/frontend/parallel/step_parallel.h @@ -27,9 +27,9 @@ #include #include "./common.h" -#include "optimizer/opt.h" -#include "parallel/strategy.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/optimizer/opt.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" using OperatorInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/parallel/strategy.h b/mindspore/ccsrc/frontend/parallel/strategy.h similarity index 98% rename from mindspore/ccsrc/parallel/strategy.h rename to mindspore/ccsrc/frontend/parallel/strategy.h index bc62dd5308..ca01164a6a 100644 --- a/mindspore/ccsrc/parallel/strategy.h +++ b/mindspore/ccsrc/frontend/parallel/strategy.h @@ -23,7 +23,7 @@ #include #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc b/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc similarity index 98% rename from mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc rename to mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc index a83b5eb627..bf7c4e29ab 100644 --- a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc +++ b/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" +#include "frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" #include #include diff --git a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h b/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h similarity index 93% rename from mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h rename to mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h index a758a9e7bb..67cbb92ee2 100644 --- a/mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h +++ b/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h @@ -19,9 +19,9 @@ #include #include -#include "parallel/ops_info/ops_utils.h" -#include "parallel/strategy.h" -#include "parallel/context.h" +#include "frontend/parallel/ops_info/ops_utils.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/context.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/arrangement.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc similarity index 98% rename from mindspore/ccsrc/parallel/tensor_layout/arrangement.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc index 235ab00302..cff3d53a88 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/arrangement.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "parallel/tensor_layout/arrangement.h" +#include "frontend/parallel/tensor_layout/arrangement.h" #include #include #include #include "common/utils.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/shape_util.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/tensor_layout/arrangement.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.h similarity index 95% rename from mindspore/ccsrc/parallel/tensor_layout/arrangement.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.h index ca71b05c91..ab807fb20a 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/arrangement.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.h @@ -23,8 +23,8 @@ #include #include #include -#include "parallel/status.h" -#include "parallel/tensor_layout/array.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/array.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/array.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/array.cc similarity index 95% rename from mindspore/ccsrc/parallel/tensor_layout/array.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/array.cc index ef358e7cde..4e1f467793 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/array.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/array.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "parallel/tensor_layout/array.h" +#include "frontend/parallel/tensor_layout/array.h" #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/tensor_layout/array.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/array.h similarity index 97% rename from mindspore/ccsrc/parallel/tensor_layout/array.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/array.h index 5aa3bdb138..13b3982a18 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/array.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/array.h @@ -22,7 +22,7 @@ #include #include #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/construct_operator.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/construct_operator.cc similarity index 99% rename from mindspore/ccsrc/parallel/tensor_layout/construct_operator.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/construct_operator.cc index b5ca5ed60a..9395d3df89 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/construct_operator.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/construct_operator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "parallel/tensor_layout/construct_operator.h" +#include "frontend/parallel/tensor_layout/construct_operator.h" #include #include diff --git a/mindspore/ccsrc/parallel/tensor_layout/construct_operator.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/construct_operator.h similarity index 95% rename from mindspore/ccsrc/parallel/tensor_layout/construct_operator.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/construct_operator.h index 1a69638fb6..b06d70af36 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/construct_operator.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/construct_operator.h @@ -22,8 +22,8 @@ #include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/status.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc similarity index 92% rename from mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc index 84c0580ba8..d5d34a484f 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "parallel/tensor_layout/layout_transfer.h" +#include "frontend/parallel/tensor_layout/layout_transfer.h" #include "common/utils.h" -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.h similarity index 93% rename from mindspore/ccsrc/parallel/tensor_layout/layout_transfer.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.h index c4da4b728f..01c56fc7cf 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/layout_transfer.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_PARALLEL_TENSOR_LAYOUT_LAYOUT_TRANSFER_H_ #include -#include "parallel/status.h" -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/map.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc similarity index 97% rename from mindspore/ccsrc/parallel/tensor_layout/map.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc index 669920fc44..184f0c7530 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/map.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "parallel/tensor_layout/map.h" +#include "frontend/parallel/tensor_layout/map.h" #include #include #include #include "common/utils.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/shape_util.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/parallel/tensor_layout/map.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.h similarity index 91% rename from mindspore/ccsrc/parallel/tensor_layout/map.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/map.h index 8c8bba2775..3d299d4b90 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/map.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.h @@ -22,9 +22,9 @@ #include #include #include -#include "parallel/status.h" -#include "parallel/tensor_layout/arrangement.h" -#include "parallel/tensor_layout/array.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/arrangement.h" +#include "frontend/parallel/tensor_layout/array.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_layout_transfer.cc similarity index 91% rename from mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_layout_transfer.cc index 7ed07ac02e..a5a488d807 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_layout_transfer.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "parallel/tensor_layout/redistribution_layout_transfer.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/reshape_layout_transfer.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/tensor_layout/redistribution_layout_transfer.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/reshape_layout_transfer.h" +#include "frontend/parallel/tensor_layout/shape_util.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_layout_transfer.h similarity index 88% rename from mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_layout_transfer.h index 7b57f46dd6..0347b6423a 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_layout_transfer.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_layout_transfer.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_PARALLEL_TENSOR_LAYOUT_REDISTRIBUTION_LAYOUT_TRANSFER_H_ #include -#include "parallel/status.h" -#include "parallel/tensor_layout/layout_transfer.h" -#include "parallel/tensor_layout/reshape_layout_transfer.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/layout_transfer.h" +#include "frontend/parallel/tensor_layout/reshape_layout_transfer.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_operator_infer.cc similarity index 98% rename from mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_operator_infer.cc index 946620ec4c..6ac24418b7 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_operator_infer.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "parallel/tensor_layout/redistribution_operator_infer.h" +#include "frontend/parallel/tensor_layout/redistribution_operator_infer.h" #include -#include "parallel/device_manager.h" +#include "frontend/parallel/device_manager.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_operator_infer.h similarity index 95% rename from mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_operator_infer.h index 37a8ac3d9e..66cdb3f925 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/redistribution_operator_infer.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/redistribution_operator_infer.h @@ -23,8 +23,8 @@ #include #include -#include "parallel/tensor_layout/construct_operator.h" -#include "parallel/tensor_layout/redistribution_layout_transfer.h" +#include "frontend/parallel/tensor_layout/construct_operator.h" +#include "frontend/parallel/tensor_layout/redistribution_layout_transfer.h" #include "utils/convert_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/reshape_layout_transfer.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/reshape_layout_transfer.cc similarity index 96% rename from mindspore/ccsrc/parallel/tensor_layout/reshape_layout_transfer.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/reshape_layout_transfer.cc index 4c66befd78..98f7cf78fa 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/reshape_layout_transfer.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/reshape_layout_transfer.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "parallel/tensor_layout/reshape_layout_transfer.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/tensor_layout/reshape_layout_transfer.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/shape_util.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/reshape_layout_transfer.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/reshape_layout_transfer.h similarity index 95% rename from mindspore/ccsrc/parallel/tensor_layout/reshape_layout_transfer.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/reshape_layout_transfer.h index ed62cb59da..f9ebe9e32b 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/reshape_layout_transfer.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/reshape_layout_transfer.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_PARALLEL_TENSOR_LAYOUT_RESHAPE_LAYOUT_TRANSFER_H_ #include -#include "parallel/status.h" -#include "parallel/tensor_layout/layout_transfer.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/layout_transfer.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/shape_util.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/shape_util.cc similarity index 98% rename from mindspore/ccsrc/parallel/tensor_layout/shape_util.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/shape_util.cc index e8f208708c..83282d16b3 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/shape_util.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/shape_util.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/tensor_layout/shape_util.h" #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/tensor_layout/shape_util.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/shape_util.h similarity index 99% rename from mindspore/ccsrc/parallel/tensor_layout/shape_util.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/shape_util.h index 2ec21f3881..49dd39ffd6 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/shape_util.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/shape_util.h @@ -23,7 +23,7 @@ #include #include -#include "parallel/status.h" +#include "frontend/parallel/status.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_info.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_info.h similarity index 94% rename from mindspore/ccsrc/parallel/tensor_layout/tensor_info.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_info.h index 0eee736cea..fc78b1f59c 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_info.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_info.h @@ -22,9 +22,9 @@ #include #include -#include "parallel/device_matrix.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc similarity index 98% rename from mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc index f3498065f2..b9c6cc78de 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" #include #include #include "common/utils.h" #include "ir/value.h" -#include "parallel/device_matrix.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/array.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/device_matrix.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/array.h" +#include "frontend/parallel/tensor_layout/shape_util.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.h similarity index 94% rename from mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.h index f51ed4e3e0..a9fdc9610c 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_layout.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.h @@ -22,10 +22,10 @@ #include #include #include -#include "parallel/device_manager.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/arrangement.h" -#include "parallel/tensor_layout/map.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/arrangement.h" +#include "frontend/parallel/tensor_layout/map.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc similarity index 98% rename from mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc rename to mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc index 7824c21f3d..43bb330787 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" #include #include #include #include "common/utils.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/shape_util.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.h similarity index 91% rename from mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h rename to mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.h index d1f46108bb..df4bd1570f 100644 --- a/mindspore/ccsrc/parallel/tensor_layout/tensor_redistribution.h +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.h @@ -25,11 +25,11 @@ #include #include "ir/value.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/status.h" -#include "parallel/tensor_layout/construct_operator.h" -#include "parallel/tensor_layout/redistribution_operator_infer.h" -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/status.h" +#include "frontend/parallel/tensor_layout/construct_operator.h" +#include "frontend/parallel/tensor_layout/redistribution_operator_infer.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/dataset/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt similarity index 94% rename from mindspore/ccsrc/dataset/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/CMakeLists.txt index 4b84c4d797..df9729c4ee 100644 --- a/mindspore/ccsrc/dataset/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/CMakeLists.txt @@ -34,12 +34,12 @@ endif () ########### Set up the include directories ########################### include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc) -include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/device/ascend/platform) +include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/runtime/device/ascend/platform) include_directories(${CMAKE_BINARY_DIR}) # for protobuf generated .h -include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/mindrecord/include) -include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/dataset/include) +include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/minddata/mindrecord/include) +include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/minddata/dataset/include) ###################################################################### ####################### Flags ######################################## @@ -142,7 +142,7 @@ endif () add_dependencies(_c_dataengine _c_mindrecord) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(MINDRECORD_LINK_OBJECT ${CMAKE_BINARY_DIR}/mindspore/ccsrc/mindrecord/CMakeFiles/_c_mindrecord.dir/objects.a) + set(MINDRECORD_LINK_OBJECT ${CMAKE_BINARY_DIR}/mindspore/ccsrc/minddata/mindrecord/CMakeFiles/_c_mindrecord.dir/objects.a) target_link_libraries(_c_dataengine PRIVATE _c_mindrecord ${MINDRECORD_LINK_OBJECT} mindspore::sqlite) else() target_link_libraries(_c_dataengine PRIVATE _c_mindrecord) diff --git a/mindspore/ccsrc/dataset/api/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/api/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/api/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/api/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/api/datasets.cc b/mindspore/ccsrc/minddata/dataset/api/datasets.cc similarity index 94% rename from mindspore/ccsrc/dataset/api/datasets.cc rename to mindspore/ccsrc/minddata/dataset/api/datasets.cc index 5684e6770a..3072a62dc9 100644 --- a/mindspore/ccsrc/dataset/api/datasets.cc +++ b/mindspore/ccsrc/minddata/dataset/api/datasets.cc @@ -16,23 +16,23 @@ #include -#include "dataset/include/datasets.h" -#include "dataset/include/transforms.h" -#include "dataset/include/samplers.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/datasetops/source/mnist_op.h" -#include "dataset/engine/datasetops/source/cifar_op.h" -#include "dataset/engine/datasetops/batch_op.h" -#include "dataset/engine/datasetops/map_op.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/datasetops/shuffle_op.h" -#include "dataset/engine/datasetops/project_op.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" - -#include "dataset/core/config_manager.h" -#include "dataset/util/random.h" +#include "minddata/dataset/include/datasets.h" +#include "minddata/dataset/include/transforms.h" +#include "minddata/dataset/include/samplers.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/batch_op.h" +#include "minddata/dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/engine/datasetops/project_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" + +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/api/de_pipeline.cc b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc similarity index 97% rename from mindspore/ccsrc/dataset/api/de_pipeline.cc rename to mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc index 6d4a60cdc5..2a6166f868 100644 --- a/mindspore/ccsrc/dataset/api/de_pipeline.cc +++ b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc @@ -13,37 +13,37 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/api/de_pipeline.h" +#include "minddata/dataset/api/de_pipeline.h" #include #include #include #include "common/utils.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/bucket_batch_by_length_op.h" -#include "dataset/engine/datasetops/cache_op.h" -#include "dataset/engine/datasetops/filter_op.h" -#include "dataset/engine/datasetops/source/celeba_op.h" -#include "dataset/engine/datasetops/source/cifar_op.h" -#include "dataset/engine/datasetops/source/clue_op.h" -#include "dataset/engine/datasetops/source/coco_op.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/datasetops/source/manifest_op.h" -#include "dataset/engine/datasetops/source/mnist_op.h" -#include "dataset/engine/datasetops/source/random_data_op.h" -#include "dataset/engine/datasetops/source/text_file_op.h" -#include "dataset/engine/datasetops/source/voc_op.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/kernels/py_func_op.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" -#include "mindrecord/include/shard_category.h" -#include "mindrecord/include/shard_distributed_sample.h" -#include "mindrecord/include/shard_sample.h" -#include "mindrecord/include/shard_shuffle.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/datasetops/filter_op.h" +#include "minddata/dataset/engine/datasetops/source/celeba_op.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/source/clue_op.h" +#include "minddata/dataset/engine/datasetops/source/coco_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/source/manifest_op.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/datasetops/source/text_file_op.h" +#include "minddata/dataset/engine/datasetops/source/voc_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/kernels/py_func_op.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" +#include "minddata/mindrecord/include/shard_category.h" +#include "minddata/mindrecord/include/shard_distributed_sample.h" +#include "minddata/mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_shuffle.h" #include "pybind11/stl.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/api/de_pipeline.h b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.h similarity index 98% rename from mindspore/ccsrc/dataset/api/de_pipeline.h rename to mindspore/ccsrc/minddata/dataset/api/de_pipeline.h index aac2d686af..755e827ef2 100644 --- a/mindspore/ccsrc/dataset/api/de_pipeline.h +++ b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.h @@ -23,9 +23,9 @@ #include #include #include -#include "dataset/core/client.h" // DE client -#include "dataset/engine/dataset_iterator.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" // DE client +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/util/status.h" #include "pybind11/numpy.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" diff --git a/mindspore/ccsrc/dataset/api/iterator.cc b/mindspore/ccsrc/minddata/dataset/api/iterator.cc similarity index 96% rename from mindspore/ccsrc/dataset/api/iterator.cc rename to mindspore/ccsrc/minddata/dataset/api/iterator.cc index 3875dcf8aa..068bcfaa04 100644 --- a/mindspore/ccsrc/dataset/api/iterator.cc +++ b/mindspore/ccsrc/minddata/dataset/api/iterator.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/include/iterator.h" -#include "dataset/core/client.h" -#include "dataset/include/datasets.h" +#include "minddata/dataset/include/iterator.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/include/datasets.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/api/python_bindings.cc b/mindspore/ccsrc/minddata/dataset/api/python_bindings.cc similarity index 90% rename from mindspore/ccsrc/dataset/api/python_bindings.cc rename to mindspore/ccsrc/minddata/dataset/api/python_bindings.cc index 63bd5eccdc..145291ec3b 100644 --- a/mindspore/ccsrc/dataset/api/python_bindings.cc +++ b/mindspore/ccsrc/minddata/dataset/api/python_bindings.cc @@ -15,92 +15,92 @@ */ #include -#include "dataset/api/de_pipeline.h" -#include "dataset/engine/datasetops/source/cifar_op.h" -#include "dataset/engine/datasetops/source/clue_op.h" -#include "dataset/engine/datasetops/source/coco_op.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/manifest_op.h" -#include "dataset/engine/datasetops/source/mindrecord_op.h" -#include "dataset/engine/datasetops/source/mnist_op.h" -#include "dataset/engine/datasetops/source/random_data_op.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" -#include "dataset/engine/datasetops/source/sampler/python_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/engine/datasetops/source/text_file_op.h" -#include "dataset/engine/datasetops/source/tf_reader_op.h" -#include "dataset/engine/datasetops/source/voc_op.h" -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/gnn/graph.h" -#include "dataset/engine/jagged_connector.h" -#include "dataset/kernels/data/concatenate_op.h" -#include "dataset/kernels/data/duplicate_op.h" -#include "dataset/kernels/data/fill_op.h" -#include "dataset/kernels/data/mask_op.h" -#include "dataset/kernels/data/one_hot_op.h" -#include "dataset/kernels/data/pad_end_op.h" -#include "dataset/kernels/data/slice_op.h" -#include "dataset/kernels/data/to_float16_op.h" -#include "dataset/kernels/data/type_cast_op.h" -#include "dataset/kernels/image/bounding_box_augment_op.h" -#include "dataset/kernels/image/center_crop_op.h" -#include "dataset/kernels/image/cut_out_op.h" -#include "dataset/kernels/image/decode_op.h" -#include "dataset/kernels/image/hwc_to_chw_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/image/normalize_op.h" -#include "dataset/kernels/image/pad_op.h" -#include "dataset/kernels/image/random_color_adjust_op.h" -#include "dataset/kernels/image/random_crop_and_resize_op.h" -#include "dataset/kernels/image/random_crop_and_resize_with_bbox_op.h" -#include "dataset/kernels/image/random_crop_decode_resize_op.h" -#include "dataset/kernels/image/random_crop_op.h" -#include "dataset/kernels/image/random_crop_with_bbox_op.h" -#include "dataset/kernels/image/random_horizontal_flip_with_bbox_op.h" -#include "dataset/kernels/image/random_horizontal_flip_op.h" -#include "dataset/kernels/image/random_resize_op.h" -#include "dataset/kernels/image/random_resize_with_bbox_op.h" -#include "dataset/kernels/image/random_rotation_op.h" -#include "dataset/kernels/image/random_vertical_flip_op.h" -#include "dataset/kernels/image/random_vertical_flip_with_bbox_op.h" -#include "dataset/kernels/image/rescale_op.h" -#include "dataset/kernels/image/resize_bilinear_op.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/image/resize_with_bbox_op.h" -#include "dataset/kernels/image/uniform_aug_op.h" -#include "dataset/kernels/no_op.h" -#include "dataset/text/kernels/jieba_tokenizer_op.h" -#include "dataset/text/kernels/lookup_op.h" -#include "dataset/text/kernels/ngram_op.h" -#include "dataset/text/kernels/to_number_op.h" -#include "dataset/text/kernels/unicode_char_tokenizer_op.h" -#include "dataset/text/kernels/wordpiece_tokenizer_op.h" -#include "dataset/text/vocab.h" -#include "dataset/util/random.h" -#include "mindrecord/include/shard_distributed_sample.h" -#include "mindrecord/include/shard_operator.h" -#include "mindrecord/include/shard_pk_sample.h" -#include "mindrecord/include/shard_sample.h" -#include "mindrecord/include/shard_sequential_sample.h" -#include "mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.h" +#include "minddata/dataset/api/de_pipeline.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/source/clue_op.h" +#include "minddata/dataset/engine/datasetops/source/coco_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/manifest_op.h" +#include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/python_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/text_file_op.h" +#include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" +#include "minddata/dataset/engine/datasetops/source/voc_op.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/gnn/graph.h" +#include "minddata/dataset/engine/jagged_connector.h" +#include "minddata/dataset/kernels/data/concatenate_op.h" +#include "minddata/dataset/kernels/data/duplicate_op.h" +#include "minddata/dataset/kernels/data/fill_op.h" +#include "minddata/dataset/kernels/data/mask_op.h" +#include "minddata/dataset/kernels/data/one_hot_op.h" +#include "minddata/dataset/kernels/data/pad_end_op.h" +#include "minddata/dataset/kernels/data/slice_op.h" +#include "minddata/dataset/kernels/data/to_float16_op.h" +#include "minddata/dataset/kernels/data/type_cast_op.h" +#include "minddata/dataset/kernels/image/bounding_box_augment_op.h" +#include "minddata/dataset/kernels/image/center_crop_op.h" +#include "minddata/dataset/kernels/image/cut_out_op.h" +#include "minddata/dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/hwc_to_chw_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/normalize_op.h" +#include "minddata/dataset/kernels/image/pad_op.h" +#include "minddata/dataset/kernels/image/random_color_adjust_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_crop_decode_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_op.h" +#include "minddata/dataset/kernels/image/random_crop_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_op.h" +#include "minddata/dataset/kernels/image/random_resize_op.h" +#include "minddata/dataset/kernels/image/random_resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_rotation_op.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_op.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.h" +#include "minddata/dataset/kernels/image/rescale_op.h" +#include "minddata/dataset/kernels/image/resize_bilinear_op.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/uniform_aug_op.h" +#include "minddata/dataset/kernels/no_op.h" +#include "minddata/dataset/text/kernels/jieba_tokenizer_op.h" +#include "minddata/dataset/text/kernels/lookup_op.h" +#include "minddata/dataset/text/kernels/ngram_op.h" +#include "minddata/dataset/text/kernels/to_number_op.h" +#include "minddata/dataset/text/kernels/unicode_char_tokenizer_op.h" +#include "minddata/dataset/text/kernels/wordpiece_tokenizer_op.h" +#include "minddata/dataset/text/vocab.h" +#include "minddata/dataset/util/random.h" +#include "minddata/mindrecord/include/shard_distributed_sample.h" +#include "minddata/mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_pk_sample.h" +#include "minddata/mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_sequential_sample.h" +#include "mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" #include "pybind11/stl_bind.h" #ifdef ENABLE_ICU4C -#include "dataset/text/kernels/basic_tokenizer_op.h" -#include "dataset/text/kernels/bert_tokenizer_op.h" -#include "dataset/text/kernels/case_fold_op.h" -#include "dataset/text/kernels/normalize_utf8_op.h" -#include "dataset/text/kernels/regex_replace_op.h" -#include "dataset/text/kernels/regex_tokenizer_op.h" -#include "dataset/text/kernels/unicode_script_tokenizer_op.h" -#include "dataset/text/kernels/whitespace_tokenizer_op.h" +#include "minddata/dataset/text/kernels/basic_tokenizer_op.h" +#include "minddata/dataset/text/kernels/bert_tokenizer_op.h" +#include "minddata/dataset/text/kernels/case_fold_op.h" +#include "minddata/dataset/text/kernels/normalize_utf8_op.h" +#include "minddata/dataset/text/kernels/regex_replace_op.h" +#include "minddata/dataset/text/kernels/regex_tokenizer_op.h" +#include "minddata/dataset/text/kernels/unicode_script_tokenizer_op.h" +#include "minddata/dataset/text/kernels/whitespace_tokenizer_op.h" #endif namespace py = pybind11; diff --git a/mindspore/ccsrc/dataset/api/samplers.cc b/mindspore/ccsrc/minddata/dataset/api/samplers.cc similarity index 92% rename from mindspore/ccsrc/dataset/api/samplers.cc rename to mindspore/ccsrc/minddata/dataset/api/samplers.cc index 44d01c2f0c..91421f0ff8 100644 --- a/mindspore/ccsrc/dataset/api/samplers.cc +++ b/mindspore/ccsrc/minddata/dataset/api/samplers.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "dataset/include/samplers.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/include/samplers.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/api/transforms.cc b/mindspore/ccsrc/minddata/dataset/api/transforms.cc similarity index 95% rename from mindspore/ccsrc/dataset/api/transforms.cc rename to mindspore/ccsrc/minddata/dataset/api/transforms.cc index e086837447..59a25ef9f5 100644 --- a/mindspore/ccsrc/dataset/api/transforms.cc +++ b/mindspore/ccsrc/minddata/dataset/api/transforms.cc @@ -14,20 +14,20 @@ * limitations under the License. */ -#include "dataset/include/transforms.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/image/normalize_op.h" -#include "dataset/kernels/image/decode_op.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/image/random_crop_op.h" -#include "dataset/kernels/image/center_crop_op.h" -#include "dataset/kernels/image/uniform_aug_op.h" -#include "dataset/kernels/image/random_horizontal_flip_op.h" -#include "dataset/kernels/image/random_vertical_flip_op.h" -#include "dataset/kernels/image/random_rotation_op.h" -#include "dataset/kernels/image/cut_out_op.h" -#include "dataset/kernels/image/random_color_adjust_op.h" -#include "dataset/kernels/image/pad_op.h" +#include "minddata/dataset/include/transforms.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/normalize_op.h" +#include "minddata/dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_op.h" +#include "minddata/dataset/kernels/image/center_crop_op.h" +#include "minddata/dataset/kernels/image/uniform_aug_op.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_op.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_op.h" +#include "minddata/dataset/kernels/image/random_rotation_op.h" +#include "minddata/dataset/kernels/image/cut_out_op.h" +#include "minddata/dataset/kernels/image/random_color_adjust_op.h" +#include "minddata/dataset/kernels/image/pad_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/core/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/core/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/core/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/core/client.cc b/mindspore/ccsrc/minddata/dataset/core/client.cc similarity index 80% rename from mindspore/ccsrc/dataset/core/client.cc rename to mindspore/ccsrc/minddata/dataset/core/client.cc index 6247ddae7d..e3fd844e66 100644 --- a/mindspore/ccsrc/dataset/core/client.cc +++ b/mindspore/ccsrc/minddata/dataset/core/client.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/client.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" -#include "dataset/util/services.h" -#include "dataset/util/sig_handler.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/sig_handler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/minddata/dataset/core/client.h b/mindspore/ccsrc/minddata/dataset/core/client.h new file mode 100644 index 0000000000..78b298e616 --- /dev/null +++ b/mindspore/ccsrc/minddata/dataset/core/client.h @@ -0,0 +1,61 @@ +/** + * Copyright 2019 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef DATASET_CORE_CLIENT_H_ +#define DATASET_CORE_CLIENT_H_ + +// client.h +// Include file for DE client functions + +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" +#include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" + +#ifdef ENABLE_PYTHON +#include "minddata/dataset/engine/datasetops/barrier_op.h" +#include "minddata/dataset/engine/datasetops/filter_op.h" +#include "minddata/dataset/engine/datasetops/source/generator_op.h" +#include "minddata/dataset/engine/datasetops/build_vocab_op.h" +#endif + +#include "minddata/dataset/engine/datasetops/batch_op.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/datasetops/device_queue_op.h" +#include "minddata/dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/engine/datasetops/project_op.h" +#include "minddata/dataset/engine/datasetops/rename_op.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/datasetops/skip_op.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/engine/datasetops/take_op.h" +#include "minddata/dataset/engine/datasetops/zip_op.h" +#include "minddata/dataset/engine/datasetops/concat_op.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/status.h" + +namespace mindspore { +namespace dataset { +// This is a one-time global initializer that needs to be called at the +// start of any minddata applications. +extern Status GlobalInit(); +} // namespace dataset +} // namespace mindspore + +#endif // DATASET_CORE_CLIENT_H_ diff --git a/mindspore/ccsrc/dataset/core/config_manager.cc b/mindspore/ccsrc/minddata/dataset/core/config_manager.cc similarity index 97% rename from mindspore/ccsrc/dataset/core/config_manager.cc rename to mindspore/ccsrc/minddata/dataset/core/config_manager.cc index 9291a8f832..e1fc7f29ba 100644 --- a/mindspore/ccsrc/dataset/core/config_manager.cc +++ b/mindspore/ccsrc/minddata/dataset/core/config_manager.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/config_manager.h" +#include "minddata/dataset/core/config_manager.h" #include #include #include -#include "dataset/util/system_pool.h" +#include "minddata/dataset/util/system_pool.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/config_manager.h b/mindspore/ccsrc/minddata/dataset/core/config_manager.h similarity index 97% rename from mindspore/ccsrc/dataset/core/config_manager.h rename to mindspore/ccsrc/minddata/dataset/core/config_manager.h index 807591daa1..a8e1907c41 100644 --- a/mindspore/ccsrc/dataset/core/config_manager.h +++ b/mindspore/ccsrc/minddata/dataset/core/config_manager.h @@ -22,9 +22,9 @@ #include -#include "dataset/core/constants.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" // Config settings for the client-side // example config file: diff --git a/mindspore/ccsrc/dataset/core/constants.h b/mindspore/ccsrc/minddata/dataset/core/constants.h similarity index 100% rename from mindspore/ccsrc/dataset/core/constants.h rename to mindspore/ccsrc/minddata/dataset/core/constants.h diff --git a/mindspore/ccsrc/dataset/core/cv_tensor.cc b/mindspore/ccsrc/minddata/dataset/core/cv_tensor.cc similarity index 96% rename from mindspore/ccsrc/dataset/core/cv_tensor.cc rename to mindspore/ccsrc/minddata/dataset/core/cv_tensor.cc index 16921e8b2d..5af748b5de 100644 --- a/mindspore/ccsrc/dataset/core/cv_tensor.cc +++ b/mindspore/ccsrc/minddata/dataset/core/cv_tensor.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/core/cv_tensor.h" #include #include -#include "dataset/core/constants.h" -#include "dataset/core/tensor.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/tensor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/cv_tensor.h b/mindspore/ccsrc/minddata/dataset/core/cv_tensor.h similarity index 96% rename from mindspore/ccsrc/dataset/core/cv_tensor.h rename to mindspore/ccsrc/minddata/dataset/core/cv_tensor.h index 8c136f5f3c..a614418be6 100644 --- a/mindspore/ccsrc/dataset/core/cv_tensor.h +++ b/mindspore/ccsrc/minddata/dataset/core/cv_tensor.h @@ -24,9 +24,9 @@ #include "./securec.h" -#include "dataset/core/constants.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/data_type.cc b/mindspore/ccsrc/minddata/dataset/core/data_type.cc similarity index 98% rename from mindspore/ccsrc/dataset/core/data_type.cc rename to mindspore/ccsrc/minddata/dataset/core/data_type.cc index dd97c10bae..b5641e3105 100644 --- a/mindspore/ccsrc/dataset/core/data_type.cc +++ b/mindspore/ccsrc/minddata/dataset/core/data_type.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/data_type.h" +#include "minddata/dataset/core/data_type.h" #ifdef ENABLE_PYTHON -#include "dataset/core/pybind_support.h" +#include "minddata/dataset/core/pybind_support.h" #endif #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/core/data_type.h b/mindspore/ccsrc/minddata/dataset/core/data_type.h similarity index 99% rename from mindspore/ccsrc/dataset/core/data_type.h rename to mindspore/ccsrc/minddata/dataset/core/data_type.h index e15b6ed272..db4834cae2 100644 --- a/mindspore/ccsrc/dataset/core/data_type.h +++ b/mindspore/ccsrc/minddata/dataset/core/data_type.h @@ -22,13 +22,13 @@ #ifdef ENABLE_PYTHON #include "pybind11/numpy.h" #include "pybind11/pybind11.h" -#include "dataset/core/pybind_support.h" +#include "minddata/dataset/core/pybind_support.h" namespace py = pybind11; #else #include "Eigen/Core" using float16 = Eigen::half; #endif -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/example.proto b/mindspore/ccsrc/minddata/dataset/core/example.proto similarity index 100% rename from mindspore/ccsrc/dataset/core/example.proto rename to mindspore/ccsrc/minddata/dataset/core/example.proto diff --git a/mindspore/ccsrc/dataset/core/feature.proto b/mindspore/ccsrc/minddata/dataset/core/feature.proto similarity index 100% rename from mindspore/ccsrc/dataset/core/feature.proto rename to mindspore/ccsrc/minddata/dataset/core/feature.proto diff --git a/mindspore/ccsrc/dataset/core/global_context.cc b/mindspore/ccsrc/minddata/dataset/core/global_context.cc similarity index 86% rename from mindspore/ccsrc/dataset/core/global_context.cc rename to mindspore/ccsrc/minddata/dataset/core/global_context.cc index 3de8e0fcd8..eb76382ab2 100644 --- a/mindspore/ccsrc/dataset/core/global_context.cc +++ b/mindspore/ccsrc/minddata/dataset/core/global_context.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/global_context.h" #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/tensor.h" -#include "dataset/util/allocator.h" -#include "dataset/util/circular_pool.h" -#include "dataset/util/system_pool.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/util/system_pool.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/global_context.h b/mindspore/ccsrc/minddata/dataset/core/global_context.h similarity index 96% rename from mindspore/ccsrc/dataset/core/global_context.h rename to mindspore/ccsrc/minddata/dataset/core/global_context.h index ee0cbfbbe0..fe0847f639 100644 --- a/mindspore/ccsrc/dataset/core/global_context.h +++ b/mindspore/ccsrc/minddata/dataset/core/global_context.h @@ -19,9 +19,9 @@ #include #include -#include "dataset/core/constants.h" -#include "dataset/util/allocator.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/pybind_support.h b/mindspore/ccsrc/minddata/dataset/core/pybind_support.h similarity index 100% rename from mindspore/ccsrc/dataset/core/pybind_support.h rename to mindspore/ccsrc/minddata/dataset/core/pybind_support.h diff --git a/mindspore/ccsrc/dataset/core/tensor.cc b/mindspore/ccsrc/minddata/dataset/core/tensor.cc similarity index 99% rename from mindspore/ccsrc/dataset/core/tensor.cc rename to mindspore/ccsrc/minddata/dataset/core/tensor.cc index eda5239852..842615f9e1 100644 --- a/mindspore/ccsrc/dataset/core/tensor.cc +++ b/mindspore/ccsrc/minddata/dataset/core/tensor.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/tensor.h" +#include "minddata/dataset/core/tensor.h" #include #include @@ -25,14 +25,14 @@ #include #include "common/utils.h" -#include "dataset/core/constants.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/global_context.h" #ifdef ENABLE_PYTHON -#include "dataset/core/pybind_support.h" +#include "minddata/dataset/core/pybind_support.h" namespace py = pybind11; #endif -#include "dataset/core/tensor_shape.h" +#include "minddata/dataset/core/tensor_shape.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/tensor.h b/mindspore/ccsrc/minddata/dataset/core/tensor.h similarity index 99% rename from mindspore/ccsrc/dataset/core/tensor.h rename to mindspore/ccsrc/minddata/dataset/core/tensor.h index 337535a2c3..b0b173e9c3 100644 --- a/mindspore/ccsrc/dataset/core/tensor.h +++ b/mindspore/ccsrc/minddata/dataset/core/tensor.h @@ -33,10 +33,10 @@ #include "pybind11/stl.h" #endif -#include "dataset/core/constants.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/util/status.h" #include "proto/example.pb.h" #ifdef ENABLE_PYTHON diff --git a/mindspore/ccsrc/dataset/core/tensor_row.cc b/mindspore/ccsrc/minddata/dataset/core/tensor_row.cc similarity index 97% rename from mindspore/ccsrc/dataset/core/tensor_row.cc rename to mindspore/ccsrc/minddata/dataset/core/tensor_row.cc index 930608d108..5d75730a4c 100644 --- a/mindspore/ccsrc/dataset/core/tensor_row.cc +++ b/mindspore/ccsrc/minddata/dataset/core/tensor_row.cc @@ -16,7 +16,7 @@ #include -#include "dataset/core/tensor_row.h" +#include "minddata/dataset/core/tensor_row.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/tensor_row.h b/mindspore/ccsrc/minddata/dataset/core/tensor_row.h similarity index 98% rename from mindspore/ccsrc/dataset/core/tensor_row.h rename to mindspore/ccsrc/minddata/dataset/core/tensor_row.h index 49bc61657c..e8f066c87b 100644 --- a/mindspore/ccsrc/dataset/core/tensor_row.h +++ b/mindspore/ccsrc/minddata/dataset/core/tensor_row.h @@ -21,7 +21,7 @@ #include #include -#include "dataset/core/tensor.h" +#include "minddata/dataset/core/tensor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/tensor_shape.cc b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc similarity index 98% rename from mindspore/ccsrc/dataset/core/tensor_shape.cc rename to mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc index 953b9dfc9f..ff40062d37 100644 --- a/mindspore/ccsrc/dataset/core/tensor_shape.cc +++ b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc @@ -15,13 +15,13 @@ */ #define MAX_INTEGER_DTYPE 9223372036854775807 -#include "dataset/core/tensor_shape.h" +#include "minddata/dataset/core/tensor_shape.h" #include #include "common/utils.h" #include "utils/log_adapter.h" -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/core/tensor_shape.h b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.h similarity index 97% rename from mindspore/ccsrc/dataset/core/tensor_shape.h rename to mindspore/ccsrc/minddata/dataset/core/tensor_shape.h index 3d2681271a..4944f9e32c 100644 --- a/mindspore/ccsrc/dataset/core/tensor_shape.h +++ b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.h @@ -29,10 +29,10 @@ namespace py = pybind11; #endif -#include "dataset/core/constants.h" -#include "dataset/util/status.h" -#include "dataset/core/global_context.h" -#include "dataset/util/allocator.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/util/allocator.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/cache/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/cache/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_client.cc b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/cache/cache_client.cc rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.cc index 1dc97ac43a..04746131bb 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_client.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.cc @@ -15,9 +15,9 @@ */ #include -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/cache/cache_request.h" -#include "dataset/util/bit.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/cache/cache_request.h" +#include "minddata/dataset/util/bit.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_client.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/cache/cache_client.h rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h index ffdb9e9fdd..f25db87578 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_client.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_client.h @@ -24,9 +24,9 @@ #include #include "./de_tensor_generated.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/cache/cache_server.h" -#include "dataset/util/lock.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/cache/cache_server.h" +#include "minddata/dataset/util/lock.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_request.cc b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.cc similarity index 99% rename from mindspore/ccsrc/dataset/engine/cache/cache_request.cc rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.cc index 5485c22b6a..3b7fc057a2 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_request.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/cache/cache_request.h" +#include "minddata/dataset/engine/cache/cache_request.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_request.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/cache/cache_request.h rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h index 3182816e54..3d0edc6dd8 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_request.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_request.h @@ -24,9 +24,9 @@ #include #include "./de_tensor_generated.h" -#include "dataset/core/tensor_row.h" -#include "dataset/util/slice.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor_row.h" +#include "minddata/dataset/util/slice.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_server.cc b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/cache/cache_server.cc rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc index 88d617b598..c9fb6ecab1 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_server.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/cache/cache_server.h" -#include "dataset/engine/cache/cache_service.h" -#include "dataset/engine/cache/cache_request.h" -#include "dataset/util/bit.h" +#include "minddata/dataset/engine/cache/cache_server.h" +#include "minddata/dataset/engine/cache/cache_service.h" +#include "minddata/dataset/engine/cache/cache_request.h" +#include "minddata/dataset/util/bit.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_server.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.h similarity index 87% rename from mindspore/ccsrc/dataset/engine/cache/cache_server.h rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.h index f83fa1cb6d..13b68c4389 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_server.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_server.h @@ -24,16 +24,16 @@ #include #include #include -#include "dataset/engine/cache/cache_service.h" -#include "dataset/core/tensor.h" -#include "dataset/util/arena.h" -#include "dataset/util/cache_pool.h" -#include "dataset/util/lock.h" -#include "dataset/util/service.h" -#include "dataset/util/services.h" -#include "dataset/util/system_pool.h" -#include "dataset/util/queue.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/engine/cache/cache_service.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/util/arena.h" +#include "minddata/dataset/util/cache_pool.h" +#include "minddata/dataset/util/lock.h" +#include "minddata/dataset/util/service.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/system_pool.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_service.cc b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.cc similarity index 99% rename from mindspore/ccsrc/dataset/engine/cache/cache_service.cc rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.cc index 555413a566..4e1208d173 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_service.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/cache/cache_service.h" -#include "dataset/util/slice.h" +#include "minddata/dataset/engine/cache/cache_service.h" +#include "minddata/dataset/util/slice.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/cache_service.h b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h similarity index 92% rename from mindspore/ccsrc/dataset/engine/cache/cache_service.h rename to mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h index 60cfa40a50..bf324e82e3 100644 --- a/mindspore/ccsrc/dataset/engine/cache/cache_service.h +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/cache_service.h @@ -26,15 +26,15 @@ #include #include "./de_tensor_generated.h" -#include "dataset/core/global_context.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/cache/cache_request.h" -#include "dataset/util/arena.h" -#include "dataset/util/btree.h" -#include "dataset/util/cache_pool.h" -#include "dataset/util/service.h" -#include "dataset/util/services.h" -#include "dataset/util/system_pool.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/cache/cache_request.h" +#include "minddata/dataset/util/arena.h" +#include "minddata/dataset/util/btree.h" +#include "minddata/dataset/util/cache_pool.h" +#include "minddata/dataset/util/service.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/system_pool.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/cache/de_tensor.fbs b/mindspore/ccsrc/minddata/dataset/engine/cache/de_tensor.fbs similarity index 100% rename from mindspore/ccsrc/dataset/engine/cache/de_tensor.fbs rename to mindspore/ccsrc/minddata/dataset/engine/cache/de_tensor.fbs diff --git a/mindspore/ccsrc/dataset/engine/connector.h b/mindspore/ccsrc/minddata/dataset/engine/connector.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/connector.h rename to mindspore/ccsrc/minddata/dataset/engine/connector.h index bd66172be5..a91d8e68e9 100644 --- a/mindspore/ccsrc/dataset/engine/connector.h +++ b/mindspore/ccsrc/minddata/dataset/engine/connector.h @@ -20,10 +20,10 @@ #include #include #include -#include "dataset/util/task_manager.h" -#include "dataset/util/queue.h" -#include "dataset/util/services.h" -#include "dataset/util/cond_var.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/cond_var.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/data_buffer.cc b/mindspore/ccsrc/minddata/dataset/engine/data_buffer.cc similarity index 94% rename from mindspore/ccsrc/dataset/engine/data_buffer.cc rename to mindspore/ccsrc/minddata/dataset/engine/data_buffer.cc index 718721b906..b36aae6837 100644 --- a/mindspore/ccsrc/dataset/engine/data_buffer.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/data_buffer.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/data_buffer.h" -#include "dataset/util/allocator.h" -#include "dataset/core/global_context.h" -#include "dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/core/tensor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/data_buffer.h b/mindspore/ccsrc/minddata/dataset/engine/data_buffer.h similarity index 94% rename from mindspore/ccsrc/dataset/engine/data_buffer.h rename to mindspore/ccsrc/minddata/dataset/engine/data_buffer.h index b539bdaf7b..5fcb4c21a5 100644 --- a/mindspore/ccsrc/dataset/engine/data_buffer.h +++ b/mindspore/ccsrc/minddata/dataset/engine/data_buffer.h @@ -21,11 +21,11 @@ #include #include #include -#include "dataset/util/allocator.h" -#include "dataset/util/status.h" -#include "dataset/core/constants.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_row.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_row.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/data_schema.cc b/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc similarity index 99% rename from mindspore/ccsrc/dataset/engine/data_schema.cc rename to mindspore/ccsrc/minddata/dataset/engine/data_schema.cc index 6c5f882bed..50d910251d 100644 --- a/mindspore/ccsrc/dataset/engine/data_schema.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/data_schema.h" +#include "minddata/dataset/engine/data_schema.h" #include #include @@ -24,8 +24,8 @@ #include #include "common/utils.h" -#include "dataset/util/status.h" -#include "dataset/core/tensor_shape.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/tensor_shape.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/data_schema.h b/mindspore/ccsrc/minddata/dataset/engine/data_schema.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/data_schema.h rename to mindspore/ccsrc/minddata/dataset/engine/data_schema.h index ce61b8952d..96f6f2b118 100644 --- a/mindspore/ccsrc/dataset/engine/data_schema.h +++ b/mindspore/ccsrc/minddata/dataset/engine/data_schema.h @@ -23,10 +23,10 @@ #include #include #include -#include "dataset/core/constants.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/dataset_iterator.cc b/mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/dataset_iterator.cc rename to mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.cc index be333741b1..f75ca5d097 100644 --- a/mindspore/ccsrc/dataset/engine/dataset_iterator.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/dataset_iterator.h" #include #include -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/util/status.h" -#include "dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/dataset_iterator.h b/mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/dataset_iterator.h rename to mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.h index 4e40e77c74..253d1604e2 100644 --- a/mindspore/ccsrc/dataset/engine/dataset_iterator.h +++ b/mindspore/ccsrc/minddata/dataset/engine/dataset_iterator.h @@ -20,11 +20,11 @@ #include #include #include -#include "dataset/util/status.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/perf/dataset_iterator_tracing.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/perf/dataset_iterator_tracing.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/datasetops/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/datasetops/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/datasetops/barrier_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/barrier_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.cc index 6fc276a75e..51ea232e68 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/barrier_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/barrier_op.h" +#include "minddata/dataset/engine/datasetops/barrier_op.h" #include #include -#include "dataset/core/constants.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/barrier_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/barrier_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.h index 379b8f146b..a3ac843272 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/barrier_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/barrier_op.h @@ -20,10 +20,10 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/batch_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/batch_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc index 93b4864040..844d054307 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/batch_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/batch_op.h" +#include "minddata/dataset/engine/datasetops/batch_op.h" #include #include #include "common/utils.h" #ifdef ENABLE_PYTHON -#include "dataset/core/pybind_support.h" +#include "minddata/dataset/core/pybind_support.h" #endif -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/kernels/data/data_utils.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/kernels/data/data_utils.h" using float16 = Eigen::half; diff --git a/mindspore/ccsrc/dataset/engine/datasetops/batch_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/batch_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.h index acf2e5a0c0..0c042433f7 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/batch_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.h @@ -26,11 +26,11 @@ #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/bucket_batch_by_length_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc similarity index 94% rename from mindspore/ccsrc/dataset/engine/datasetops/bucket_batch_by_length_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc index 5e143b700f..138bb7980b 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/bucket_batch_by_length_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/bucket_batch_by_length_op.h" +#include "minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h" #include #include @@ -24,14 +24,14 @@ #include "pybind11/numpy.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" -#include "dataset/core/pybind_support.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/pybind_support.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/util/status.h" namespace py = pybind11; namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/bucket_batch_by_length_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h similarity index 94% rename from mindspore/ccsrc/dataset/engine/datasetops/bucket_batch_by_length_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h index bf0bcb0e78..332ff4bb22 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/bucket_batch_by_length_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/bucket_batch_by_length_op.h @@ -22,12 +22,12 @@ #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/batch_op.h" -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/batch_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/build_vocab_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/build_vocab_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.cc index ceb5058593..8ed51ebbb6 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/build_vocab_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "dataset/engine/datasetops/build_vocab_op.h" +#include "minddata/dataset/engine/datasetops/build_vocab_op.h" #include #include #include #include #include -#include "dataset/core/config_manager.h" +#include "minddata/dataset/core/config_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/build_vocab_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/build_vocab_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.h index bf358c48c6..42ea0deb5c 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/build_vocab_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/build_vocab_op.h @@ -22,12 +22,12 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/text/vocab.h" -#include "dataset/util/queue.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/text/vocab.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_base_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_base_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.cc index c943f8bd7a..1b0890686f 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_base_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/cache_base_op.h" +#include "minddata/dataset/engine/datasetops/cache_base_op.h" #include #include -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/execution_tree.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_base_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.h similarity index 87% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_base_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.h index 9f90b7cd9d..fb3e999b76 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_base_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_base_op.h @@ -20,16 +20,16 @@ #include #include #include -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/cache/cache_service.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/util/queue.h" -#include "dataset/util/wait_post.h" -#include "dataset/engine/datasetops/cache_base_op.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/cache/cache_service.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/wait_post.h" +#include "minddata/dataset/engine/datasetops/cache_base_op.h" namespace mindspore { namespace dataset { /// \brief This is the base class for CacheOp and CacheLookupOp which share many similarities. diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_lookup_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.cc similarity index 94% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_lookup_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.cc index 196a8790df..0a9b7544ba 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_lookup_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/cache_lookup_op.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/cache_lookup_op.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/execution_tree.h" #include "utils/log_adapter.h" #include "utils/system/crc32c.h" diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_lookup_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_lookup_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.h index 526fb7c3a7..46a58c5d02 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_lookup_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_lookup_op.h @@ -21,7 +21,7 @@ #include #include #include -#include "dataset/engine/datasetops/cache_base_op.h" +#include "minddata/dataset/engine/datasetops/cache_base_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_merge_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_merge_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.cc index f2d5173348..75579dc3a6 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_merge_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/cache_merge_op.h" +#include "minddata/dataset/engine/datasetops/cache_merge_op.h" #include #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_merge_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_merge_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.h index 60e2ebd0be..df37465fc4 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_merge_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_merge_op.h @@ -23,12 +23,12 @@ #include #include #include -#include "dataset/core/tensor_row.h" -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/util/queue.h" -#include "dataset/util/semaphore.h" +#include "minddata/dataset/core/tensor_row.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/semaphore.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.cc index 149f2b0bbb..143c45b2dc 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/util/task_manager.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/cache_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.h similarity index 99% rename from mindspore/ccsrc/dataset/engine/datasetops/cache_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.h index 6ec7e95ecf..dd34d54973 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/cache_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/cache_op.h @@ -20,7 +20,7 @@ #include #include #include -#include "dataset/engine/datasetops/cache_base_op.h" +#include "minddata/dataset/engine/datasetops/cache_base_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/concat_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/concat_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc index 2cf2e8045f..7acb68350b 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/concat_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc @@ -17,11 +17,11 @@ #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/datasetops/concat_op.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/datasetops/concat_op.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/concat_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/concat_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.h index e3dd890d07..3d3d9df71c 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/concat_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.h @@ -20,7 +20,7 @@ #include #include #include -#include "dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.cc index a963033833..9254141308 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" #include #include @@ -23,12 +23,12 @@ #include #include -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/datasetops/device_queue_op.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/device_queue_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/opt/pass.h" #include "utils/system/crc32c.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.h similarity index 99% rename from mindspore/ccsrc/dataset/engine/datasetops/dataset_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.h index b5bcb17b4b..b4630c1652 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/dataset_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/dataset_op.h @@ -21,9 +21,9 @@ #include #include #include -#include "dataset/core/constants.h" -#include "dataset/engine/db_connector.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/device_queue_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/device_queue_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc index 0f1fefc0f0..4fe779246b 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/device_queue_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.cc @@ -17,16 +17,16 @@ #include #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/device_queue_op.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/engine/perf/profiling.h" -#include "dataset/engine/perf/device_queue_tracing.h" -#include "dataset/util/status.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/device_queue_op.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/device_queue_tracing.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/device_queue_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/device_queue_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h index a854004593..0fb4fb093d 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/device_queue_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h @@ -20,15 +20,15 @@ #include #include -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/util/status.h" #ifdef ENABLE_TDTQUE -#include "dataset/engine/tdt/tdt_plugin.h" +#include "minddata/dataset/engine/tdt/tdt_plugin.h" #endif #ifdef ENABLE_GPUQUE -#include "device/gpu/gpu_buffer_mgr.h" +#include "runtime/device/gpu/gpu_buffer_mgr.h" using mindspore::device::BlockQueueStatus_T; using mindspore::device::GpuBufferMgr; #endif diff --git a/mindspore/ccsrc/dataset/engine/datasetops/filter_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/filter_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.cc index 81c93c6e1c..f32648a3df 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/filter_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.cc @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/filter_op.h" +#include "minddata/dataset/engine/datasetops/filter_op.h" #include #include #include #include #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/kernels/tensor_op.h" #include "utils/log_adapter.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/filter_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/filter_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.h index 36f70cb82f..fcc6e577df 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/filter_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/filter_op.h @@ -21,9 +21,9 @@ #include #include #include -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/queue.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/queue.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/map_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/map_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op.cc index 05a1ac7925..e5e70dbbdf 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/map_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op.cc @@ -13,24 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/engine/datasetops/map_op.h" #include #include #include #include #include -#include "dataset/core/config_manager.h" - -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/config_manager.h" + +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/kernels/tensor_op.h" #include "utils/log_adapter.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/map_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/map_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op.h index db7ad7e504..b1cd58010f 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/map_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/map_op.h @@ -21,9 +21,9 @@ #include #include #include -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/queue.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/queue.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/parallel_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.cc similarity index 89% rename from mindspore/ccsrc/dataset/engine/datasetops/parallel_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.cc index 244861a6c8..abb827aea8 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/parallel_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" #include #include -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/core/config_manager.h" -#include "dataset/engine/db_connector.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/parallel_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/parallel_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.h index f59d4bfc53..da54ce1331 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/parallel_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/parallel_op.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/core/constants.h" -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/pipeline_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/pipeline_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.cc index 1d017a4d3e..fff5ba19e7 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/pipeline_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" #include #include diff --git a/mindspore/ccsrc/dataset/engine/datasetops/pipeline_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/pipeline_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.h index cb3c76813b..0538349f48 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/pipeline_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/pipeline_op.h @@ -18,7 +18,7 @@ #include #include -#include "dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/project_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/project_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.cc index 5ce4056024..e232a64164 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/project_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "dataset/engine/datasetops/project_op.h" +#include "minddata/dataset/engine/datasetops/project_op.h" #include #include #include @@ -22,10 +22,10 @@ #include #include #include -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/project_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/project_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.h index 628c1342ba..c2f14d34b7 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/project_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/project_op.h @@ -20,7 +20,7 @@ #include #include -#include "dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/rename_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/rename_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.cc index 23cd29d295..d12660e6f9 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/rename_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/rename_op.h" +#include "minddata/dataset/engine/datasetops/rename_op.h" #include #include #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/opt/pass.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/rename_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/rename_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.h index e209c075d6..d846bb1b40 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/rename_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/rename_op.h @@ -20,9 +20,9 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/repeat_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/repeat_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.cc index a0de649284..6d3dc91ed3 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/repeat_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.cc @@ -17,11 +17,11 @@ #include #include -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/opt/pass.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/engine/datasetops/repeat_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.h similarity index 99% rename from mindspore/ccsrc/dataset/engine/datasetops/repeat_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.h index 7993737aeb..f5259de30e 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/repeat_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/repeat_op.h @@ -20,7 +20,7 @@ #include #include #include -#include "dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/shuffle_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/shuffle_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.cc index f86fcc602b..0eb5f29eaf 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/shuffle_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.cc @@ -25,14 +25,14 @@ #include #include -#include "dataset/core/config_manager.h" -#include "dataset/engine/datasetops/shuffle_op.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/engine/datasetops/shuffle_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/shuffle_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.h index 14b1e4511e..86bea7cc77 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/shuffle_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/shuffle_op.h @@ -24,11 +24,11 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/skip_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.cc similarity index 93% rename from mindspore/ccsrc/dataset/engine/datasetops/skip_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.cc index f6b0fe689c..2fe8cbeaa6 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/skip_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.cc @@ -17,12 +17,12 @@ #include #include -#include "dataset/core/config_manager.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/datasetops/skip_op.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/datasetops/skip_op.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/engine/datasetops/skip_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/skip_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.h index 4cb658b2a7..a717d0efa4 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/skip_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/skip_op.h @@ -19,7 +19,7 @@ #include #include #include -#include "dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/datasetops/source/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/celeba_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/celeba_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/celeba_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/celeba_op.cc index db357f42ec..9d7d5622a6 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/celeba_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/celeba_op.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/celeba_op.h" +#include "minddata/dataset/engine/datasetops/source/celeba_op.h" #include #include -#include "dataset/core/config_manager.h" -#include "dataset/util/path.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/kernels/image/image_utils.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/kernels/image/image_utils.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/celeba_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/celeba_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/celeba_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/celeba_op.h index fa81babe4c..ef183f8e65 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/celeba_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/celeba_op.h @@ -24,12 +24,12 @@ #include #include -#include "dataset/util/status.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/util/queue.h" -#include "dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" #define CLOSE_FILE(attr_file, pairition_file) \ do { \ diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc index d378933c04..06be682bfd 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" #include #include @@ -21,12 +21,12 @@ #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.h similarity index 93% rename from mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.h index 24324bbebb..60169f32bf 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/cifar_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.h @@ -22,17 +22,17 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/queue.h" -#include "dataset/util/services.h" -#include "dataset/util/status.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/clue_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/clue_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.cc index 9fceb6f333..958514583a 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/clue_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/clue_op.h" +#include "minddata/dataset/engine/datasetops/source/clue_op.h" #include #include @@ -21,12 +21,12 @@ #include #include -#include "dataset/core/config_manager.h" -#include "dataset/util/task_manager.h" -#include "dataset/engine/jagged_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/engine/jagged_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/clue_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/clue_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.h index 487ed0d47f..ab429561ec 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/clue_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/clue_op.h @@ -23,9 +23,9 @@ #include #include -#include "dataset/util/auto_index.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/util/auto_index.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/coco_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/coco_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc index 7d14163544..daef2f284b 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/coco_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/coco_op.h" +#include "minddata/dataset/engine/datasetops/source/coco_op.h" #include #include #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/coco_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/coco_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.h index 2a93d26195..31070c26f5 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/coco_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.h @@ -23,17 +23,17 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/path.h" -#include "dataset/util/queue.h" -#include "dataset/util/status.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/generator_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/generator_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/generator_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/generator_op.cc index 36c221fc16..773dfc78b6 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/generator_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/generator_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/generator_op.h" +#include "minddata/dataset/engine/datasetops/source/generator_op.h" #include -#include "dataset/core/global_context.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/util/task_manager.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/generator_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/generator_op.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/source/generator_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/generator_op.h index 98dd2d70a1..d09bfc3d71 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/generator_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/generator_op.h @@ -22,11 +22,11 @@ #include #include #include -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc index 837eae1e3c..85839303db 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" #include #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.h similarity index 94% rename from mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.h index 6629fd6092..153751d3c5 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/image_folder_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.h @@ -25,18 +25,18 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/path.h" -#include "dataset/util/queue.h" -#include "dataset/util/services.h" -#include "dataset/util/status.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/io_block.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/io_block.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.cc index 0963f1a67a..2b2542430b 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/io_block.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" #include #include diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/io_block.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/io_block.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.h index 87b417f027..df26aa1fc1 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/io_block.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/io_block.h @@ -19,8 +19,8 @@ #include #include -#include "dataset/util/auto_index.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/auto_index.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/manifest_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/manifest_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc index 4f9a12bd65..0476baf56f 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/manifest_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/manifest_op.h" +#include "minddata/dataset/engine/datasetops/source/manifest_op.h" #include #include @@ -21,12 +21,12 @@ #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/manifest_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.h similarity index 93% rename from mindspore/ccsrc/dataset/engine/datasetops/source/manifest_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.h index 864abf676c..bac8f04c94 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/manifest_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.h @@ -22,17 +22,17 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/queue.h" -#include "dataset/util/services.h" -#include "dataset/util/status.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/mindrecord_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/mindrecord_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc index 2b9d010ebb..cf1493eb78 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/mindrecord_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/mindrecord_op.h" +#include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" #include #include @@ -22,14 +22,14 @@ #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/constants.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/mindrecord_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/source/mindrecord_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.h index af405a8f5b..367505b172 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/mindrecord_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.h @@ -27,16 +27,16 @@ #include #include -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/util/queue.h" -#include "dataset/util/status.h" -#include "mindrecord/include/shard_column.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/common/shard_utils.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/status.h" +#include "minddata/mindrecord/include/shard_column.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/mnist_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/mnist_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc index 8a75cdc579..11ad18865e 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/mnist_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" #include #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/mnist_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.h similarity index 94% rename from mindspore/ccsrc/dataset/engine/datasetops/source/mnist_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.h index e57dc21d60..039f6b112f 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/mnist_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.h @@ -23,16 +23,16 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/queue.h" -#include "dataset/util/status.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/random_data_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/random_data_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.cc index f13de2e5c9..46f3adfa62 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/random_data_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" #include #include -#include "dataset/engine/execution_tree.h" -#include "dataset/core/config_manager.h" -#include "dataset/util/random.h" -#include "dataset/util/wait_post.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/wait_post.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/random_data_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/random_data_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.h index 76d781ee1c..c77695439d 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/random_data_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/random_data_op.h @@ -23,12 +23,12 @@ #include #include #include -#include "dataset/util/status.h" -#include "dataset/core/tensor.h" -#include "dataset/core/data_type.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/distributed_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/distributed_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc index 9f4a9cf55c..2b5e7c67c8 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/distributed_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" #include #include -#include "dataset/engine/data_buffer.h" -#include "dataset/util/random.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/distributed_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/distributed_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h index 7083580c6c..76bcf052f9 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/distributed_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h @@ -21,7 +21,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/pk_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/pk_sampler.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/pk_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/pk_sampler.cc index cd2cadb9ff..770c24c8c5 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/pk_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/pk_sampler.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" #include #include -#include "dataset/util/random.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/pk_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/pk_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h index cde8a75b5b..aed61fa273 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/pk_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h @@ -22,7 +22,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/python_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/python_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.cc index d204c55ce9..50c67bca6c 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/python_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/python_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/python_sampler.h" #include diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/python_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/python_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.h index 7d653b2087..61716feb94 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/python_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/python_sampler.h @@ -19,7 +19,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/random_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/random_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.cc index db0a96ea3a..998dee2a07 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/random_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" #include #include #include -#include "dataset/util/random.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/random_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/random_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.h index b1c54eb98c..6e21b088b9 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/random_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/random_sampler.h @@ -20,7 +20,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.cc index 5f0ffd8855..60d75d2eec 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" #include diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.h index d9da777a48..4cae935a42 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sampler.h @@ -22,10 +22,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sequential_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sequential_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc index 28598da55f..1cc4ac831a 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sequential_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" #include #include diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sequential_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sequential_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h index 06f084fb7a..c6ccd0d1eb 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/sequential_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h @@ -19,7 +19,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc index 08a623ed1b..db2078795e 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" #include #include #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/subset_random_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/subset_random_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h index ffc7cb17bc..fccc15e57b 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/subset_random_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h @@ -20,7 +20,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc index 6bf3d2d85e..13863143c0 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" #include #include @@ -21,8 +21,8 @@ #include #include -#include "dataset/core/global_context.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h index 1fbe29ed80..b1a531abe9 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h @@ -21,7 +21,7 @@ #include #include -#include "dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/text_file_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/datasetops/source/text_file_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc index 818b5ab3f4..c1f5b13a94 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/text_file_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc @@ -22,13 +22,13 @@ #include #include "common/utils.h" -#include "dataset/engine/datasetops/source/text_file_op.h" -#include "dataset/core/config_manager.h" -#include "dataset/util/task_manager.h" -#include "dataset/util/wait_post.h" -#include "dataset/util/random.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/source/text_file_op.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/util/wait_post.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/execution_tree.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/text_file_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/source/text_file_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.h index 5b787d4dad..68c226ab80 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/text_file_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.h @@ -23,14 +23,14 @@ #include #include -#include "dataset/util/status.h" -#include "dataset/util/auto_index.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/util/queue.h" -#include "dataset/util/wait_post.h" -#include "dataset/engine/jagged_connector.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/auto_index.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/wait_post.h" +#include "minddata/dataset/engine/jagged_connector.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc index 6e6d885cb1..ae7907b5ce 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/tf_reader_op.h" +#include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" #include #include @@ -28,21 +28,21 @@ #include "proto/example.pb.h" #include "./securec.h" #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/connector.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/jagged_connector.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/util/path.h" -#include "dataset/util/queue.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" -#include "dataset/util/task_manager.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/connector.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/jagged_connector.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/util/wait_post.h" #include "utils/system/crc32c.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.h index 2613bc5e46..c03f3957e9 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.h @@ -25,12 +25,12 @@ #include #include -#include "dataset/util/wait_post.h" -#include "dataset/util/auto_index.h" -#include "dataset/util/status.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/util/wait_post.h" +#include "minddata/dataset/util/auto_index.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" namespace dataengine { class Example; diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/voc_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/source/voc_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc index 27a343c973..e90d423ef4 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/voc_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/source/voc_op.h" +#include "minddata/dataset/engine/datasetops/source/voc_op.h" #include #include #include #include "./tinyxml2.h" #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" using tinyxml2::XMLDocument; using tinyxml2::XMLElement; diff --git a/mindspore/ccsrc/dataset/engine/datasetops/source/voc_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/datasetops/source/voc_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.h index ec46a3c7b1..e0c46c7a94 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/source/voc_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.h @@ -22,17 +22,17 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/data_schema.h" -#include "dataset/engine/datasetops/parallel_op.h" -#include "dataset/engine/datasetops/source/io_block.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/path.h" -#include "dataset/util/queue.h" -#include "dataset/util/status.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/engine/datasetops/parallel_op.h" +#include "minddata/dataset/engine/datasetops/source/io_block.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/queue.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/wait_post.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/take_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc similarity index 93% rename from mindspore/ccsrc/dataset/engine/datasetops/take_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc index b9fd8a0663..d1f07983f7 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/take_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc @@ -17,12 +17,12 @@ #include #include "common/utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/datasetops/take_op.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/datasetops/take_op.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/take_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/datasetops/take_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.h index 07626d5f1f..7f3f821bd8 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/take_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.h @@ -19,7 +19,7 @@ #include #include #include -#include "dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/zip_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/zip_op.cc rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.cc index 70bce16a89..88019c30fc 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/zip_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/datasetops/zip_op.h" +#include "minddata/dataset/engine/datasetops/zip_op.h" #include #include -#include "dataset/core/constants.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/db_connector.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/db_connector.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/datasetops/zip_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/datasetops/zip_op.h rename to mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.h index fad3c22eaa..c9466e26e2 100644 --- a/mindspore/ccsrc/dataset/engine/datasetops/zip_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/zip_op.h @@ -22,10 +22,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/engine/dataset_iterator.h" -#include "dataset/engine/datasetops/pipeline_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/dataset_iterator.h" +#include "minddata/dataset/engine/datasetops/pipeline_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/db_connector.h b/mindspore/ccsrc/minddata/dataset/engine/db_connector.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/db_connector.h rename to mindspore/ccsrc/minddata/dataset/engine/db_connector.h index 54909f51ba..4a5c20bc12 100644 --- a/mindspore/ccsrc/dataset/engine/db_connector.h +++ b/mindspore/ccsrc/minddata/dataset/engine/db_connector.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/engine/connector.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/core/constants.h" +#include "minddata/dataset/engine/connector.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/execution_tree.cc b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc similarity index 94% rename from mindspore/ccsrc/dataset/engine/execution_tree.cc rename to mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc index b816cb3487..55dec24e79 100644 --- a/mindspore/ccsrc/dataset/engine/execution_tree.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.cc @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/execution_tree.h" #include #include -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/datasetops/shuffle_op.h" -#include "dataset/util/task_manager.h" -#include "dataset/engine/opt/pass.h" -#include "dataset/engine/opt/pre/removal_pass.h" -#include "dataset/engine/opt/pre/cache_transform_pass.h" -#include "dataset/engine/opt/post/repeat_pass.h" -#include "mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.h" -#include "dataset/engine/perf/profiling.h" -#include "dataset/engine/perf/monitor.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pre/removal_pass.h" +#include "minddata/dataset/engine/opt/pre/cache_transform_pass.h" +#include "minddata/dataset/engine/opt/post/repeat_pass.h" +#include "mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h" +#include "minddata/dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/monitor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/execution_tree.h b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/execution_tree.h rename to mindspore/ccsrc/minddata/dataset/engine/execution_tree.h index 465d200856..b62bf8e85d 100644 --- a/mindspore/ccsrc/dataset/engine/execution_tree.h +++ b/mindspore/ccsrc/minddata/dataset/engine/execution_tree.h @@ -21,9 +21,9 @@ #include #include #include -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/util/status.h" -#include "mindspore/ccsrc/dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/util/status.h" +#include "mindspore/ccsrc/minddata/dataset/engine/perf/profiling.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/gnn/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/gnn/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/gnn/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/gnn/edge.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/edge.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/gnn/edge.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/edge.h index 47314d97c2..c62c088bab 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/edge.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/edge.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/util/status.h" -#include "dataset/engine/gnn/feature.h" -#include "dataset/engine/gnn/node.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/gnn/feature.h" +#include "minddata/dataset/engine/gnn/node.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/feature.cc b/mindspore/ccsrc/minddata/dataset/engine/gnn/feature.cc similarity index 94% rename from mindspore/ccsrc/dataset/engine/gnn/feature.cc rename to mindspore/ccsrc/minddata/dataset/engine/gnn/feature.cc index e457947821..dba4a6fa60 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/feature.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/feature.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/gnn/feature.h" +#include "minddata/dataset/engine/gnn/feature.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/feature.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/feature.h similarity index 94% rename from mindspore/ccsrc/dataset/engine/gnn/feature.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/feature.h index 7ce5967fbd..0d7eba1009 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/feature.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/feature.h @@ -18,8 +18,8 @@ #include -#include "dataset/core/tensor.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/graph.cc b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph.cc similarity index 99% rename from mindspore/ccsrc/dataset/engine/gnn/graph.cc rename to mindspore/ccsrc/minddata/dataset/engine/gnn/graph.cc index bf67772fe5..9083eb4c4b 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/graph.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/gnn/graph.h" +#include "minddata/dataset/engine/gnn/graph.h" #include #include @@ -21,8 +21,8 @@ #include #include -#include "dataset/core/tensor_shape.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/graph.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/gnn/graph.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/graph.h index 7a50440b27..76930d91f2 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/graph.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph.h @@ -25,13 +25,13 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_row.h" -#include "dataset/engine/gnn/graph_loader.h" -#include "dataset/engine/gnn/feature.h" -#include "dataset/engine/gnn/node.h" -#include "dataset/engine/gnn/edge.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_row.h" +#include "minddata/dataset/engine/gnn/graph_loader.h" +#include "minddata/dataset/engine/gnn/feature.h" +#include "minddata/dataset/engine/gnn/node.h" +#include "minddata/dataset/engine/gnn/edge.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/graph_loader.cc b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph_loader.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/gnn/graph_loader.cc rename to mindspore/ccsrc/minddata/dataset/engine/gnn/graph_loader.cc index f3374954b6..9d2c6211f4 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/graph_loader.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph_loader.cc @@ -18,11 +18,11 @@ #include #include -#include "dataset/engine/gnn/graph_loader.h" -#include "mindspore/ccsrc/mindrecord/include/shard_error.h" -#include "dataset/engine/gnn/local_edge.h" -#include "dataset/engine/gnn/local_node.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/engine/gnn/graph_loader.h" +#include "mindspore/ccsrc/minddata/mindrecord/include/shard_error.h" +#include "minddata/dataset/engine/gnn/local_edge.h" +#include "minddata/dataset/engine/gnn/local_node.h" +#include "minddata/dataset/util/task_manager.h" using ShardTuple = std::vector, mindspore::mindrecord::json>>; diff --git a/mindspore/ccsrc/dataset/engine/gnn/graph_loader.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph_loader.h similarity index 93% rename from mindspore/ccsrc/dataset/engine/gnn/graph_loader.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/graph_loader.h index 141816d633..f7f9245b8a 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/graph_loader.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/graph_loader.h @@ -24,14 +24,14 @@ #include #include -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/gnn/feature.h" -#include "dataset/engine/gnn/graph.h" -#include "dataset/engine/gnn/node.h" -#include "dataset/engine/gnn/edge.h" -#include "dataset/util/status.h" -#include "mindrecord/include/shard_reader.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/gnn/feature.h" +#include "minddata/dataset/engine/gnn/graph.h" +#include "minddata/dataset/engine/gnn/node.h" +#include "minddata/dataset/engine/gnn/edge.h" +#include "minddata/dataset/util/status.h" +#include "minddata/mindrecord/include/shard_reader.h" namespace mindspore { namespace dataset { namespace gnn { diff --git a/mindspore/ccsrc/dataset/engine/gnn/local_edge.cc b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_edge.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/gnn/local_edge.cc rename to mindspore/ccsrc/minddata/dataset/engine/gnn/local_edge.cc index 7465b689d5..642c73eed3 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/local_edge.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_edge.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/gnn/local_edge.h" +#include "minddata/dataset/engine/gnn/local_edge.h" #include diff --git a/mindspore/ccsrc/dataset/engine/gnn/local_edge.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_edge.h similarity index 91% rename from mindspore/ccsrc/dataset/engine/gnn/local_edge.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/local_edge.h index a34fc00373..d112972f8f 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/local_edge.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_edge.h @@ -20,10 +20,10 @@ #include #include -#include "dataset/util/status.h" -#include "dataset/engine/gnn/edge.h" -#include "dataset/engine/gnn/feature.h" -#include "dataset/engine/gnn/node.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/gnn/edge.h" +#include "minddata/dataset/engine/gnn/feature.h" +#include "minddata/dataset/engine/gnn/node.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/local_node.cc b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc similarity index 96% rename from mindspore/ccsrc/dataset/engine/gnn/local_node.cc rename to mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc index c829f8e8ca..8eaf9bb716 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/local_node.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/gnn/local_node.h" +#include "minddata/dataset/engine/gnn/local_node.h" #include #include #include -#include "dataset/engine/gnn/edge.h" -#include "dataset/util/random.h" +#include "minddata/dataset/engine/gnn/edge.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/local_node.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/gnn/local_node.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.h index bc069d073f..9c122931e7 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/local_node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/local_node.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/util/status.h" -#include "dataset/engine/gnn/node.h" -#include "dataset/engine/gnn/feature.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/gnn/node.h" +#include "minddata/dataset/engine/gnn/feature.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/gnn/node.h b/mindspore/ccsrc/minddata/dataset/engine/gnn/node.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/gnn/node.h rename to mindspore/ccsrc/minddata/dataset/engine/gnn/node.h index 282f856797..a7c803fee2 100644 --- a/mindspore/ccsrc/dataset/engine/gnn/node.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gnn/node.h @@ -20,8 +20,8 @@ #include #include -#include "dataset/util/status.h" -#include "dataset/engine/gnn/feature.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/gnn/feature.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/jagged_connector.h b/mindspore/ccsrc/minddata/dataset/engine/jagged_connector.h similarity index 93% rename from mindspore/ccsrc/dataset/engine/jagged_connector.h rename to mindspore/ccsrc/minddata/dataset/engine/jagged_connector.h index 2058c542a8..cee0b7abf3 100644 --- a/mindspore/ccsrc/dataset/engine/jagged_connector.h +++ b/mindspore/ccsrc/minddata/dataset/engine/jagged_connector.h @@ -20,10 +20,10 @@ #include #include #include -#include "dataset/engine/connector.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/util/status.h" -#include "dataset/core/constants.h" +#include "minddata/dataset/engine/connector.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/opt/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/opt/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/opt/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.cc similarity index 88% rename from mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.cc index 67b742cf6e..d8ce2dd863 100644 --- a/mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.cc @@ -15,10 +15,10 @@ */ #include -#include "dataset/engine/opt/optional/tensor_op_fusion_pass.h" -#include "dataset/kernels/image/decode_op.h" -#include "dataset/engine/datasetops/map_op.h" -#include "dataset/kernels/image/random_crop_decode_resize_op.h" +#include "minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h" +#include "minddata/dataset/kernels/image/decode_op.h" +#include "minddata/dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/kernels/image/random_crop_decode_resize_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h index e7fa4f076b..a109af396c 100644 --- a/mindspore/ccsrc/dataset/engine/opt/optional/tensor_op_fusion_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/optional/tensor_op_fusion_pass.h @@ -17,7 +17,7 @@ #define DATASET_TENSOR_OP_FUSION_PASS_H_ #include -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc similarity index 82% rename from mindspore/ccsrc/dataset/engine/opt/pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc index 17689224ea..4a8bbaf38f 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.cc @@ -14,35 +14,35 @@ * limitations under the License. */ -#include "dataset/engine/opt/pass.h" -#include "dataset/engine/datasetops/batch_op.h" -#include "dataset/engine/datasetops/cache_op.h" -#include "dataset/engine/datasetops/cache_merge_op.h" -#include "dataset/engine/datasetops/cache_lookup_op.h" -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/datasetops/device_queue_op.h" -#include "dataset/engine/datasetops/map_op.h" -#include "dataset/engine/datasetops/project_op.h" -#include "dataset/engine/datasetops/rename_op.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/datasetops/skip_op.h" -#include "dataset/engine/datasetops/shuffle_op.h" -#include "dataset/engine/datasetops/source/celeba_op.h" -#include "dataset/engine/datasetops/source/cifar_op.h" -#include "dataset/engine/datasetops/source/coco_op.h" -#include "dataset/engine/datasetops/source/manifest_op.h" -#include "dataset/engine/datasetops/source/mindrecord_op.h" -#include "dataset/engine/datasetops/source/mnist_op.h" -#include "dataset/engine/datasetops/source/random_data_op.h" -#include "dataset/engine/datasetops/source/tf_reader_op.h" -#include "dataset/engine/datasetops/source/voc_op.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/datasetops/batch_op.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/datasetops/cache_merge_op.h" +#include "minddata/dataset/engine/datasetops/cache_lookup_op.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/datasetops/device_queue_op.h" +#include "minddata/dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/engine/datasetops/project_op.h" +#include "minddata/dataset/engine/datasetops/rename_op.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/datasetops/skip_op.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/engine/datasetops/source/celeba_op.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/source/coco_op.h" +#include "minddata/dataset/engine/datasetops/source/manifest_op.h" +#include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" +#include "minddata/dataset/engine/datasetops/source/voc_op.h" #ifdef ENABLE_PYTHON -#include "dataset/engine/datasetops/filter_op.h" -#include "dataset/engine/datasetops/source/generator_op.h" +#include "minddata/dataset/engine/datasetops/filter_op.h" +#include "minddata/dataset/engine/datasetops/source/generator_op.h" #endif -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/datasetops/take_op.h" -#include "dataset/engine/datasetops/zip_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/take_op.h" +#include "minddata/dataset/engine/datasetops/zip_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/opt/pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/pass.h index 8489faa23a..845ab34d66 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pass.h @@ -20,8 +20,8 @@ #include #include -#include "dataset/engine/execution_tree.h" -#include "dataset/util/status.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/post/repeat_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/post/repeat_pass.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/opt/post/repeat_pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/post/repeat_pass.cc index 9f7a561aa6..59a3f71c53 100644 --- a/mindspore/ccsrc/dataset/engine/opt/post/repeat_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/post/repeat_pass.cc @@ -15,11 +15,11 @@ */ #include -#include "dataset/engine/opt/post/repeat_pass.h" -#include "dataset/engine/datasetops/repeat_op.h" -#include "dataset/engine/datasetops/cache_op.h" -#include "dataset/engine/datasetops/cache_lookup_op.h" -#include "dataset/engine/datasetops/cache_merge_op.h" +#include "minddata/dataset/engine/opt/post/repeat_pass.h" +#include "minddata/dataset/engine/datasetops/repeat_op.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/datasetops/cache_lookup_op.h" +#include "minddata/dataset/engine/datasetops/cache_merge_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/post/repeat_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/post/repeat_pass.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/opt/post/repeat_pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/post/repeat_pass.h index 3f5f347a30..9b733e2329 100644 --- a/mindspore/ccsrc/dataset/engine/opt/post/repeat_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/post/repeat_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/cache_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_pass.cc similarity index 88% rename from mindspore/ccsrc/dataset/engine/opt/pre/cache_pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_pass.cc index ae0f4d3a04..09b5f14a17 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/cache_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_pass.cc @@ -15,20 +15,20 @@ */ #include -#include "dataset/engine/opt/pre/cache_pass.h" -#include "dataset/engine/opt/pre/cache_transform_pass.h" -#include "dataset/engine/datasetops/cache_op.h" -#include "dataset/engine/datasetops/source/celeba_op.h" -#include "dataset/engine/datasetops/source/generator_op.h" -#include "dataset/engine/datasetops/source/manifest_op.h" -#include "dataset/engine/datasetops/source/mnist_op.h" -#include "dataset/engine/datasetops/source/voc_op.h" -#include "dataset/engine/datasetops/source/cifar_op.h" -#include "dataset/engine/datasetops/source/coco_op.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/datasetops/source/random_data_op.h" -#include "dataset/engine/datasetops/source/tf_reader_op.h" -#include "dataset/engine/datasetops/source/mindrecord_op.h" +#include "minddata/dataset/engine/opt/pre/cache_pass.h" +#include "minddata/dataset/engine/opt/pre/cache_transform_pass.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/datasetops/source/celeba_op.h" +#include "minddata/dataset/engine/datasetops/source/generator_op.h" +#include "minddata/dataset/engine/datasetops/source/manifest_op.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/voc_op.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/source/coco_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" +#include "minddata/dataset/engine/datasetops/source/mindrecord_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/cache_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_pass.h similarity index 99% rename from mindspore/ccsrc/dataset/engine/opt/pre/cache_pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_pass.h index c842e54bbf..cbc805cd3e 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/cache_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/cache_transform_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc similarity index 91% rename from mindspore/ccsrc/dataset/engine/opt/pre/cache_transform_pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc index df4933fa1c..033150e8f4 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/cache_transform_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.cc @@ -15,13 +15,13 @@ */ #include -#include "dataset/engine/opt/pre/cache_pass.h" -#include "dataset/engine/opt/pre/cache_transform_pass.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/datasetops/cache_lookup_op.h" -#include "dataset/engine/datasetops/cache_merge_op.h" -#include "dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/opt/pre/cache_pass.h" +#include "minddata/dataset/engine/opt/pre/cache_transform_pass.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/datasetops/cache_lookup_op.h" +#include "minddata/dataset/engine/datasetops/cache_merge_op.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/cache_transform_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/opt/pre/cache_transform_pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h index dc31d76d80..02c22c4472 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/cache_transform_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/cache_transform_pass.h @@ -20,7 +20,7 @@ #include #include #include -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/removal_nodes.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_nodes.cc similarity index 91% rename from mindspore/ccsrc/dataset/engine/opt/pre/removal_nodes.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_nodes.cc index e361015e48..f04d7bc07d 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/removal_nodes.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_nodes.cc @@ -15,9 +15,9 @@ */ #include -#include "dataset/engine/opt/pre/removal_nodes.h" -#include "dataset/engine/opt/pre/removal_pass.h" -#include "dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/engine/opt/pre/removal_nodes.h" +#include "minddata/dataset/engine/opt/pre/removal_pass.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/removal_nodes.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_nodes.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/opt/pre/removal_nodes.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_nodes.h index be1aaea645..32025cd597 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/removal_nodes.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_nodes.h @@ -18,8 +18,8 @@ #define DATASET_ENGINE_OPT_PASS_PRE_REMOVAL_NODES_H_ #include -#include "dataset/engine/opt/pass.h" -#include "dataset/engine/opt/pre/removal_pass.h" +#include "minddata/dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pre/removal_pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/removal_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_pass.cc similarity index 90% rename from mindspore/ccsrc/dataset/engine/opt/pre/removal_pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_pass.cc index db5e37a085..0db422a7c2 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/removal_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_pass.cc @@ -16,9 +16,9 @@ #include #include -#include "dataset/engine/opt/pre/removal_nodes.h" -#include "dataset/engine/opt/pre/removal_pass.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/opt/pre/removal_nodes.h" +#include "minddata/dataset/engine/opt/pre/removal_pass.h" +#include "minddata/dataset/engine/execution_tree.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/pre/removal_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_pass.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/opt/pre/removal_pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_pass.h index 6c1963b826..bcab7cf08c 100644 --- a/mindspore/ccsrc/dataset/engine/opt/pre/removal_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/pre/removal_pass.h @@ -19,7 +19,7 @@ #include #include -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/util/printer_pass.cc b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc similarity index 98% rename from mindspore/ccsrc/dataset/engine/opt/util/printer_pass.cc rename to mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc index 305c3ce121..eb74d8fcc3 100644 --- a/mindspore/ccsrc/dataset/engine/opt/util/printer_pass.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.cc @@ -15,7 +15,7 @@ */ #include -#include "dataset/engine/opt/util/printer_pass.h" +#include "minddata/dataset/engine/opt/util/printer_pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/opt/util/printer_pass.h b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h similarity index 97% rename from mindspore/ccsrc/dataset/engine/opt/util/printer_pass.h rename to mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h index 2552476ebd..527df3ccc9 100644 --- a/mindspore/ccsrc/dataset/engine/opt/util/printer_pass.h +++ b/mindspore/ccsrc/minddata/dataset/engine/opt/util/printer_pass.h @@ -18,7 +18,7 @@ #define DATASET_ENGINE_OPT_PASS_UTIL_PRINTER_H #include -#include "dataset/engine/opt/pass.h" +#include "minddata/dataset/engine/opt/pass.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/perf/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/perf/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/perf/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/perf/connector_size.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc similarity index 93% rename from mindspore/ccsrc/dataset/engine/perf/connector_size.cc rename to mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc index 0bd2754075..20b4908030 100644 --- a/mindspore/ccsrc/dataset/engine/perf/connector_size.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/perf/connector_size.h" +#include "minddata/dataset/engine/perf/connector_size.h" #include #include #include #include -#include "dataset/core/config_manager.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/util/path.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/path.h" using json = nlohmann::json; namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/perf/connector_size.h b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.h similarity index 95% rename from mindspore/ccsrc/dataset/engine/perf/connector_size.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.h index 2584289fb4..61ba06a76f 100644 --- a/mindspore/ccsrc/dataset/engine/perf/connector_size.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_size.h @@ -19,8 +19,8 @@ #include #include #include -#include "dataset/engine/perf/profiling.h" -#include "dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" using json = nlohmann::json; diff --git a/mindspore/ccsrc/dataset/engine/perf/connector_throughput.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_throughput.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/perf/connector_throughput.cc rename to mindspore/ccsrc/minddata/dataset/engine/perf/connector_throughput.cc index 4fd59de390..b5e2efaf73 100644 --- a/mindspore/ccsrc/dataset/engine/perf/connector_throughput.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_throughput.cc @@ -20,9 +20,9 @@ #include #include #include -#include "dataset/engine/perf/connector_throughput.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/util/path.h" +#include "minddata/dataset/engine/perf/connector_throughput.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/util/path.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/connector_throughput.h b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_throughput.h similarity index 92% rename from mindspore/ccsrc/dataset/engine/perf/connector_throughput.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/connector_throughput.h index 4dbb4cdad7..9cf387230a 100644 --- a/mindspore/ccsrc/dataset/engine/perf/connector_throughput.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/connector_throughput.h @@ -22,11 +22,11 @@ #include #include #include -#include "dataset/engine/perf/profiling.h" -#include "dataset/engine/perf/perf_data.h" -#include "dataset/engine/perf/cyclic_array.h" -#include "dataset/engine/datasetops/dataset_op.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/perf_data.h" +#include "minddata/dataset/engine/perf/cyclic_array.h" +#include "minddata/dataset/engine/datasetops/dataset_op.h" +#include "minddata/dataset/engine/execution_tree.h" using json = nlohmann::json; namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/perf/cyclic_array.h b/mindspore/ccsrc/minddata/dataset/engine/perf/cyclic_array.h similarity index 99% rename from mindspore/ccsrc/dataset/engine/perf/cyclic_array.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/cyclic_array.h index fa60b401c5..2dfc3fd99d 100644 --- a/mindspore/ccsrc/dataset/engine/perf/cyclic_array.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/cyclic_array.h @@ -21,7 +21,7 @@ #include #include #include -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/dataset_iterator_tracing.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/perf/dataset_iterator_tracing.cc rename to mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.cc index 99b0c2d7e0..4491db144e 100644 --- a/mindspore/ccsrc/dataset/engine/perf/dataset_iterator_tracing.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.cc @@ -15,8 +15,8 @@ */ #include #include -#include "dataset/engine/perf/dataset_iterator_tracing.h" -#include "dataset/util/path.h" +#include "minddata/dataset/engine/perf/dataset_iterator_tracing.h" +#include "minddata/dataset/util/path.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/dataset_iterator_tracing.h b/mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/perf/dataset_iterator_tracing.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.h index 129863c6d1..e7ba237a0a 100644 --- a/mindspore/ccsrc/dataset/engine/perf/dataset_iterator_tracing.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/dataset_iterator_tracing.h @@ -19,7 +19,7 @@ #include #include -#include "dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/profiling.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/device_queue_tracing.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.cc similarity index 95% rename from mindspore/ccsrc/dataset/engine/perf/device_queue_tracing.cc rename to mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.cc index 204a83e3fb..776b483b79 100644 --- a/mindspore/ccsrc/dataset/engine/perf/device_queue_tracing.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.cc @@ -16,8 +16,8 @@ #include #include -#include "dataset/engine/perf/device_queue_tracing.h" -#include "dataset/util/path.h" +#include "minddata/dataset/engine/perf/device_queue_tracing.h" +#include "minddata/dataset/util/path.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/device_queue_tracing.h b/mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.h similarity index 96% rename from mindspore/ccsrc/dataset/engine/perf/device_queue_tracing.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.h index 13ef7121c1..32f9d2d8c2 100644 --- a/mindspore/ccsrc/dataset/engine/perf/device_queue_tracing.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/device_queue_tracing.h @@ -19,7 +19,7 @@ #include #include -#include "dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/profiling.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/monitor.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/monitor.cc similarity index 91% rename from mindspore/ccsrc/dataset/engine/perf/monitor.cc rename to mindspore/ccsrc/minddata/dataset/engine/perf/monitor.cc index 8a0d682b81..7fa7e6fc78 100644 --- a/mindspore/ccsrc/dataset/engine/perf/monitor.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/monitor.cc @@ -15,9 +15,9 @@ */ #include -#include "dataset/core/config_manager.h" -#include "dataset/engine/perf/monitor.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/engine/perf/monitor.h" +#include "minddata/dataset/engine/execution_tree.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/monitor.h b/mindspore/ccsrc/minddata/dataset/engine/perf/monitor.h similarity index 93% rename from mindspore/ccsrc/dataset/engine/perf/monitor.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/monitor.h index 8b4245db8e..1e669dad71 100644 --- a/mindspore/ccsrc/dataset/engine/perf/monitor.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/monitor.h @@ -20,8 +20,8 @@ #include #include #include -#include "dataset/util/status.h" -#include "dataset/engine/perf/profiling.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/perf/profiling.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/perf_data.h b/mindspore/ccsrc/minddata/dataset/engine/perf/perf_data.h similarity index 98% rename from mindspore/ccsrc/dataset/engine/perf/perf_data.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/perf_data.h index a201d705ea..8f215fd8df 100644 --- a/mindspore/ccsrc/dataset/engine/perf/perf_data.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/perf_data.h @@ -18,7 +18,7 @@ #define DATASET_PERF_DATA_H #include -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/perf/profiling.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc similarity index 93% rename from mindspore/ccsrc/dataset/engine/perf/profiling.cc rename to mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc index 66f27c46ba..f5c018c03b 100644 --- a/mindspore/ccsrc/dataset/engine/perf/profiling.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/profiling.h" #include #include #include #include "common/utils.h" -#include "dataset/util/path.h" -#include "dataset/engine/perf/monitor.h" -#include "dataset/engine/perf/device_queue_tracing.h" -#include "dataset/engine/perf/connector_size.h" -#include "dataset/engine/perf/connector_throughput.h" -#include "dataset/engine/perf/dataset_iterator_tracing.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/engine/perf/monitor.h" +#include "minddata/dataset/engine/perf/device_queue_tracing.h" +#include "minddata/dataset/engine/perf/connector_size.h" +#include "minddata/dataset/engine/perf/connector_throughput.h" +#include "minddata/dataset/engine/perf/dataset_iterator_tracing.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/engine/perf/profiling.h b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.h similarity index 99% rename from mindspore/ccsrc/dataset/engine/perf/profiling.h rename to mindspore/ccsrc/minddata/dataset/engine/perf/profiling.h index e38c2d5e54..24f7f2efe8 100644 --- a/mindspore/ccsrc/dataset/engine/perf/profiling.h +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.h @@ -21,7 +21,7 @@ #include #include #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/tdt/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/engine/tdt/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/engine/tdt/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/engine/tdt/tdt_plugin.cc b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc similarity index 97% rename from mindspore/ccsrc/dataset/engine/tdt/tdt_plugin.cc rename to mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc index ca9f2176f5..126291179a 100644 --- a/mindspore/ccsrc/dataset/engine/tdt/tdt_plugin.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/engine/tdt/tdt_plugin.h" +#include "minddata/dataset/engine/tdt/tdt_plugin.h" #include "common/utils.h" #include "utils/log_adapter.h" -#include "dataset/engine/perf/profiling.h" +#include "minddata/dataset/engine/perf/profiling.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/engine/tdt/tdt_plugin.h b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.h similarity index 91% rename from mindspore/ccsrc/dataset/engine/tdt/tdt_plugin.h rename to mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.h index 304b205b81..a7db08b7f5 100644 --- a/mindspore/ccsrc/dataset/engine/tdt/tdt_plugin.h +++ b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.h @@ -24,9 +24,9 @@ #include #include "tdt/tdt_host_interface.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_row.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_row.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/include/dataset/core/constants.h b/mindspore/ccsrc/minddata/dataset/include/dataset/core/constants.h similarity index 100% rename from mindspore/ccsrc/dataset/include/dataset/core/constants.h rename to mindspore/ccsrc/minddata/dataset/include/dataset/core/constants.h diff --git a/mindspore/ccsrc/dataset/include/dataset/core/data_type.h b/mindspore/ccsrc/minddata/dataset/include/dataset/core/data_type.h similarity index 100% rename from mindspore/ccsrc/dataset/include/dataset/core/data_type.h rename to mindspore/ccsrc/minddata/dataset/include/dataset/core/data_type.h diff --git a/mindspore/ccsrc/dataset/include/dataset/core/tensor_shape.h b/mindspore/ccsrc/minddata/dataset/include/dataset/core/tensor_shape.h similarity index 100% rename from mindspore/ccsrc/dataset/include/dataset/core/tensor_shape.h rename to mindspore/ccsrc/minddata/dataset/include/dataset/core/tensor_shape.h diff --git a/mindspore/ccsrc/dataset/include/dataset/util/status.h b/mindspore/ccsrc/minddata/dataset/include/dataset/util/status.h similarity index 100% rename from mindspore/ccsrc/dataset/include/dataset/util/status.h rename to mindspore/ccsrc/minddata/dataset/include/dataset/util/status.h diff --git a/mindspore/ccsrc/dataset/include/datasets.h b/mindspore/ccsrc/minddata/dataset/include/datasets.h similarity index 99% rename from mindspore/ccsrc/dataset/include/datasets.h rename to mindspore/ccsrc/minddata/dataset/include/datasets.h index 586fff2107..6f38f5ea16 100644 --- a/mindspore/ccsrc/dataset/include/datasets.h +++ b/mindspore/ccsrc/minddata/dataset/include/datasets.h @@ -23,9 +23,9 @@ #include #include #include -#include "dataset/include/tensor.h" -#include "dataset/include/iterator.h" -#include "dataset/include/samplers.h" +#include "minddata/dataset/include/tensor.h" +#include "minddata/dataset/include/iterator.h" +#include "minddata/dataset/include/samplers.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/include/iterator.h b/mindspore/ccsrc/minddata/dataset/include/iterator.h similarity index 98% rename from mindspore/ccsrc/dataset/include/iterator.h rename to mindspore/ccsrc/minddata/dataset/include/iterator.h index 1c78031771..c3784821a6 100644 --- a/mindspore/ccsrc/dataset/include/iterator.h +++ b/mindspore/ccsrc/minddata/dataset/include/iterator.h @@ -21,7 +21,7 @@ #include #include #include -#include "dataset/include/status.h" +#include "minddata/dataset/include/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/include/samplers.h b/mindspore/ccsrc/minddata/dataset/include/samplers.h similarity index 100% rename from mindspore/ccsrc/dataset/include/samplers.h rename to mindspore/ccsrc/minddata/dataset/include/samplers.h diff --git a/mindspore/ccsrc/dataset/include/status.h b/mindspore/ccsrc/minddata/dataset/include/status.h similarity index 100% rename from mindspore/ccsrc/dataset/include/status.h rename to mindspore/ccsrc/minddata/dataset/include/status.h diff --git a/mindspore/ccsrc/dataset/include/tensor.h b/mindspore/ccsrc/minddata/dataset/include/tensor.h similarity index 100% rename from mindspore/ccsrc/dataset/include/tensor.h rename to mindspore/ccsrc/minddata/dataset/include/tensor.h diff --git a/mindspore/ccsrc/dataset/include/transforms.h b/mindspore/ccsrc/minddata/dataset/include/transforms.h similarity index 99% rename from mindspore/ccsrc/dataset/include/transforms.h rename to mindspore/ccsrc/minddata/dataset/include/transforms.h index c3a1540ae8..31531a20af 100644 --- a/mindspore/ccsrc/dataset/include/transforms.h +++ b/mindspore/ccsrc/minddata/dataset/include/transforms.h @@ -19,7 +19,7 @@ #include #include -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/minddata/dataset/include/utils/log_adapter.h b/mindspore/ccsrc/minddata/dataset/include/utils/log_adapter.h new file mode 120000 index 0000000000..f2c939bc0b --- /dev/null +++ b/mindspore/ccsrc/minddata/dataset/include/utils/log_adapter.h @@ -0,0 +1 @@ +../../../../utils/log_adapter.h \ No newline at end of file diff --git a/mindspore/ccsrc/minddata/dataset/include/utils/overload.h b/mindspore/ccsrc/minddata/dataset/include/utils/overload.h new file mode 120000 index 0000000000..7dc313d512 --- /dev/null +++ b/mindspore/ccsrc/minddata/dataset/include/utils/overload.h @@ -0,0 +1 @@ +../../../../utils/overload.h \ No newline at end of file diff --git a/mindspore/ccsrc/dataset/kernels/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/kernels/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/kernels/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/kernels/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/kernels/data/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/kernels/data/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/kernels/data/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/kernels/data/concatenate_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.cc similarity index 90% rename from mindspore/ccsrc/dataset/kernels/data/concatenate_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.cc index 87115fd3ce..0c91b38b2d 100644 --- a/mindspore/ccsrc/dataset/kernels/data/concatenate_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/concatenate_op.h" +#include "minddata/dataset/kernels/data/concatenate_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/concatenate_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.h similarity index 96% rename from mindspore/ccsrc/dataset/kernels/data/concatenate_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.h index b85d75a68e..46cc613049 100644 --- a/mindspore/ccsrc/dataset/kernels/data/concatenate_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/concatenate_op.h @@ -21,8 +21,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/data_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.cc similarity index 98% rename from mindspore/ccsrc/dataset/kernels/data/data_utils.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.cc index 0d437675f8..b1d51a6c08 100644 --- a/mindspore/ccsrc/dataset/kernels/data/data_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.cc @@ -14,22 +14,22 @@ * limitations under the License. */ -#include "dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/data/data_utils.h" #include #include #include #include -#include "dataset/core/constants.h" -#include "dataset/core/data_type.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/data_type.h" #ifdef ENABLE_PYTHON -#include "dataset/core/pybind_support.h" +#include "minddata/dataset/core/pybind_support.h" #endif -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/kernels/data/type_cast_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/kernels/data/type_cast_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/data_utils.h b/mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.h similarity index 97% rename from mindspore/ccsrc/dataset/kernels/data/data_utils.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.h index 6034e2a0eb..141545a583 100644 --- a/mindspore/ccsrc/dataset/kernels/data/data_utils.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/data_utils.h @@ -19,11 +19,11 @@ #include #include #include -#include "dataset/core/constants.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_row.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_row.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/duplicate_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.cc similarity index 87% rename from mindspore/ccsrc/dataset/kernels/data/duplicate_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.cc index 959516a4aa..57a424704f 100644 --- a/mindspore/ccsrc/dataset/kernels/data/duplicate_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "dataset/kernels/data/duplicate_op.h" +#include "minddata/dataset/kernels/data/duplicate_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/duplicate_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/data/duplicate_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.h index 598aa3407d..60b2d8c33b 100644 --- a/mindspore/ccsrc/dataset/kernels/data/duplicate_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/duplicate_op.h @@ -20,8 +20,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/fill_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/fill_op.cc similarity index 81% rename from mindspore/ccsrc/dataset/kernels/data/fill_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/fill_op.cc index 63895d3a95..f8dc746dff 100644 --- a/mindspore/ccsrc/dataset/kernels/data/fill_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/fill_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/fill_op.h" +#include "minddata/dataset/kernels/data/fill_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/fill_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/fill_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/data/fill_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/fill_op.h index 5338dbd2b3..af0d9e7941 100644 --- a/mindspore/ccsrc/dataset/kernels/data/fill_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/fill_op.h @@ -21,8 +21,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/mask_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/mask_op.cc similarity index 91% rename from mindspore/ccsrc/dataset/kernels/data/mask_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/mask_op.cc index 2cfeb7e36f..2dbe501a47 100644 --- a/mindspore/ccsrc/dataset/kernels/data/mask_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/mask_op.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "dataset/kernels/data/mask_op.h" +#include "minddata/dataset/kernels/data/mask_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/mask_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/mask_op.h similarity index 89% rename from mindspore/ccsrc/dataset/kernels/data/mask_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/mask_op.h index c610c43715..e6ac8c3964 100644 --- a/mindspore/ccsrc/dataset/kernels/data/mask_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/mask_op.h @@ -22,10 +22,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/kernels/data/type_cast_op.h" -#include "dataset/kernels/data/data_utils.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/kernels/data/type_cast_op.h" +#include "minddata/dataset/kernels/data/data_utils.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/one_hot_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc similarity index 88% rename from mindspore/ccsrc/dataset/kernels/data/one_hot_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc index 65d1a183b3..e2b7b74a96 100644 --- a/mindspore/ccsrc/dataset/kernels/data/one_hot_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/one_hot_op.h" +#include "minddata/dataset/kernels/data/one_hot_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/one_hot_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/data/one_hot_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.h index 6c789aa10e..06a4823573 100644 --- a/mindspore/ccsrc/dataset/kernels/data/one_hot_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/one_hot_op.h @@ -20,8 +20,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/pad_end_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/pad_end_op.cc similarity index 86% rename from mindspore/ccsrc/dataset/kernels/data/pad_end_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/pad_end_op.cc index 5b3b4cbe16..7b83137d88 100644 --- a/mindspore/ccsrc/dataset/kernels/data/pad_end_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/pad_end_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/pad_end_op.h" +#include "minddata/dataset/kernels/data/pad_end_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/pad_end_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/pad_end_op.h similarity index 94% rename from mindspore/ccsrc/dataset/kernels/data/pad_end_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/pad_end_op.h index eeb4ce4695..c28f7250e0 100644 --- a/mindspore/ccsrc/dataset/kernels/data/pad_end_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/pad_end_op.h @@ -20,8 +20,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/slice_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/slice_op.cc similarity index 91% rename from mindspore/ccsrc/dataset/kernels/data/slice_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/slice_op.cc index 2eebf26e84..66f48d5c2b 100644 --- a/mindspore/ccsrc/dataset/kernels/data/slice_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/slice_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/slice_op.h" +#include "minddata/dataset/kernels/data/slice_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/slice_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/slice_op.h similarity index 96% rename from mindspore/ccsrc/dataset/kernels/data/slice_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/slice_op.h index b180c9d0a9..1cf99830c9 100644 --- a/mindspore/ccsrc/dataset/kernels/data/slice_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/slice_op.h @@ -22,8 +22,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/to_float16_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/to_float16_op.cc similarity index 84% rename from mindspore/ccsrc/dataset/kernels/data/to_float16_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/to_float16_op.cc index 1cd79456e0..c52162b1aa 100644 --- a/mindspore/ccsrc/dataset/kernels/data/to_float16_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/to_float16_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/to_float16_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/kernels/data/to_float16_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/to_float16_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/to_float16_op.h similarity index 94% rename from mindspore/ccsrc/dataset/kernels/data/to_float16_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/to_float16_op.h index b4aa84d10e..91f660ca9c 100644 --- a/mindspore/ccsrc/dataset/kernels/data/to_float16_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/to_float16_op.h @@ -22,8 +22,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/type_cast_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc similarity index 85% rename from mindspore/ccsrc/dataset/kernels/data/type_cast_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc index 74c84a668a..5a58745293 100644 --- a/mindspore/ccsrc/dataset/kernels/data/type_cast_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/data/type_cast_op.h" +#include "minddata/dataset/kernels/data/type_cast_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/data/type_cast_op.h b/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.h similarity index 94% rename from mindspore/ccsrc/dataset/kernels/data/type_cast_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.h index 82fc4bea35..b82bc32342 100644 --- a/mindspore/ccsrc/dataset/kernels/data/type_cast_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/data/type_cast_op.h @@ -20,8 +20,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/kernels/image/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/kernels/image/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/kernels/image/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/kernels/image/bounding_box_augment_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.cc similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/bounding_box_augment_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.cc index 8f738b6e78..618ed4d356 100644 --- a/mindspore/ccsrc/dataset/kernels/image/bounding_box_augment_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.cc @@ -16,10 +16,10 @@ #include #include -#include "dataset/kernels/image/bounding_box_augment_op.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/bounding_box_augment_op.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/core/cv_tensor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/bounding_box_augment_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.h similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/bounding_box_augment_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.h index 9b1d2d18dd..8e30c5738d 100644 --- a/mindspore/ccsrc/dataset/kernels/image/bounding_box_augment_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/bounding_box_augment_op.h @@ -22,10 +22,10 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/center_crop_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/center_crop_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc index a5129e9c71..35079b05cd 100644 --- a/mindspore/ccsrc/dataset/kernels/image/center_crop_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/center_crop_op.h" +#include "minddata/dataset/kernels/image/center_crop_op.h" #include #include "common/utils.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/center_crop_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.h similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/center_crop_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.h index 87164fe816..1f8cbcf230 100644 --- a/mindspore/ccsrc/dataset/kernels/image/center_crop_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/cut_out_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/cut_out_op.cc similarity index 86% rename from mindspore/ccsrc/dataset/kernels/image/cut_out_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/cut_out_op.cc index 74d9df5d6b..578138d427 100644 --- a/mindspore/ccsrc/dataset/kernels/image/cut_out_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/cut_out_op.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/cut_out_op.h" +#include "minddata/dataset/kernels/image/cut_out_op.h" #include -#include "dataset/core/config_manager.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/cut_out_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/cut_out_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/cut_out_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/cut_out_op.h index 5c46e5f013..263cbdb27c 100644 --- a/mindspore/ccsrc/dataset/kernels/image/cut_out_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/cut_out_op.h @@ -22,10 +22,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/decode_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/decode_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc index ef6cf88b3b..5bc5377de9 100644 --- a/mindspore/ccsrc/dataset/kernels/image/decode_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/decode_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/decode_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.h similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/decode_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.h index f55baf62b4..29bf1d0146 100644 --- a/mindspore/ccsrc/dataset/kernels/image/decode_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/decode_op.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/hwc_to_chw_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/hwc_to_chw_op.cc similarity index 89% rename from mindspore/ccsrc/dataset/kernels/image/hwc_to_chw_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/hwc_to_chw_op.cc index 8ed2229cd1..5013958562 100644 --- a/mindspore/ccsrc/dataset/kernels/image/hwc_to_chw_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/hwc_to_chw_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/hwc_to_chw_op.h" +#include "minddata/dataset/kernels/image/hwc_to_chw_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/hwc_to_chw_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/hwc_to_chw_op.h similarity index 90% rename from mindspore/ccsrc/dataset/kernels/image/hwc_to_chw_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/hwc_to_chw_op.h index 5e1d442148..0d5f70f895 100644 --- a/mindspore/ccsrc/dataset/kernels/image/hwc_to_chw_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/hwc_to_chw_op.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc similarity index 99% rename from mindspore/ccsrc/dataset/kernels/image/image_utils.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc index 5bf7b6ba8e..ddbce3e23a 100644 --- a/mindspore/ccsrc/dataset/kernels/image/image_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/image_utils.h" #include #include #include @@ -21,11 +21,11 @@ #include #include #include "common/utils.h" -#include "dataset/core/constants.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/util/random.h" #define MAX_INT_PRECISION 16777216 // float int precision is 16777216 namespace mindspore { diff --git a/mindspore/ccsrc/dataset/kernels/image/image_utils.h b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h similarity index 99% rename from mindspore/ccsrc/dataset/kernels/image/image_utils.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h index 212d81f7fc..f489c7367b 100644 --- a/mindspore/ccsrc/dataset/kernels/image/image_utils.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.h @@ -29,9 +29,9 @@ #include "./jpeglib.h" #include "./jerror.h" #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/normalize_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/normalize_op.cc similarity index 89% rename from mindspore/ccsrc/dataset/kernels/image/normalize_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/normalize_op.cc index 638eaad264..de5deb31ef 100644 --- a/mindspore/ccsrc/dataset/kernels/image/normalize_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/normalize_op.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/normalize_op.h" +#include "minddata/dataset/kernels/image/normalize_op.h" #include -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/normalize_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/normalize_op.h similarity index 88% rename from mindspore/ccsrc/dataset/kernels/image/normalize_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/normalize_op.h index a66f95a2b5..7821869c8f 100644 --- a/mindspore/ccsrc/dataset/kernels/image/normalize_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/normalize_op.h @@ -19,10 +19,10 @@ #include #include -#include "dataset/core/cv_tensor.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/pad_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/pad_op.cc similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/pad_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/pad_op.cc index baeceeed77..52f32e2b1b 100644 --- a/mindspore/ccsrc/dataset/kernels/image/pad_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/pad_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/pad_op.h" +#include "minddata/dataset/kernels/image/pad_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/core/constants.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/pad_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/pad_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/pad_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/pad_op.h index 0457fbc01b..9437058406 100644 --- a/mindspore/ccsrc/dataset/kernels/image/pad_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/pad_op.h @@ -20,10 +20,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/core/constants.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_color_adjust_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_color_adjust_op.cc similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/random_color_adjust_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_color_adjust_op.cc index e420f86e9a..6dbf30c33e 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_color_adjust_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_color_adjust_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_color_adjust_op.h" +#include "minddata/dataset/kernels/image/random_color_adjust_op.h" #include -#include "dataset/core/config_manager.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_color_adjust_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_color_adjust_op.h similarity index 96% rename from mindspore/ccsrc/dataset/kernels/image/random_color_adjust_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_color_adjust_op.h index 23ccf4aa93..fb29b57062 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_color_adjust_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_color_adjust_op.h @@ -21,9 +21,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc index c5b5f20c63..8a7364d666 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" #include -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.h index 04e4135e7b..41d775fdf7 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_op.h @@ -21,10 +21,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc similarity index 89% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc index fbaf2c9326..98bfe41241 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.cc @@ -17,10 +17,10 @@ #include #include -#include "dataset/util/random.h" -#include "dataset/util/status.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/image/random_crop_and_resize_with_bbox_op.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h similarity index 96% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h index 2e28495658..ddaac10fac 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h @@ -16,7 +16,7 @@ #ifndef DATASET_KERNELS_IMAGE_RANDOM_CROP_AND_RESIZE_WITH_BBOX_OP_H_ #define DATASET_KERNELS_IMAGE_RANDOM_CROP_AND_RESIZE_WITH_BBOX_OP_H_ -#include "dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_decode_resize_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_decode_resize_op.cc similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_decode_resize_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_decode_resize_op.cc index 36d80aea98..d62aebd37f 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_decode_resize_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_decode_resize_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_crop_decode_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_decode_resize_op.h" #include -#include "dataset/kernels/image/image_utils.h" -#include "dataset/core/config_manager.h" -#include "dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/kernels/image/decode_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_decode_resize_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_decode_resize_op.h similarity index 86% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_decode_resize_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_decode_resize_op.h index 57d1161961..863fd48c14 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_decode_resize_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_decode_resize_op.h @@ -20,12 +20,12 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/image/random_crop_and_resize_op.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc index 110d769f26..51772e9ec3 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_crop_op.h" +#include "minddata/dataset/kernels/image/random_crop_op.h" #include -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.h similarity index 95% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.h index f0b1ec828c..44f1789f9d 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_op.h @@ -21,10 +21,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_with_bbox_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.cc similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_with_bbox_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.cc index c873307afd..08b12b8b70 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_with_bbox_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.cc @@ -18,10 +18,10 @@ #include #include -#include "dataset/kernels/image/random_crop_with_bbox_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/random_crop_with_bbox_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_crop_with_bbox_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.h similarity index 97% rename from mindspore/ccsrc/dataset/kernels/image/random_crop_with_bbox_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.h index 37b5ffc38b..bfcd1610d3 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_crop_with_bbox_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_crop_with_bbox_op.h @@ -20,7 +20,7 @@ #include #include -#include "dataset/kernels/image/random_crop_op.h" +#include "minddata/dataset/kernels/image/random_crop_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_op.cc similarity index 85% rename from mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_op.cc index ae76e1bf59..5e8ab8a634 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_horizontal_flip_op.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_op.h similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_op.h index a0ea3822d3..9e08929180 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_op.h @@ -20,10 +20,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc similarity index 90% rename from mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc index cf8a4640ff..809f564b18 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.cc @@ -14,10 +14,10 @@ * limitations under the License. */ #include -#include "dataset/kernels/image/random_horizontal_flip_with_bbox_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/cv_tensor.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h index 3480e2ac6b..d98669ea13 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h @@ -21,10 +21,10 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_resize_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_op.cc similarity index 81% rename from mindspore/ccsrc/dataset/kernels/image/random_resize_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_op.cc index c14224a930..8736f0a6a5 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_resize_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_resize_op.h" +#include "minddata/dataset/kernels/image/random_resize_op.h" #include -#include "dataset/core/config_manager.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_resize_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_op.h similarity index 88% rename from mindspore/ccsrc/dataset/kernels/image/random_resize_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_op.h index 9e60867353..8b2b067751 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_resize_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_op.h @@ -20,11 +20,11 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_resize_with_bbox_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_with_bbox_op.cc similarity index 86% rename from mindspore/ccsrc/dataset/kernels/image/random_resize_with_bbox_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_with_bbox_op.cc index de69c02e39..e099b78a0f 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_resize_with_bbox_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_with_bbox_op.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "dataset/kernels/image/random_resize_with_bbox_op.h" -#include "dataset/kernels/image/resize_with_bbox_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/random_resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/resize_with_bbox_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_resize_with_bbox_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_with_bbox_op.h similarity index 85% rename from mindspore/ccsrc/dataset/kernels/image/random_resize_with_bbox_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_with_bbox_op.h index e5106f9cf5..6bad0d30fa 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_resize_with_bbox_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_resize_with_bbox_op.h @@ -21,12 +21,12 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/image/resize_with_bbox_op.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/resize_with_bbox_op.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_rotation_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_rotation_op.cc similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/random_rotation_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_rotation_op.cc index 65e024865b..b2cb4facae 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_rotation_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_rotation_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_rotation_op.h" +#include "minddata/dataset/kernels/image/random_rotation_op.h" #include -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/random.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_rotation_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_rotation_op.h similarity index 94% rename from mindspore/ccsrc/dataset/kernels/image/random_rotation_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_rotation_op.h index 7ae65fe02b..ea679ccb56 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_rotation_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_rotation_op.h @@ -21,10 +21,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" -#include "dataset/kernels/image/image_utils.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_op.cc similarity index 85% rename from mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_op.cc index 096923a9ec..24d816ef1a 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_op.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "dataset/kernels/image/random_vertical_flip_op.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_op.h similarity index 90% rename from mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_op.h index 3664ed7d3a..cee5869c71 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_op.h @@ -20,10 +20,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc index 7e897536e8..7d2fa7bab5 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.cc @@ -16,9 +16,9 @@ #include -#include "dataset/util/status.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/image/random_vertical_flip_with_bbox_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_with_bbox_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.h similarity index 90% rename from mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_with_bbox_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.h index 15a96fe749..c9f19f5217 100644 --- a/mindspore/ccsrc/dataset/kernels/image/random_vertical_flip_with_bbox_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.h @@ -20,10 +20,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" -#include "dataset/util/random.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/rescale_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/rescale_op.cc similarity index 87% rename from mindspore/ccsrc/dataset/kernels/image/rescale_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/rescale_op.cc index fd1807991c..2a500d6c34 100644 --- a/mindspore/ccsrc/dataset/kernels/image/rescale_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/rescale_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/rescale_op.h" +#include "minddata/dataset/kernels/image/rescale_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/rescale_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/rescale_op.h similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/rescale_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/rescale_op.h index b91226a9f8..c70b7bf6cf 100644 --- a/mindspore/ccsrc/dataset/kernels/image/rescale_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/rescale_op.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/resize_bilinear_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_bilinear_op.cc similarity index 89% rename from mindspore/ccsrc/dataset/kernels/image/resize_bilinear_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/resize_bilinear_op.cc index 658caac6a5..48a8fbbc53 100644 --- a/mindspore/ccsrc/dataset/kernels/image/resize_bilinear_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_bilinear_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/resize_bilinear_op.h" +#include "minddata/dataset/kernels/image/resize_bilinear_op.h" #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/resize_bilinear_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_bilinear_op.h similarity index 91% rename from mindspore/ccsrc/dataset/kernels/image/resize_bilinear_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/resize_bilinear_op.h index c14beda067..fd8f940946 100644 --- a/mindspore/ccsrc/dataset/kernels/image/resize_bilinear_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_bilinear_op.h @@ -20,10 +20,10 @@ #include #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/resize_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_op.cc similarity index 94% rename from mindspore/ccsrc/dataset/kernels/image/resize_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/resize_op.cc index 7c0252188e..7456f50f32 100644 --- a/mindspore/ccsrc/dataset/kernels/image/resize_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_op.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/resize_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/resize_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_op.h similarity index 92% rename from mindspore/ccsrc/dataset/kernels/image/resize_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/resize_op.h index efbe9dab06..3f847243ff 100644 --- a/mindspore/ccsrc/dataset/kernels/image/resize_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_op.h @@ -20,10 +20,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/resize_with_bbox_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_with_bbox_op.cc similarity index 80% rename from mindspore/ccsrc/dataset/kernels/image/resize_with_bbox_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/resize_with_bbox_op.cc index 8a633d5678..9df2d8a25e 100644 --- a/mindspore/ccsrc/dataset/kernels/image/resize_with_bbox_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_with_bbox_op.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "dataset/kernels/image/resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/resize_with_bbox_op.h" #include #include -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/pybind_support.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/pybind_support.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/resize_with_bbox_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_with_bbox_op.h similarity index 86% rename from mindspore/ccsrc/dataset/kernels/image/resize_with_bbox_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/resize_with_bbox_op.h index 2fa3e711b8..d2b5c96bf3 100644 --- a/mindspore/ccsrc/dataset/kernels/image/resize_with_bbox_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/resize_with_bbox_op.h @@ -17,11 +17,11 @@ #define DATASET_KERNELS_IMAGE_RESIZE_WITH_BBOX_OP_H #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/image/image_utils.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" -#include "dataset/kernels/image/resize_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/kernels/image/resize_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/uniform_aug_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.cc similarity index 95% rename from mindspore/ccsrc/dataset/kernels/image/uniform_aug_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.cc index 7889b3b157..95d75af0f2 100644 --- a/mindspore/ccsrc/dataset/kernels/image/uniform_aug_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include -#include "dataset/kernels/image/uniform_aug_op.h" -#include "dataset/util/random.h" +#include "minddata/dataset/kernels/image/uniform_aug_op.h" +#include "minddata/dataset/util/random.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/image/uniform_aug_op.h b/mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/image/uniform_aug_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.h index aa96b9f33c..0ae0fda92b 100644 --- a/mindspore/ccsrc/dataset/kernels/image/uniform_aug_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/uniform_aug_op.h @@ -21,9 +21,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/no_op.h b/mindspore/ccsrc/minddata/dataset/kernels/no_op.h similarity index 92% rename from mindspore/ccsrc/dataset/kernels/no_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/no_op.h index 83d0d4baa7..f5a6a58f2b 100644 --- a/mindspore/ccsrc/dataset/kernels/no_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/no_op.h @@ -19,8 +19,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/py_func_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/py_func_op.cc similarity index 94% rename from mindspore/ccsrc/dataset/kernels/py_func_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/py_func_op.cc index 0a6a1452b5..f501dd4b4f 100644 --- a/mindspore/ccsrc/dataset/kernels/py_func_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/py_func_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/py_func_op.h" +#include "minddata/dataset/kernels/py_func_op.h" #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/py_func_op.h b/mindspore/ccsrc/minddata/dataset/kernels/py_func_op.h similarity index 93% rename from mindspore/ccsrc/dataset/kernels/py_func_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/py_func_op.h index 473e75ec97..75d222b433 100644 --- a/mindspore/ccsrc/dataset/kernels/py_func_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/py_func_op.h @@ -22,8 +22,8 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/kernels/tensor_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/tensor_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/kernels/tensor_op.cc rename to mindspore/ccsrc/minddata/dataset/kernels/tensor_op.cc index 92aef8dc9e..b625e3b532 100644 --- a/mindspore/ccsrc/dataset/kernels/tensor_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/tensor_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/kernels/tensor_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/kernels/tensor_op.h b/mindspore/ccsrc/minddata/dataset/kernels/tensor_op.h similarity index 98% rename from mindspore/ccsrc/dataset/kernels/tensor_op.h rename to mindspore/ccsrc/minddata/dataset/kernels/tensor_op.h index 444919b78d..3bcba4b463 100644 --- a/mindspore/ccsrc/dataset/kernels/tensor_op.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/tensor_op.h @@ -20,9 +20,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_row.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_row.h" +#include "minddata/dataset/util/status.h" #define IO_CHECK(input, output) \ do { \ diff --git a/mindspore/ccsrc/dataset/text/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/text/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/text/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/text/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/text/kernels/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/text/kernels/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/text/kernels/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/text/kernels/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/text/kernels/basic_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.cc similarity index 99% rename from mindspore/ccsrc/dataset/text/kernels/basic_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.cc index c0217b2083..6195572944 100644 --- a/mindspore/ccsrc/dataset/text/kernels/basic_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/basic_tokenizer_op.h" +#include "minddata/dataset/text/kernels/basic_tokenizer_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/basic_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.h similarity index 87% rename from mindspore/ccsrc/dataset/text/kernels/basic_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.h index 96bf3e1ae2..cbc21273c2 100644 --- a/mindspore/ccsrc/dataset/text/kernels/basic_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/basic_tokenizer_op.h @@ -19,13 +19,13 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/text/kernels/case_fold_op.h" -#include "dataset/text/kernels/normalize_utf8_op.h" -#include "dataset/text/kernels/regex_replace_op.h" -#include "dataset/text/kernels/regex_tokenizer_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/text/kernels/case_fold_op.h" +#include "minddata/dataset/text/kernels/normalize_utf8_op.h" +#include "minddata/dataset/text/kernels/regex_replace_op.h" +#include "minddata/dataset/text/kernels/regex_tokenizer_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/bert_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/bert_tokenizer_op.cc similarity index 94% rename from mindspore/ccsrc/dataset/text/kernels/bert_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/bert_tokenizer_op.cc index 3e7f1251ed..631597ba24 100644 --- a/mindspore/ccsrc/dataset/text/kernels/bert_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/bert_tokenizer_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/bert_tokenizer_op.h" +#include "minddata/dataset/text/kernels/bert_tokenizer_op.h" namespace mindspore { namespace dataset { Status BertTokenizerOp::Compute(const TensorRow &input, TensorRow *output) { diff --git a/mindspore/ccsrc/dataset/text/kernels/bert_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/bert_tokenizer_op.h similarity index 90% rename from mindspore/ccsrc/dataset/text/kernels/bert_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/bert_tokenizer_op.h index b3ae1d2ab1..b281903349 100644 --- a/mindspore/ccsrc/dataset/text/kernels/bert_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/bert_tokenizer_op.h @@ -18,11 +18,11 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/text/kernels/basic_tokenizer_op.h" -#include "dataset/text/kernels/wordpiece_tokenizer_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/text/kernels/basic_tokenizer_op.h" +#include "minddata/dataset/text/kernels/wordpiece_tokenizer_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/case_fold_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/case_fold_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/text/kernels/case_fold_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/case_fold_op.cc index d935608efd..0ea5cadedb 100644 --- a/mindspore/ccsrc/dataset/text/kernels/case_fold_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/case_fold_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/case_fold_op.h" +#include "minddata/dataset/text/kernels/case_fold_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/case_fold_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/case_fold_op.h similarity index 90% rename from mindspore/ccsrc/dataset/text/kernels/case_fold_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/case_fold_op.h index 87fe05ae8d..f7a2105269 100644 --- a/mindspore/ccsrc/dataset/text/kernels/case_fold_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/case_fold_op.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/jieba_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/text/kernels/jieba_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.cc index b221e9cafd..0a1ae92d14 100644 --- a/mindspore/ccsrc/dataset/text/kernels/jieba_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/jieba_tokenizer_op.h" +#include "minddata/dataset/text/kernels/jieba_tokenizer_op.h" #include #include #include -#include "dataset/util/path.h" +#include "minddata/dataset/util/path.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/jieba_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.h similarity index 96% rename from mindspore/ccsrc/dataset/text/kernels/jieba_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.h index 09123d0e34..4e49891c00 100644 --- a/mindspore/ccsrc/dataset/text/kernels/jieba_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/jieba_tokenizer_op.h @@ -20,8 +20,8 @@ #include #include "cppjieba/Jieba.hpp" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/lookup_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/text/kernels/lookup_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.cc index 1793301e1d..02b75bc4f9 100644 --- a/mindspore/ccsrc/dataset/text/kernels/lookup_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/lookup_op.h" +#include "minddata/dataset/text/kernels/lookup_op.h" #include diff --git a/mindspore/ccsrc/dataset/text/kernels/lookup_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.h similarity index 91% rename from mindspore/ccsrc/dataset/text/kernels/lookup_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.h index 7ef259474e..4efc64321b 100644 --- a/mindspore/ccsrc/dataset/text/kernels/lookup_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/lookup_op.h @@ -22,10 +22,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" -#include "dataset/text/vocab.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/text/vocab.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/ngram_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/text/kernels/ngram_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.cc index bbe449a89a..36781b9b4d 100644 --- a/mindspore/ccsrc/dataset/text/kernels/ngram_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "dataset/text/kernels/ngram_op.h" +#include "minddata/dataset/text/kernels/ngram_op.h" #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/ngram_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.h similarity index 95% rename from mindspore/ccsrc/dataset/text/kernels/ngram_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.h index 33d2587f9b..6ce3881638 100644 --- a/mindspore/ccsrc/dataset/text/kernels/ngram_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/ngram_op.h @@ -21,9 +21,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/normalize_utf8_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/normalize_utf8_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/text/kernels/normalize_utf8_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/normalize_utf8_op.cc index b902286576..0c0aa5fa2d 100644 --- a/mindspore/ccsrc/dataset/text/kernels/normalize_utf8_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/normalize_utf8_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/normalize_utf8_op.h" +#include "minddata/dataset/text/kernels/normalize_utf8_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/normalize_utf8_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/normalize_utf8_op.h similarity index 91% rename from mindspore/ccsrc/dataset/text/kernels/normalize_utf8_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/normalize_utf8_op.h index d85f0fdf8f..f914be1c58 100644 --- a/mindspore/ccsrc/dataset/text/kernels/normalize_utf8_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/normalize_utf8_op.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/regex_replace_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_replace_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/text/kernels/regex_replace_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/regex_replace_op.cc index 1ce2c5ea61..c370393e76 100644 --- a/mindspore/ccsrc/dataset/text/kernels/regex_replace_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_replace_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/regex_replace_op.h" +#include "minddata/dataset/text/kernels/regex_replace_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/regex_replace_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_replace_op.h similarity index 93% rename from mindspore/ccsrc/dataset/text/kernels/regex_replace_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/regex_replace_op.h index 9e4ae243e7..ac3d3f7ff0 100644 --- a/mindspore/ccsrc/dataset/text/kernels/regex_replace_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_replace_op.h @@ -22,9 +22,9 @@ #include "unicode/errorcode.h" #include "unicode/utypes.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/regex_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_tokenizer_op.cc similarity index 99% rename from mindspore/ccsrc/dataset/text/kernels/regex_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/regex_tokenizer_op.cc index b15df9af67..7ff1d994be 100644 --- a/mindspore/ccsrc/dataset/text/kernels/regex_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_tokenizer_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/regex_tokenizer_op.h" +#include "minddata/dataset/text/kernels/regex_tokenizer_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/regex_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_tokenizer_op.h similarity index 94% rename from mindspore/ccsrc/dataset/text/kernels/regex_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/regex_tokenizer_op.h index 174a8419b0..56271f9551 100644 --- a/mindspore/ccsrc/dataset/text/kernels/regex_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/regex_tokenizer_op.h @@ -23,9 +23,9 @@ #include "unicode/errorcode.h" #include "unicode/utypes.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/to_number_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/text/kernels/to_number_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc index 1368684daf..a6685a2d64 100644 --- a/mindspore/ccsrc/dataset/text/kernels/to_number_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "dataset/text/kernels/to_number_op.h" +#include "minddata/dataset/text/kernels/to_number_op.h" #include #include @@ -23,11 +23,11 @@ #include #include -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/kernels/data/data_utils.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/kernels/data/data_utils.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/to_number_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h similarity index 93% rename from mindspore/ccsrc/dataset/text/kernels/to_number_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h index 765749b778..8582fcf073 100644 --- a/mindspore/ccsrc/dataset/text/kernels/to_number_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/to_number_op.h @@ -21,10 +21,10 @@ #include #include -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.cc similarity index 90% rename from mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.cc index 136d5006df..53a803c542 100644 --- a/mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "dataset/text/kernels/truncate_sequence_pair_op.h" +#include "minddata/dataset/text/kernels/truncate_sequence_pair_op.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/kernels/data/slice_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/kernels/data/slice_op.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.h similarity index 87% rename from mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.h index e9bd00f9de..ce82735645 100644 --- a/mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.h @@ -22,10 +22,10 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/kernels/data/type_cast_op.h" -#include "dataset/kernels/data/data_utils.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/kernels/data/type_cast_op.h" +#include "minddata/dataset/kernels/data/data_utils.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/unicode_char_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.cc similarity index 97% rename from mindspore/ccsrc/dataset/text/kernels/unicode_char_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.cc index d2bd22058b..e08f61100b 100644 --- a/mindspore/ccsrc/dataset/text/kernels/unicode_char_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/unicode_char_tokenizer_op.h" +#include "minddata/dataset/text/kernels/unicode_char_tokenizer_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/unicode_char_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.h similarity index 91% rename from mindspore/ccsrc/dataset/text/kernels/unicode_char_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.h index 116b8028da..415d99b451 100644 --- a/mindspore/ccsrc/dataset/text/kernels/unicode_char_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_char_tokenizer_op.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/unicode_script_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/text/kernels/unicode_script_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.cc index 0760fea90a..60fe8dd0e4 100644 --- a/mindspore/ccsrc/dataset/text/kernels/unicode_script_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/unicode_script_tokenizer_op.h" +#include "minddata/dataset/text/kernels/unicode_script_tokenizer_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/unicode_script_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.h similarity index 92% rename from mindspore/ccsrc/dataset/text/kernels/unicode_script_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.h index ec1be52533..fc3b9e620a 100644 --- a/mindspore/ccsrc/dataset/text/kernels/unicode_script_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/unicode_script_tokenizer_op.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/whitespace_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.cc similarity index 98% rename from mindspore/ccsrc/dataset/text/kernels/whitespace_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.cc index 16bc2c87a3..d3bb32081e 100644 --- a/mindspore/ccsrc/dataset/text/kernels/whitespace_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/text/kernels/whitespace_tokenizer_op.h" +#include "minddata/dataset/text/kernels/whitespace_tokenizer_op.h" #include #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/whitespace_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.h similarity index 91% rename from mindspore/ccsrc/dataset/text/kernels/whitespace_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.h index e507e5b393..7cc37fd705 100644 --- a/mindspore/ccsrc/dataset/text/kernels/whitespace_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/whitespace_tokenizer_op.h @@ -18,9 +18,9 @@ #include #include -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/kernels/wordpiece_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/wordpiece_tokenizer_op.cc similarity index 96% rename from mindspore/ccsrc/dataset/text/kernels/wordpiece_tokenizer_op.cc rename to mindspore/ccsrc/minddata/dataset/text/kernels/wordpiece_tokenizer_op.cc index b97f696da7..f0bd448e39 100644 --- a/mindspore/ccsrc/dataset/text/kernels/wordpiece_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/wordpiece_tokenizer_op.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "dataset/text/kernels/wordpiece_tokenizer_op.h" +#include "minddata/dataset/text/kernels/wordpiece_tokenizer_op.h" #include #include diff --git a/mindspore/ccsrc/dataset/text/kernels/wordpiece_tokenizer_op.h b/mindspore/ccsrc/minddata/dataset/text/kernels/wordpiece_tokenizer_op.h similarity index 91% rename from mindspore/ccsrc/dataset/text/kernels/wordpiece_tokenizer_op.h rename to mindspore/ccsrc/minddata/dataset/text/kernels/wordpiece_tokenizer_op.h index 502da4cef2..4f9c76f57e 100644 --- a/mindspore/ccsrc/dataset/text/kernels/wordpiece_tokenizer_op.h +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/wordpiece_tokenizer_op.h @@ -22,10 +22,10 @@ #include "cppjieba/Unicode.hpp" -#include "dataset/core/tensor.h" -#include "dataset/kernels/tensor_op.h" -#include "dataset/text/vocab.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/tensor_op.h" +#include "minddata/dataset/text/vocab.h" +#include "minddata/dataset/util/status.h" using cppjieba::DecodeRunesInString; using cppjieba::RuneStrArray; diff --git a/mindspore/ccsrc/dataset/text/vocab.cc b/mindspore/ccsrc/minddata/dataset/text/vocab.cc similarity index 99% rename from mindspore/ccsrc/dataset/text/vocab.cc rename to mindspore/ccsrc/minddata/dataset/text/vocab.cc index 399a9dee37..c1b7e6265c 100644 --- a/mindspore/ccsrc/dataset/text/vocab.cc +++ b/mindspore/ccsrc/minddata/dataset/text/vocab.cc @@ -18,7 +18,7 @@ #include #include -#include "dataset/text/vocab.h" +#include "minddata/dataset/text/vocab.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/text/vocab.h b/mindspore/ccsrc/minddata/dataset/text/vocab.h similarity index 98% rename from mindspore/ccsrc/dataset/text/vocab.h rename to mindspore/ccsrc/minddata/dataset/text/vocab.h index 410b0aeeca..6bf6c488c5 100644 --- a/mindspore/ccsrc/dataset/text/vocab.h +++ b/mindspore/ccsrc/minddata/dataset/text/vocab.h @@ -22,7 +22,7 @@ #include #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" diff --git a/mindspore/ccsrc/dataset/util/.gitignore b/mindspore/ccsrc/minddata/dataset/util/.gitignore similarity index 100% rename from mindspore/ccsrc/dataset/util/.gitignore rename to mindspore/ccsrc/minddata/dataset/util/.gitignore diff --git a/mindspore/ccsrc/dataset/util/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/util/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/dataset/util/CMakeLists.txt rename to mindspore/ccsrc/minddata/dataset/util/CMakeLists.txt diff --git a/mindspore/ccsrc/dataset/util/README.md b/mindspore/ccsrc/minddata/dataset/util/README.md similarity index 100% rename from mindspore/ccsrc/dataset/util/README.md rename to mindspore/ccsrc/minddata/dataset/util/README.md diff --git a/mindspore/ccsrc/dataset/util/allocator.h b/mindspore/ccsrc/minddata/dataset/util/allocator.h similarity index 99% rename from mindspore/ccsrc/dataset/util/allocator.h rename to mindspore/ccsrc/minddata/dataset/util/allocator.h index 1998716438..b5eaed97a6 100644 --- a/mindspore/ccsrc/dataset/util/allocator.h +++ b/mindspore/ccsrc/minddata/dataset/util/allocator.h @@ -21,7 +21,7 @@ #include #include #include -#include "dataset/util/memory_pool.h" +#include "minddata/dataset/util/memory_pool.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/arena.cc b/mindspore/ccsrc/minddata/dataset/util/arena.cc similarity index 98% rename from mindspore/ccsrc/dataset/util/arena.cc rename to mindspore/ccsrc/minddata/dataset/util/arena.cc index af4f522678..87a9c614a8 100644 --- a/mindspore/ccsrc/dataset/util/arena.cc +++ b/mindspore/ccsrc/minddata/dataset/util/arena.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/arena.h" +#include "minddata/dataset/util/arena.h" #include #include -#include "dataset/util/system_pool.h" +#include "minddata/dataset/util/system_pool.h" #include "./securec.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/util/arena.h b/mindspore/ccsrc/minddata/dataset/util/arena.h similarity index 97% rename from mindspore/ccsrc/dataset/util/arena.h rename to mindspore/ccsrc/minddata/dataset/util/arena.h index 8c5d1e1093..8887757af1 100644 --- a/mindspore/ccsrc/dataset/util/arena.h +++ b/mindspore/ccsrc/minddata/dataset/util/arena.h @@ -19,8 +19,8 @@ #include #include #include -#include "dataset/util/memory_pool.h" -#include "dataset/util/treap.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/treap.h" #define ARENA_LOG_BLK_SZ (6u) #define ARENA_BLK_SZ (static_cast(1u << ARENA_LOG_BLK_SZ)) diff --git a/mindspore/ccsrc/dataset/util/auto_index.h b/mindspore/ccsrc/minddata/dataset/util/auto_index.h similarity index 96% rename from mindspore/ccsrc/dataset/util/auto_index.h rename to mindspore/ccsrc/minddata/dataset/util/auto_index.h index 5c43ecfd80..0fe55159e6 100644 --- a/mindspore/ccsrc/dataset/util/auto_index.h +++ b/mindspore/ccsrc/minddata/dataset/util/auto_index.h @@ -21,8 +21,8 @@ #include #include -#include "dataset/util/btree.h" -#include "dataset/util/system_pool.h" +#include "minddata/dataset/util/btree.h" +#include "minddata/dataset/util/system_pool.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/bit.h b/mindspore/ccsrc/minddata/dataset/util/bit.h similarity index 100% rename from mindspore/ccsrc/dataset/util/bit.h rename to mindspore/ccsrc/minddata/dataset/util/bit.h diff --git a/mindspore/ccsrc/dataset/util/btree.h b/mindspore/ccsrc/minddata/dataset/util/btree.h similarity index 98% rename from mindspore/ccsrc/dataset/util/btree.h rename to mindspore/ccsrc/minddata/dataset/util/btree.h index ccf642e366..828976a0a1 100644 --- a/mindspore/ccsrc/dataset/util/btree.h +++ b/mindspore/ccsrc/minddata/dataset/util/btree.h @@ -23,12 +23,12 @@ #include #include #include "./securec.h" -#include "dataset/util/allocator.h" -#include "dataset/util/list.h" -#include "dataset/util/lock.h" -#include "dataset/util/memory_pool.h" -#include "dataset/util/services.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/list.h" +#include "minddata/dataset/util/lock.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/btree_impl.tpp b/mindspore/ccsrc/minddata/dataset/util/btree_impl.tpp similarity index 100% rename from mindspore/ccsrc/dataset/util/btree_impl.tpp rename to mindspore/ccsrc/minddata/dataset/util/btree_impl.tpp diff --git a/mindspore/ccsrc/dataset/util/btree_iterator.tpp b/mindspore/ccsrc/minddata/dataset/util/btree_iterator.tpp similarity index 100% rename from mindspore/ccsrc/dataset/util/btree_iterator.tpp rename to mindspore/ccsrc/minddata/dataset/util/btree_iterator.tpp diff --git a/mindspore/ccsrc/dataset/util/buddy.cc b/mindspore/ccsrc/minddata/dataset/util/buddy.cc similarity index 98% rename from mindspore/ccsrc/dataset/util/buddy.cc rename to mindspore/ccsrc/minddata/dataset/util/buddy.cc index 540fa993d6..d4f5434f81 100644 --- a/mindspore/ccsrc/dataset/util/buddy.cc +++ b/mindspore/ccsrc/minddata/dataset/util/buddy.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/buddy.h" +#include "minddata/dataset/util/buddy.h" #include #include -#include "dataset/util/memory_pool.h" -#include "dataset/util/system_pool.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/system_pool.h" #include "utils/log_adapter.h" #include "./securec.h" diff --git a/mindspore/ccsrc/dataset/util/buddy.h b/mindspore/ccsrc/minddata/dataset/util/buddy.h similarity index 98% rename from mindspore/ccsrc/dataset/util/buddy.h rename to mindspore/ccsrc/minddata/dataset/util/buddy.h index 08c05cbbdb..b1bcd3ce41 100644 --- a/mindspore/ccsrc/dataset/util/buddy.h +++ b/mindspore/ccsrc/minddata/dataset/util/buddy.h @@ -22,7 +22,7 @@ #include #include #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" using addr_t = int64_t; using rel_addr_t = int32_t; diff --git a/mindspore/ccsrc/dataset/util/cache_pool.cc b/mindspore/ccsrc/minddata/dataset/util/cache_pool.cc similarity index 98% rename from mindspore/ccsrc/dataset/util/cache_pool.cc rename to mindspore/ccsrc/minddata/dataset/util/cache_pool.cc index 7d7a2a4a94..22fb72eb8a 100644 --- a/mindspore/ccsrc/dataset/util/cache_pool.cc +++ b/mindspore/ccsrc/minddata/dataset/util/cache_pool.cc @@ -15,8 +15,8 @@ */ #include #include "common/utils.h" -#include "dataset/util/cache_pool.h" -#include "dataset/util/services.h" +#include "minddata/dataset/util/cache_pool.h" +#include "minddata/dataset/util/services.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/cache_pool.h b/mindspore/ccsrc/minddata/dataset/util/cache_pool.h similarity index 95% rename from mindspore/ccsrc/dataset/util/cache_pool.h rename to mindspore/ccsrc/minddata/dataset/util/cache_pool.h index d35617d0e4..cdb6da16b6 100644 --- a/mindspore/ccsrc/dataset/util/cache_pool.h +++ b/mindspore/ccsrc/minddata/dataset/util/cache_pool.h @@ -20,11 +20,11 @@ #include #include #include -#include "dataset/util/allocator.h" -#include "dataset/util/service.h" -#include "dataset/util/slice.h" -#include "dataset/util/storage_manager.h" -#include "dataset/util/auto_index.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/service.h" +#include "minddata/dataset/util/slice.h" +#include "minddata/dataset/util/storage_manager.h" +#include "minddata/dataset/util/auto_index.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/circular_pool.cc b/mindspore/ccsrc/minddata/dataset/util/circular_pool.cc similarity index 98% rename from mindspore/ccsrc/dataset/util/circular_pool.cc rename to mindspore/ccsrc/minddata/dataset/util/circular_pool.cc index 42cccd87ed..f99e6de2f1 100644 --- a/mindspore/ccsrc/dataset/util/circular_pool.cc +++ b/mindspore/ccsrc/minddata/dataset/util/circular_pool.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/circular_pool.h" +#include "minddata/dataset/util/circular_pool.h" #include #include #include #include "./securec.h" -#include "dataset/util/system_pool.h" +#include "minddata/dataset/util/system_pool.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/circular_pool.h b/mindspore/ccsrc/minddata/dataset/util/circular_pool.h similarity index 95% rename from mindspore/ccsrc/dataset/util/circular_pool.h rename to mindspore/ccsrc/minddata/dataset/util/circular_pool.h index 3c52659799..a63afbd691 100644 --- a/mindspore/ccsrc/dataset/util/circular_pool.h +++ b/mindspore/ccsrc/minddata/dataset/util/circular_pool.h @@ -19,9 +19,9 @@ #include #include #include -#include "dataset/util/memory_pool.h" -#include "dataset/util/arena.h" -#include "dataset/util/lock.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/arena.h" +#include "minddata/dataset/util/lock.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/cond_var.cc b/mindspore/ccsrc/minddata/dataset/util/cond_var.cc similarity index 94% rename from mindspore/ccsrc/dataset/util/cond_var.cc rename to mindspore/ccsrc/minddata/dataset/util/cond_var.cc index 8b1099fb71..b7c7b76cae 100644 --- a/mindspore/ccsrc/dataset/util/cond_var.cc +++ b/mindspore/ccsrc/minddata/dataset/util/cond_var.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/cond_var.h" +#include "minddata/dataset/util/cond_var.h" #include #include -#include "dataset/util/services.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/cond_var.h b/mindspore/ccsrc/minddata/dataset/util/cond_var.h similarity index 90% rename from mindspore/ccsrc/dataset/util/cond_var.h rename to mindspore/ccsrc/minddata/dataset/util/cond_var.h index b23dcd566e..88fcad24a2 100644 --- a/mindspore/ccsrc/dataset/util/cond_var.h +++ b/mindspore/ccsrc/minddata/dataset/util/cond_var.h @@ -21,9 +21,9 @@ #include #include #include -#include "dataset/util/intrp_resource.h" -#include "dataset/util/intrp_service.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/intrp_resource.h" +#include "minddata/dataset/util/intrp_service.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/intrp_resource.h b/mindspore/ccsrc/minddata/dataset/util/intrp_resource.h similarity index 97% rename from mindspore/ccsrc/dataset/util/intrp_resource.h rename to mindspore/ccsrc/minddata/dataset/util/intrp_resource.h index 52024cb90a..9d78e2cd32 100644 --- a/mindspore/ccsrc/dataset/util/intrp_resource.h +++ b/mindspore/ccsrc/minddata/dataset/util/intrp_resource.h @@ -17,7 +17,7 @@ #define DATASET_UTIL_INTRP_RESOURCE_H_ #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/intrp_service.cc b/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc similarity index 95% rename from mindspore/ccsrc/dataset/util/intrp_service.cc rename to mindspore/ccsrc/minddata/dataset/util/intrp_service.cc index da8dde992c..a82c82cdc9 100644 --- a/mindspore/ccsrc/dataset/util/intrp_service.cc +++ b/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/intrp_service.h" +#include "minddata/dataset/util/intrp_service.h" #include #include "common/utils.h" -#include "dataset/util/services.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/intrp_service.h b/mindspore/ccsrc/minddata/dataset/util/intrp_service.h similarity index 87% rename from mindspore/ccsrc/dataset/util/intrp_service.h rename to mindspore/ccsrc/minddata/dataset/util/intrp_service.h index de1d5eb753..cb6bf30c73 100644 --- a/mindspore/ccsrc/dataset/util/intrp_service.h +++ b/mindspore/ccsrc/minddata/dataset/util/intrp_service.h @@ -21,11 +21,11 @@ #include #include #include -#include "dataset/util/allocator.h" -#include "dataset/util/intrp_resource.h" -#include "dataset/util/service.h" -#include "dataset/util/services.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/intrp_resource.h" +#include "minddata/dataset/util/service.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/status.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/dataset/util/list.h b/mindspore/ccsrc/minddata/dataset/util/list.h similarity index 100% rename from mindspore/ccsrc/dataset/util/list.h rename to mindspore/ccsrc/minddata/dataset/util/list.h diff --git a/mindspore/ccsrc/dataset/util/lock.cc b/mindspore/ccsrc/minddata/dataset/util/lock.cc similarity index 99% rename from mindspore/ccsrc/dataset/util/lock.cc rename to mindspore/ccsrc/minddata/dataset/util/lock.cc index bde9d84005..5302196a46 100644 --- a/mindspore/ccsrc/dataset/util/lock.cc +++ b/mindspore/ccsrc/minddata/dataset/util/lock.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/lock.h" +#include "minddata/dataset/util/lock.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/lock.h b/mindspore/ccsrc/minddata/dataset/util/lock.h similarity index 100% rename from mindspore/ccsrc/dataset/util/lock.h rename to mindspore/ccsrc/minddata/dataset/util/lock.h diff --git a/mindspore/ccsrc/dataset/util/memory_pool.cc b/mindspore/ccsrc/minddata/dataset/util/memory_pool.cc similarity index 97% rename from mindspore/ccsrc/dataset/util/memory_pool.cc rename to mindspore/ccsrc/minddata/dataset/util/memory_pool.cc index 5d66b4bd6d..0e1be9d798 100644 --- a/mindspore/ccsrc/dataset/util/memory_pool.cc +++ b/mindspore/ccsrc/minddata/dataset/util/memory_pool.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/memory_pool.h" +#include "minddata/dataset/util/memory_pool.h" #include "./securec.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/memory_pool.h b/mindspore/ccsrc/minddata/dataset/util/memory_pool.h similarity index 97% rename from mindspore/ccsrc/dataset/util/memory_pool.h rename to mindspore/ccsrc/minddata/dataset/util/memory_pool.h index ee1da3bda1..c7cc473109 100644 --- a/mindspore/ccsrc/dataset/util/memory_pool.h +++ b/mindspore/ccsrc/minddata/dataset/util/memory_pool.h @@ -19,7 +19,7 @@ #include #include #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/path.cc b/mindspore/ccsrc/minddata/dataset/util/path.cc similarity index 99% rename from mindspore/ccsrc/dataset/util/path.cc rename to mindspore/ccsrc/minddata/dataset/util/path.cc index cdd2343799..8740ecb8e0 100644 --- a/mindspore/ccsrc/dataset/util/path.cc +++ b/mindspore/ccsrc/minddata/dataset/util/path.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/path.h" +#include "minddata/dataset/util/path.h" #include #include diff --git a/mindspore/ccsrc/dataset/util/path.h b/mindspore/ccsrc/minddata/dataset/util/path.h similarity index 98% rename from mindspore/ccsrc/dataset/util/path.h rename to mindspore/ccsrc/minddata/dataset/util/path.h index fbf65b8c23..8bc07ca8f3 100644 --- a/mindspore/ccsrc/dataset/util/path.h +++ b/mindspore/ccsrc/minddata/dataset/util/path.h @@ -20,7 +20,7 @@ #include #include -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/queue.h b/mindspore/ccsrc/minddata/dataset/util/queue.h similarity index 97% rename from mindspore/ccsrc/dataset/util/queue.h rename to mindspore/ccsrc/minddata/dataset/util/queue.h index 52309962d5..7a0a987499 100644 --- a/mindspore/ccsrc/dataset/util/queue.h +++ b/mindspore/ccsrc/minddata/dataset/util/queue.h @@ -26,10 +26,10 @@ #include "common/utils.h" #include "utils/log_adapter.h" -#include "dataset/util/allocator.h" -#include "dataset/util/services.h" -#include "dataset/util/cond_var.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/cond_var.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/random.h b/mindspore/ccsrc/minddata/dataset/util/random.h similarity index 95% rename from mindspore/ccsrc/dataset/util/random.h rename to mindspore/ccsrc/minddata/dataset/util/random.h index 957a4214a8..d2658f67ec 100644 --- a/mindspore/ccsrc/dataset/util/random.h +++ b/mindspore/ccsrc/minddata/dataset/util/random.h @@ -26,8 +26,8 @@ #include #include -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/semaphore.cc b/mindspore/ccsrc/minddata/dataset/util/semaphore.cc similarity index 93% rename from mindspore/ccsrc/dataset/util/semaphore.cc rename to mindspore/ccsrc/minddata/dataset/util/semaphore.cc index 36ddf5511d..5dadd98f3c 100644 --- a/mindspore/ccsrc/dataset/util/semaphore.cc +++ b/mindspore/ccsrc/minddata/dataset/util/semaphore.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/semaphore.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/semaphore.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/semaphore.h b/mindspore/ccsrc/minddata/dataset/util/semaphore.h similarity index 97% rename from mindspore/ccsrc/dataset/util/semaphore.h rename to mindspore/ccsrc/minddata/dataset/util/semaphore.h index 07b9e83e7f..d07398acb1 100644 --- a/mindspore/ccsrc/dataset/util/semaphore.h +++ b/mindspore/ccsrc/minddata/dataset/util/semaphore.h @@ -16,7 +16,7 @@ #ifndef DATASET_UTIL_SEMAPHORE_H_ #define DATASET_UTIL_SEMAPHORE_H_ -#include "dataset/util/cond_var.h" +#include "minddata/dataset/util/cond_var.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/service.cc b/mindspore/ccsrc/minddata/dataset/util/service.cc similarity index 98% rename from mindspore/ccsrc/dataset/util/service.cc rename to mindspore/ccsrc/minddata/dataset/util/service.cc index c89f7287f6..19d60ab47a 100644 --- a/mindspore/ccsrc/dataset/util/service.cc +++ b/mindspore/ccsrc/minddata/dataset/util/service.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/service.h" +#include "minddata/dataset/util/service.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/service.h b/mindspore/ccsrc/minddata/dataset/util/service.h similarity index 94% rename from mindspore/ccsrc/dataset/util/service.h rename to mindspore/ccsrc/minddata/dataset/util/service.h index 1113fc1d14..2b9c7197fe 100644 --- a/mindspore/ccsrc/dataset/util/service.h +++ b/mindspore/ccsrc/minddata/dataset/util/service.h @@ -17,8 +17,8 @@ #define DATASET_UTIL_SERVICE_H_ #include -#include "dataset/util/lock.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/lock.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/services.cc b/mindspore/ccsrc/minddata/dataset/util/services.cc similarity index 92% rename from mindspore/ccsrc/dataset/util/services.cc rename to mindspore/ccsrc/minddata/dataset/util/services.cc index 755d217311..547773e0f1 100644 --- a/mindspore/ccsrc/dataset/util/services.cc +++ b/mindspore/ccsrc/minddata/dataset/util/services.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/services.h" +#include "minddata/dataset/util/services.h" #include #if !defined(_WIN32) && !defined(_WIN64) @@ -22,10 +22,10 @@ #include #endif #include -#include "dataset/engine/cache/cache_server.h" -#include "dataset/util/circular_pool.h" -#include "dataset/util/random.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/engine/cache/cache_server.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/util/random.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/services.h b/mindspore/ccsrc/minddata/dataset/util/services.h similarity index 95% rename from mindspore/ccsrc/dataset/util/services.h rename to mindspore/ccsrc/minddata/dataset/util/services.h index e82b3e47f1..c7adea0b6e 100644 --- a/mindspore/ccsrc/dataset/util/services.h +++ b/mindspore/ccsrc/minddata/dataset/util/services.h @@ -19,9 +19,9 @@ #include #include #include -#include "dataset/util/memory_pool.h" -#include "dataset/util/allocator.h" -#include "dataset/util/service.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/service.h" #define UNIQUEID_LEN 36 namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/sig_handler.cc b/mindspore/ccsrc/minddata/dataset/util/sig_handler.cc similarity index 94% rename from mindspore/ccsrc/dataset/util/sig_handler.cc rename to mindspore/ccsrc/minddata/dataset/util/sig_handler.cc index 644a633066..eed3b4ee4d 100644 --- a/mindspore/ccsrc/dataset/util/sig_handler.cc +++ b/mindspore/ccsrc/minddata/dataset/util/sig_handler.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/sig_handler.h" +#include "minddata/dataset/util/sig_handler.h" #include #include #if !defined(_WIN32) && !defined(_WIN64) #include #endif #include -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/sig_handler.h b/mindspore/ccsrc/minddata/dataset/util/sig_handler.h similarity index 100% rename from mindspore/ccsrc/dataset/util/sig_handler.h rename to mindspore/ccsrc/minddata/dataset/util/sig_handler.h diff --git a/mindspore/ccsrc/dataset/util/slice.cc b/mindspore/ccsrc/minddata/dataset/util/slice.cc similarity index 97% rename from mindspore/ccsrc/dataset/util/slice.cc rename to mindspore/ccsrc/minddata/dataset/util/slice.cc index f1798b4f44..beff2b3dd2 100644 --- a/mindspore/ccsrc/dataset/util/slice.cc +++ b/mindspore/ccsrc/minddata/dataset/util/slice.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/slice.h" +#include "minddata/dataset/util/slice.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/slice.h b/mindspore/ccsrc/minddata/dataset/util/slice.h similarity index 97% rename from mindspore/ccsrc/dataset/util/slice.h rename to mindspore/ccsrc/minddata/dataset/util/slice.h index b44f4d6a39..1caee0f816 100644 --- a/mindspore/ccsrc/dataset/util/slice.h +++ b/mindspore/ccsrc/minddata/dataset/util/slice.h @@ -20,8 +20,8 @@ #include #include #include "./securec.h" -#include "dataset/util/allocator.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { /// \brief A ReadableSlice wraps a const pointer in memory and its size. diff --git a/mindspore/ccsrc/dataset/util/status.cc b/mindspore/ccsrc/minddata/dataset/util/status.cc similarity index 97% rename from mindspore/ccsrc/dataset/util/status.cc rename to mindspore/ccsrc/minddata/dataset/util/status.cc index 27e9dfbc83..3fc498b701 100644 --- a/mindspore/ccsrc/dataset/util/status.cc +++ b/mindspore/ccsrc/minddata/dataset/util/status.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" #include #include "common/utils.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/status.h b/mindspore/ccsrc/minddata/dataset/util/status.h similarity index 100% rename from mindspore/ccsrc/dataset/util/status.h rename to mindspore/ccsrc/minddata/dataset/util/status.h diff --git a/mindspore/ccsrc/dataset/util/storage_container.cc b/mindspore/ccsrc/minddata/dataset/util/storage_container.cc similarity index 97% rename from mindspore/ccsrc/dataset/util/storage_container.cc rename to mindspore/ccsrc/minddata/dataset/util/storage_container.cc index 3a4c13e2d9..506495227d 100644 --- a/mindspore/ccsrc/dataset/util/storage_container.cc +++ b/mindspore/ccsrc/minddata/dataset/util/storage_container.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/storage_container.h" +#include "minddata/dataset/util/storage_container.h" #include #include #include #include #include "common/utils.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/storage_container.h b/mindspore/ccsrc/minddata/dataset/util/storage_container.h similarity index 90% rename from mindspore/ccsrc/dataset/util/storage_container.h rename to mindspore/ccsrc/minddata/dataset/util/storage_container.h index 07e41bd66a..a304012b60 100644 --- a/mindspore/ccsrc/dataset/util/storage_container.h +++ b/mindspore/ccsrc/minddata/dataset/util/storage_container.h @@ -22,11 +22,11 @@ #include #include #include -#include "dataset/util/system_pool.h" -#include "dataset/util/buddy.h" -#include "dataset/util/path.h" -#include "dataset/util/slice.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/system_pool.h" +#include "minddata/dataset/util/buddy.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/slice.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/storage_manager.cc b/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc similarity index 97% rename from mindspore/ccsrc/dataset/util/storage_manager.cc rename to mindspore/ccsrc/minddata/dataset/util/storage_manager.cc index 1d958576ba..2f85d00a45 100644 --- a/mindspore/ccsrc/dataset/util/storage_manager.cc +++ b/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/storage_manager.h" +#include "minddata/dataset/util/storage_manager.h" #include #include #include #include #include "common/utils.h" -#include "dataset/util/path.h" -#include "dataset/util/services.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/services.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/storage_manager.h b/mindspore/ccsrc/minddata/dataset/util/storage_manager.h similarity index 85% rename from mindspore/ccsrc/dataset/util/storage_manager.h rename to mindspore/ccsrc/minddata/dataset/util/storage_manager.h index 075ac713d2..e79e7c6e63 100644 --- a/mindspore/ccsrc/dataset/util/storage_manager.h +++ b/mindspore/ccsrc/minddata/dataset/util/storage_manager.h @@ -21,14 +21,14 @@ #include #include #include -#include "dataset/util/allocator.h" -#include "dataset/util/auto_index.h" -#include "dataset/util/lock.h" -#include "dataset/util/memory_pool.h" -#include "dataset/util/path.h" -#include "dataset/util/service.h" -#include "dataset/util/slice.h" -#include "dataset/util/storage_container.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/auto_index.h" +#include "minddata/dataset/util/lock.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/service.h" +#include "minddata/dataset/util/slice.h" +#include "minddata/dataset/util/storage_container.h" using ListOfContainers = std::vector>; namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/system_pool.h b/mindspore/ccsrc/minddata/dataset/util/system_pool.h similarity index 96% rename from mindspore/ccsrc/dataset/util/system_pool.h rename to mindspore/ccsrc/minddata/dataset/util/system_pool.h index 286e30a615..3a7e61d16b 100644 --- a/mindspore/ccsrc/dataset/util/system_pool.h +++ b/mindspore/ccsrc/minddata/dataset/util/system_pool.h @@ -22,8 +22,8 @@ #include #include #include "./securec.h" -#include "dataset/util/allocator.h" -#include "dataset/util/memory_pool.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/memory_pool.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/task.cc b/mindspore/ccsrc/minddata/dataset/util/task.cc similarity index 98% rename from mindspore/ccsrc/dataset/util/task.cc rename to mindspore/ccsrc/minddata/dataset/util/task.cc index 93db55d5f9..39d754e806 100644 --- a/mindspore/ccsrc/dataset/util/task.cc +++ b/mindspore/ccsrc/minddata/dataset/util/task.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/task.h" +#include "minddata/dataset/util/task.h" #include "common/utils.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/task.h b/mindspore/ccsrc/minddata/dataset/util/task.h similarity index 93% rename from mindspore/ccsrc/dataset/util/task.h rename to mindspore/ccsrc/minddata/dataset/util/task.h index 49eb16b182..9309a3de7b 100644 --- a/mindspore/ccsrc/dataset/util/task.h +++ b/mindspore/ccsrc/minddata/dataset/util/task.h @@ -27,11 +27,11 @@ #include #include #include -#include "dataset/util/intrp_resource.h" -#include "dataset/util/list.h" -#include "dataset/util/memory_pool.h" -#include "dataset/util/services.h" -#include "dataset/util/wait_post.h" +#include "minddata/dataset/util/intrp_resource.h" +#include "minddata/dataset/util/list.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/wait_post.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/dataset/util/task_manager.cc b/mindspore/ccsrc/minddata/dataset/util/task_manager.cc similarity index 99% rename from mindspore/ccsrc/dataset/util/task_manager.cc rename to mindspore/ccsrc/minddata/dataset/util/task_manager.cc index 3965e35564..fefea0b97c 100644 --- a/mindspore/ccsrc/dataset/util/task_manager.cc +++ b/mindspore/ccsrc/minddata/dataset/util/task_manager.cc @@ -17,7 +17,7 @@ #include #include #include "./securec.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/task_manager.h b/mindspore/ccsrc/minddata/dataset/util/task_manager.h similarity index 94% rename from mindspore/ccsrc/dataset/util/task_manager.h rename to mindspore/ccsrc/minddata/dataset/util/task_manager.h index 5961c9000e..3030390bab 100644 --- a/mindspore/ccsrc/dataset/util/task_manager.h +++ b/mindspore/ccsrc/minddata/dataset/util/task_manager.h @@ -25,12 +25,12 @@ #include #include #include -#include "dataset/util/allocator.h" -#include "dataset/util/intrp_service.h" -#include "dataset/util/lock.h" -#include "dataset/util/services.h" -#include "dataset/util/status.h" -#include "dataset/util/task.h" +#include "minddata/dataset/util/allocator.h" +#include "minddata/dataset/util/intrp_service.h" +#include "minddata/dataset/util/lock.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/util/task.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/treap.h b/mindspore/ccsrc/minddata/dataset/util/treap.h similarity index 100% rename from mindspore/ccsrc/dataset/util/treap.h rename to mindspore/ccsrc/minddata/dataset/util/treap.h diff --git a/mindspore/ccsrc/dataset/util/wait_post.cc b/mindspore/ccsrc/minddata/dataset/util/wait_post.cc similarity index 93% rename from mindspore/ccsrc/dataset/util/wait_post.cc rename to mindspore/ccsrc/minddata/dataset/util/wait_post.cc index 204f203d9a..944d9ca245 100644 --- a/mindspore/ccsrc/dataset/util/wait_post.cc +++ b/mindspore/ccsrc/minddata/dataset/util/wait_post.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/wait_post.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/wait_post.h" +#include "minddata/dataset/util/task_manager.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/dataset/util/wait_post.h b/mindspore/ccsrc/minddata/dataset/util/wait_post.h similarity index 92% rename from mindspore/ccsrc/dataset/util/wait_post.h rename to mindspore/ccsrc/minddata/dataset/util/wait_post.h index 4e60995bd9..afd3bea38b 100644 --- a/mindspore/ccsrc/dataset/util/wait_post.h +++ b/mindspore/ccsrc/minddata/dataset/util/wait_post.h @@ -17,8 +17,8 @@ #define DATASET_UTIL_WAIT_POST_H_ #include -#include "dataset/util/cond_var.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/cond_var.h" +#include "minddata/dataset/util/status.h" namespace mindspore { namespace dataset { diff --git a/mindspore/ccsrc/mindrecord/CMakeLists.txt b/mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/mindrecord/CMakeLists.txt rename to mindspore/ccsrc/minddata/mindrecord/CMakeLists.txt diff --git a/mindspore/ccsrc/mindrecord/common/shard_error.cc b/mindspore/ccsrc/minddata/mindrecord/common/shard_error.cc similarity index 98% rename from mindspore/ccsrc/mindrecord/common/shard_error.cc rename to mindspore/ccsrc/minddata/mindrecord/common/shard_error.cc index ad68aaf92c..e4d35b8305 100644 --- a/mindspore/ccsrc/mindrecord/common/shard_error.cc +++ b/mindspore/ccsrc/minddata/mindrecord/common/shard_error.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_error.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/common/shard_pybind.cc b/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc similarity index 96% rename from mindspore/ccsrc/mindrecord/common/shard_pybind.cc rename to mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc index ee923ebc97..d9e51efc4e 100644 --- a/mindspore/ccsrc/mindrecord/common/shard_pybind.cc +++ b/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc @@ -17,12 +17,12 @@ #include #include #include "common/utils.h" -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_index_generator.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/shard_segment.h" -#include "mindrecord/include/shard_writer.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_index_generator.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_segment.h" +#include "minddata/mindrecord/include/shard_writer.h" #include "nlohmann/json.hpp" #include "pybind11/pybind11.h" #include "pybind11/stl.h" diff --git a/mindspore/ccsrc/mindrecord/common/shard_utils.cc b/mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/common/shard_utils.cc rename to mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc index edeabb3cde..b5021802a0 100644 --- a/mindspore/ccsrc/mindrecord/common/shard_utils.cc +++ b/mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" #include "common/utils.h" #include "./securec.h" diff --git a/mindspore/ccsrc/mindrecord/include/common/shard_pybind.h b/mindspore/ccsrc/minddata/mindrecord/include/common/shard_pybind.h similarity index 95% rename from mindspore/ccsrc/mindrecord/include/common/shard_pybind.h rename to mindspore/ccsrc/minddata/mindrecord/include/common/shard_pybind.h index 86c71a0ea7..3b3698ca68 100644 --- a/mindspore/ccsrc/mindrecord/include/common/shard_pybind.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/common/shard_pybind.h @@ -19,7 +19,7 @@ #include #include -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" #include "pybind11/pybind11.h" namespace py = pybind11; diff --git a/mindspore/ccsrc/mindrecord/include/common/shard_utils.h b/mindspore/ccsrc/minddata/mindrecord/include/common/shard_utils.h similarity index 99% rename from mindspore/ccsrc/mindrecord/include/common/shard_utils.h rename to mindspore/ccsrc/minddata/mindrecord/include/common/shard_utils.h index 8aa5bdfbda..bd1cda8a99 100644 --- a/mindspore/ccsrc/mindrecord/include/common/shard_utils.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/common/shard_utils.h @@ -41,7 +41,7 @@ #include #include #include -#include "mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_error.h" #include "nlohmann/json.hpp" #include "./sqlite3.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/mindrecord/include/shard_category.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_category.h similarity index 97% rename from mindspore/ccsrc/mindrecord/include/shard_category.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_category.h index 618a91b1d8..ed1e748afe 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_category.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_category.h @@ -22,7 +22,7 @@ #include #include #include -#include "mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_operator.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_column.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_column.h similarity index 99% rename from mindspore/ccsrc/mindrecord/include/shard_column.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_column.h index 968d82e717..f6353ed3ce 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_column.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_column.h @@ -22,7 +22,7 @@ #include #include #include -#include "mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_header.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_distributed_sample.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_distributed_sample.h similarity index 91% rename from mindspore/ccsrc/mindrecord/include/shard_distributed_sample.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_distributed_sample.h index ef0ad738c4..f166ec1e6c 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_distributed_sample.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_distributed_sample.h @@ -21,9 +21,9 @@ #include #include #include -#include "mindrecord/include/shard_operator.h" -#include "mindrecord/include/shard_shuffle.h" -#include "mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/shard_sample.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_error.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_error.h similarity index 100% rename from mindspore/ccsrc/mindrecord/include/shard_error.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_error.h diff --git a/mindspore/ccsrc/mindrecord/include/shard_header.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_header.h similarity index 94% rename from mindspore/ccsrc/mindrecord/include/shard_header.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_header.h index e4361c466a..67169e8696 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_header.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_header.h @@ -22,12 +22,12 @@ #include #include #include -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_index.h" -#include "mindrecord/include/shard_page.h" -#include "mindrecord/include/shard_schema.h" -#include "mindrecord/include/shard_statistics.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/shard_page.h" +#include "minddata/mindrecord/include/shard_schema.h" +#include "minddata/mindrecord/include/shard_statistics.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_index.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_index.h similarity index 90% rename from mindspore/ccsrc/mindrecord/include/shard_index.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_index.h index d430c5bdcf..79b10893fb 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_index.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_index.h @@ -24,9 +24,9 @@ #include #include #include -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_schema.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_schema.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/mindrecord/include/shard_index_generator.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_index_generator.h similarity index 98% rename from mindspore/ccsrc/mindrecord/include/shard_index_generator.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_index_generator.h index b081b7a0a0..fb85d9adbc 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_index_generator.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_index_generator.h @@ -25,7 +25,7 @@ #include #include #include -#include "mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_header.h" #include "./sqlite3.h" namespace mindspore { diff --git a/mindspore/ccsrc/mindrecord/include/shard_operator.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_operator.h similarity index 97% rename from mindspore/ccsrc/mindrecord/include/shard_operator.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_operator.h index f33e3db5f4..b5ea53b759 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_operator.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_operator.h @@ -18,7 +18,7 @@ #define MINDRECORD_INCLUDE_SHARD_OPERATOR_H_ #include -#include "mindrecord/include/shard_task.h" +#include "minddata/mindrecord/include/shard_task.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_page.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_page.h similarity index 98% rename from mindspore/ccsrc/mindrecord/include/shard_page.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_page.h index c22acd8d2c..01c70acf29 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_page.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_page.h @@ -23,7 +23,7 @@ #include #include #include -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" #include "pybind11/pybind11.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/mindrecord/include/shard_pk_sample.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_pk_sample.h similarity index 89% rename from mindspore/ccsrc/mindrecord/include/shard_pk_sample.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_pk_sample.h index 4f1a1c307a..2d420b563d 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_pk_sample.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_pk_sample.h @@ -21,9 +21,9 @@ #include #include #include -#include "mindrecord/include/shard_operator.h" -#include "mindrecord/include/shard_shuffle.h" -#include "mindrecord/include/shard_category.h" +#include "minddata/mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/shard_category.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_reader.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_reader.h similarity index 96% rename from mindspore/ccsrc/mindrecord/include/shard_reader.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_reader.h index 1f2138d6d5..b1b0c1397a 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_reader.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_reader.h @@ -42,16 +42,16 @@ #include #include #include -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_category.h" -#include "mindrecord/include/shard_column.h" -#include "mindrecord/include/shard_distributed_sample.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_index_generator.h" -#include "mindrecord/include/shard_operator.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/shard_sample.h" -#include "mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_category.h" +#include "minddata/mindrecord/include/shard_column.h" +#include "minddata/mindrecord/include/shard_distributed_sample.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_index_generator.h" +#include "minddata/mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_shuffle.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/mindrecord/include/shard_sample.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_sample.h similarity index 93% rename from mindspore/ccsrc/mindrecord/include/shard_sample.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_sample.h index a32acbff6e..ce813bc4bf 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_sample.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_sample.h @@ -21,8 +21,8 @@ #include #include #include -#include "mindrecord/include/shard_operator.h" -#include "mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_shuffle.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_schema.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_schema.h similarity index 94% rename from mindspore/ccsrc/mindrecord/include/shard_schema.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_schema.h index 4ef134bde2..56eae85e5a 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_schema.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_schema.h @@ -22,9 +22,9 @@ #include #include #include -#include "mindrecord/include/common/shard_pybind.h" -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/common/shard_pybind.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_error.h" #include "pybind11/pybind11.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/mindrecord/include/shard_segment.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_segment.h similarity index 98% rename from mindspore/ccsrc/mindrecord/include/shard_segment.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_segment.h index 12497a5ace..45d9bda338 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_segment.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_segment.h @@ -21,7 +21,7 @@ #include #include #include -#include "mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_reader.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_sequential_sample.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_sequential_sample.h similarity index 96% rename from mindspore/ccsrc/mindrecord/include/shard_sequential_sample.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_sequential_sample.h index a8ee3a36db..724be9acaf 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_sequential_sample.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_sequential_sample.h @@ -21,7 +21,7 @@ #include #include #include -#include "mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_sample.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_shuffle.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_shuffle.h similarity index 96% rename from mindspore/ccsrc/mindrecord/include/shard_shuffle.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_shuffle.h index adb172bdcc..d7f736b55b 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_shuffle.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_shuffle.h @@ -18,7 +18,7 @@ #define MINDRECORD_INCLUDE_SHARD_SHUFFLE_H_ #include -#include "mindrecord/include/shard_operator.h" +#include "minddata/mindrecord/include/shard_operator.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_statistics.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_statistics.h similarity index 93% rename from mindspore/ccsrc/mindrecord/include/shard_statistics.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_statistics.h index 7fc2f968cd..f100bb9833 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_statistics.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_statistics.h @@ -24,9 +24,9 @@ #include #include -#include "mindrecord/include/common/shard_pybind.h" -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/common/shard_pybind.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_error.h" #include "pybind11/pybind11.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/mindrecord/include/shard_task.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_task.h similarity index 96% rename from mindspore/ccsrc/mindrecord/include/shard_task.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_task.h index 4a12eb9e45..f07da656f2 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_task.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_task.h @@ -22,7 +22,7 @@ #include #include #include -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/include/shard_writer.h b/mindspore/ccsrc/minddata/mindrecord/include/shard_writer.h similarity index 97% rename from mindspore/ccsrc/mindrecord/include/shard_writer.h rename to mindspore/ccsrc/minddata/mindrecord/include/shard_writer.h index 6175180c92..833928773e 100644 --- a/mindspore/ccsrc/mindrecord/include/shard_writer.h +++ b/mindspore/ccsrc/minddata/mindrecord/include/shard_writer.h @@ -35,11 +35,11 @@ #include #include #include -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_column.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_header.h" -#include "mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_column.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_index.h" #include "pybind11/pybind11.h" #include "pybind11/stl.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/mindrecord/io/shard_index_generator.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/io/shard_index_generator.cc rename to mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc index 16c730bd4c..f9b18a3bf0 100644 --- a/mindspore/ccsrc/mindrecord/io/shard_index_generator.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc @@ -15,7 +15,7 @@ */ #include -#include "mindrecord/include/shard_index_generator.h" +#include "minddata/mindrecord/include/shard_index_generator.h" #include "common/utils.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/mindrecord/io/shard_reader.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/io/shard_reader.cc rename to mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc index 99fa0c447d..84d7fddb6f 100644 --- a/mindspore/ccsrc/mindrecord/io/shard_reader.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "mindrecord/include/shard_distributed_sample.h" -#include "mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_distributed_sample.h" +#include "minddata/mindrecord/include/shard_reader.h" #include "common/utils.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/mindrecord/io/shard_segment.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/io/shard_segment.cc rename to mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc index fb1120b178..eda8924e13 100644 --- a/mindspore/ccsrc/mindrecord/io/shard_segment.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "mindrecord/include/shard_segment.h" +#include "minddata/mindrecord/include/shard_segment.h" #include "common/utils.h" #include "./securec.h" -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" #include "pybind11/pybind11.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/mindrecord/io/shard_writer.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/io/shard_writer.cc rename to mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc index 913caab550..e85229cc34 100644 --- a/mindspore/ccsrc/mindrecord/io/shard_writer.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "mindrecord/include/shard_writer.h" +#include "minddata/mindrecord/include/shard_writer.h" #include "common/utils.h" -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" #include "./securec.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_category.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_category.cc similarity index 96% rename from mindspore/ccsrc/mindrecord/meta/shard_category.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_category.cc index bd427a330a..eb1428a2ad 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_category.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_category.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_category.h" +#include "minddata/mindrecord/include/shard_category.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/meta/shard_column.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/meta/shard_column.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc index 28dc243e17..4cc5e9f413 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_column.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "mindrecord/include/shard_column.h" +#include "minddata/mindrecord/include/shard_column.h" #include "common/utils.h" -#include "mindrecord/include/common/shard_utils.h" -#include "mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/shard_error.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/meta/shard_distributed_sample.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_distributed_sample.cc similarity index 97% rename from mindspore/ccsrc/mindrecord/meta/shard_distributed_sample.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_distributed_sample.cc index b7e890da7c..4c7abbb4b4 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_distributed_sample.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_distributed_sample.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_distributed_sample.h" +#include "minddata/mindrecord/include/shard_distributed_sample.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_header.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc similarity index 99% rename from mindspore/ccsrc/mindrecord/meta/shard_header.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc index ec177394ef..500037399b 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_header.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_header.h" #include #include @@ -23,8 +23,8 @@ #include #include "common/utils.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_page.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_page.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_index.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_index.cc similarity index 95% rename from mindspore/ccsrc/mindrecord/meta/shard_index.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_index.cc index 8b7a3c0342..73397b5bba 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_index.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_index.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/shard_index.h" namespace mindspore { namespace mindrecord { diff --git a/mindspore/ccsrc/mindrecord/meta/shard_page.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_page.cc similarity index 96% rename from mindspore/ccsrc/mindrecord/meta/shard_page.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_page.cc index 6bb849ae1d..ba2292415f 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_page.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_page.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_page.h" +#include "minddata/mindrecord/include/shard_page.h" #include "pybind11/pybind11.h" namespace mindspore { diff --git a/mindspore/ccsrc/mindrecord/meta/shard_pk_sample.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_pk_sample.cc similarity index 96% rename from mindspore/ccsrc/mindrecord/meta/shard_pk_sample.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_pk_sample.cc index fac2fec708..081a48352d 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_pk_sample.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_pk_sample.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_pk_sample.h" +#include "minddata/mindrecord/include/shard_pk_sample.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_sample.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_sample.cc similarity index 98% rename from mindspore/ccsrc/mindrecord/meta/shard_sample.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_sample.cc index c207747194..808ab55bfb 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_sample.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_sample.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_sample.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_schema.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc similarity index 98% rename from mindspore/ccsrc/mindrecord/meta/shard_schema.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc index ee0f5afa4a..093be9792f 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_schema.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_schema.h" +#include "minddata/mindrecord/include/shard_schema.h" #include "common/utils.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_sequential_sample.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_sequential_sample.cc similarity index 97% rename from mindspore/ccsrc/mindrecord/meta/shard_sequential_sample.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_sequential_sample.cc index a7fa4e7343..3aa695e03b 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_sequential_sample.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_sequential_sample.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_sequential_sample.h" +#include "minddata/mindrecord/include/shard_sequential_sample.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_shuffle.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_shuffle.cc similarity index 98% rename from mindspore/ccsrc/mindrecord/meta/shard_shuffle.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_shuffle.cc index 5cf49b04f0..7743cabea3 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_shuffle.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_shuffle.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/shard_shuffle.h" #include diff --git a/mindspore/ccsrc/mindrecord/meta/shard_statistics.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_statistics.cc similarity index 98% rename from mindspore/ccsrc/mindrecord/meta/shard_statistics.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_statistics.cc index ca36c50863..7024a2ab06 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_statistics.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_statistics.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "mindrecord/include/shard_statistics.h" +#include "minddata/mindrecord/include/shard_statistics.h" #include "pybind11/pybind11.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/mindrecord/meta/shard_task.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc similarity index 97% rename from mindspore/ccsrc/mindrecord/meta/shard_task.cc rename to mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc index 8baa3c26cd..6f8e440f91 100644 --- a/mindspore/ccsrc/mindrecord/meta/shard_task.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "mindrecord/include/shard_task.h" +#include "minddata/mindrecord/include/shard_task.h" #include "common/utils.h" -#include "mindrecord/include/common/shard_utils.h" +#include "minddata/mindrecord/include/common/shard_utils.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h b/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h deleted file mode 100644 index 45b00aed30..0000000000 --- a/mindspore/ccsrc/parallel/ops_info/ops_info_head_files.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright 2019 Huawei Technologies Co., Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPS_INFO_HEAD_FILES_H_ -#define MINDSPORE_CCSRC_PARALLEL_OPS_INFO_OPS_INFO_HEAD_FILES_H_ - -#include "parallel/ops_info/activation_info.h" -#include "parallel/ops_info/arithmetic_info.h" -#include "parallel/ops_info/batch_parallel_info.h" -#include "parallel/ops_info/bias_add_info.h" -#include "parallel/ops_info/comparison_function_info.h" -#include "parallel/ops_info/dropout_do_mask_info.h" -#include "parallel/ops_info/elementary_function_info.h" -#include "parallel/ops_info/gather_v2_info.h" -#include "parallel/ops_info/get_next_info.h" -#include "parallel/ops_info/l2_normalize_info.h" -#include "parallel/ops_info/layer_norm_info.h" -#include "parallel/ops_info/loss_info.h" -#include "parallel/ops_info/matmul_info.h" -#include "parallel/ops_info/onehot_info.h" -#include "parallel/ops_info/prelu_info.h" -#include "parallel/ops_info/reduce_method_info.h" -#include "parallel/ops_info/reshape_info.h" -#include "parallel/ops_info/transpose_info.h" -#include "parallel/ops_info/virtual_dataset_info.h" -#include "parallel/ops_info/gather_v2_p_info.h" - -#endif // MINDSPORE_CCSRC_PARALLEL_OPS_INFO_HEAD_FILES_H_ diff --git a/mindspore/ccsrc/pipeline/CMakeLists.txt b/mindspore/ccsrc/pipeline/jit/CMakeLists.txt similarity index 90% rename from mindspore/ccsrc/pipeline/CMakeLists.txt rename to mindspore/ccsrc/pipeline/jit/CMakeLists.txt index 39664d717d..6188546ce5 100644 --- a/mindspore/ccsrc/pipeline/CMakeLists.txt +++ b/mindspore/ccsrc/pipeline/jit/CMakeLists.txt @@ -24,4 +24,4 @@ if (ENABLE_GE OR ENABLE_D) list(APPEND _PIPELINE_SRC_FILES ${_PIPELINE_GE_SRC_FILES}) endif () -add_library(_mindspore_pipeline_obj OBJECT ${_PIPELINE_SRC_FILES}) +add_library(_mindspore_pipeline_jit_obj OBJECT ${_PIPELINE_SRC_FILES}) diff --git a/mindspore/ccsrc/pipeline/action.cc b/mindspore/ccsrc/pipeline/jit/action.cc similarity index 97% rename from mindspore/ccsrc/pipeline/action.cc rename to mindspore/ccsrc/pipeline/jit/action.cc index 3648bc991e..74eb9f3f9b 100644 --- a/mindspore/ccsrc/pipeline/action.cc +++ b/mindspore/ccsrc/pipeline/jit/action.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/action.h" +#include "pipeline/jit/action.h" #include #include @@ -25,21 +25,21 @@ #include "ir/func_graph_cloner.h" #include "ir/param_value.h" -#include "parallel/costmodel_context.h" -#include "parallel/context.h" -#include "pipeline/pass.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/data_converter.h" +#include "frontend/parallel/costmodel_context.h" +#include "frontend/parallel/context.h" +#include "pipeline/jit/pass.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/data_converter.h" #include "abstract/abstract_value.h" -#include "pipeline/static_analysis/static_analysis.h" -#include "pipeline/static_analysis/program_specialize.h" -#include "pipeline/resource.h" +#include "pipeline/jit/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/program_specialize.h" +#include "pipeline/jit/resource.h" #include "utils/context/ms_context.h" -#include "pipeline/remove_value_node_dup.h" -#include "optimizer/optimizer.h" +#include "pipeline/jit/remove_value_node_dup.h" +#include "frontend/optimizer/optimizer.h" #include "vm/transform.h" #include "parse/python_adapter.h" -#include "optimizer/py_pass_manager.h" +#include "frontend/optimizer/py_pass_manager.h" namespace mindspore { namespace pipeline { diff --git a/mindspore/ccsrc/pipeline/action.h b/mindspore/ccsrc/pipeline/jit/action.h similarity index 98% rename from mindspore/ccsrc/pipeline/action.h rename to mindspore/ccsrc/pipeline/jit/action.h index eed1307872..0a1feab1c9 100644 --- a/mindspore/ccsrc/pipeline/action.h +++ b/mindspore/ccsrc/pipeline/jit/action.h @@ -21,7 +21,7 @@ #include #include #include -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" #include "vm/segment_runner.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/base.h b/mindspore/ccsrc/pipeline/jit/base.h similarity index 98% rename from mindspore/ccsrc/pipeline/base.h rename to mindspore/ccsrc/pipeline/jit/base.h index 57edea03a2..0a8a2b75f3 100644 --- a/mindspore/ccsrc/pipeline/base.h +++ b/mindspore/ccsrc/pipeline/jit/base.h @@ -23,7 +23,7 @@ #include #include "ir/anf.h" -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/init.cc b/mindspore/ccsrc/pipeline/jit/init.cc similarity index 97% rename from mindspore/ccsrc/pipeline/init.cc rename to mindspore/ccsrc/pipeline/jit/init.cc index f18178f19a..65adebb6e2 100644 --- a/mindspore/ccsrc/pipeline/init.cc +++ b/mindspore/ccsrc/pipeline/jit/init.cc @@ -16,25 +16,25 @@ #include #include -#include "kernel/oplib/oplib.h" -#include "kernel/oplib/oploader.h" -#include "pipeline/pipeline.h" -#include "operator/composite/composite.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/oplib/oploader.h" +#include "pipeline/jit/pipeline.h" +#include "frontend/operator/composite/composite.h" #include "ir/signature.h" -#include "pynative/pynative_execute.h" +#include "pipeline/pynative/pynative_execute.h" #include "utils/symbolic.h" #include "pybind_api/api_register.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/summary/event_writer.h" #include "utils/config_manager.h" #include "utils/mpi/mpi_config.h" -#include "parallel/context.h" -#include "parallel/device_manager.h" -#include "parallel/costmodel_context.h" +#include "frontend/parallel/context.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/costmodel_context.h" #ifdef ENABLE_GPU_COLLECTIVE -#include "device/gpu/distribution/collective_init.h" +#include "runtime/device/gpu/distribution/collective_init.h" #else -#include "device/gpu/distribution/collective_fake_init.h" +#include "runtime/device/gpu/distribution/collective_fake_init.h" #endif namespace py = pybind11; diff --git a/mindspore/ccsrc/pipeline/parse/data_converter.cc b/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc similarity index 98% rename from mindspore/ccsrc/pipeline/parse/data_converter.cc rename to mindspore/ccsrc/pipeline/jit/parse/data_converter.cc index 330d03d11c..baef64481b 100644 --- a/mindspore/ccsrc/pipeline/parse/data_converter.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" #include #include #include @@ -24,15 +24,15 @@ #include #include #include -#include "pipeline/parse/resolve.h" -#include "pipeline/parse/python_adapter.h" -#include "operator/ops.h" -#include "operator/composite/composite.h" +#include "pipeline/jit/parse/resolve.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "frontend/operator/ops.h" +#include "frontend/operator/composite/composite.h" #include "ir/func_graph_cloner.h" #include "utils/symbolic.h" #include "utils/context/ms_context.h" #include "debug/trace.h" -#include "optimizer/ad/grad.h" +#include "frontend/optimizer/ad/grad.h" namespace mindspore { namespace parse { diff --git a/mindspore/ccsrc/pipeline/parse/data_converter.h b/mindspore/ccsrc/pipeline/jit/parse/data_converter.h similarity index 95% rename from mindspore/ccsrc/pipeline/parse/data_converter.h rename to mindspore/ccsrc/pipeline/jit/parse/data_converter.h index 0165b55363..6632d4801e 100644 --- a/mindspore/ccsrc/pipeline/parse/data_converter.h +++ b/mindspore/ccsrc/pipeline/jit/parse/data_converter.h @@ -24,8 +24,8 @@ #include #include #include -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/parse/function_block.cc b/mindspore/ccsrc/pipeline/jit/parse/function_block.cc similarity index 99% rename from mindspore/ccsrc/pipeline/parse/function_block.cc rename to mindspore/ccsrc/pipeline/jit/parse/function_block.cc index 701f7d0f6b..b52dddda66 100644 --- a/mindspore/ccsrc/pipeline/parse/function_block.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/function_block.cc @@ -16,13 +16,13 @@ * limitations under the License. */ -#include "pipeline/parse/function_block.h" +#include "pipeline/jit/parse/function_block.h" #include #include #include -#include "pipeline/parse/resolve.h" -#include "pipeline/parse/parse.h" -#include "operator/ops.h" +#include "pipeline/jit/parse/resolve.h" +#include "pipeline/jit/parse/parse.h" +#include "frontend/operator/ops.h" #include "debug/info.h" #include "debug/trace.h" #include "pybind11/pybind11.h" diff --git a/mindspore/ccsrc/pipeline/parse/function_block.h b/mindspore/ccsrc/pipeline/jit/parse/function_block.h similarity index 99% rename from mindspore/ccsrc/pipeline/parse/function_block.h rename to mindspore/ccsrc/pipeline/jit/parse/function_block.h index b93838b43c..cbf75a3dd8 100644 --- a/mindspore/ccsrc/pipeline/parse/function_block.h +++ b/mindspore/ccsrc/pipeline/jit/parse/function_block.h @@ -26,7 +26,7 @@ #include #include #include -#include "pipeline/parse/parse_base.h" +#include "pipeline/jit/parse/parse_base.h" #include "utils/log_adapter.h" #include "utils/ordered_map.h" diff --git a/mindspore/ccsrc/pipeline/parse/parse.cc b/mindspore/ccsrc/pipeline/jit/parse/parse.cc similarity index 99% rename from mindspore/ccsrc/pipeline/parse/parse.cc rename to mindspore/ccsrc/pipeline/jit/parse/parse.cc index 1d306d9ca4..edc9a66594 100644 --- a/mindspore/ccsrc/pipeline/parse/parse.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/parse.cc @@ -16,15 +16,15 @@ * limitations under the License. */ -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include #include #include #include #include -#include "operator/ops.h" -#include "pipeline/parse/data_converter.h" -#include "operator/composite/composite.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/parse/data_converter.h" +#include "frontend/operator/composite/composite.h" #include "utils/context/ms_context.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/pipeline/parse/parse.h b/mindspore/ccsrc/pipeline/jit/parse/parse.h similarity index 99% rename from mindspore/ccsrc/pipeline/parse/parse.h rename to mindspore/ccsrc/pipeline/jit/parse/parse.h index 65ed5ddd12..90e965389f 100644 --- a/mindspore/ccsrc/pipeline/parse/parse.h +++ b/mindspore/ccsrc/pipeline/jit/parse/parse.h @@ -27,9 +27,9 @@ #include #include "utils/misc.h" #include "ir/anf.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/function_block.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/function_block.h" namespace mindspore { namespace parse { diff --git a/mindspore/ccsrc/pipeline/parse/parse_base.h b/mindspore/ccsrc/pipeline/jit/parse/parse_base.h similarity index 100% rename from mindspore/ccsrc/pipeline/parse/parse_base.h rename to mindspore/ccsrc/pipeline/jit/parse/parse_base.h diff --git a/mindspore/ccsrc/pipeline/parse/python_adapter.cc b/mindspore/ccsrc/pipeline/jit/parse/python_adapter.cc similarity index 98% rename from mindspore/ccsrc/pipeline/parse/python_adapter.cc rename to mindspore/ccsrc/pipeline/jit/parse/python_adapter.cc index df2f7d0d45..17be74b2a1 100644 --- a/mindspore/ccsrc/pipeline/parse/python_adapter.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/python_adapter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/python_adapter.h" #include #include #include diff --git a/mindspore/ccsrc/pipeline/parse/python_adapter.h b/mindspore/ccsrc/pipeline/jit/parse/python_adapter.h similarity index 98% rename from mindspore/ccsrc/pipeline/parse/python_adapter.h rename to mindspore/ccsrc/pipeline/jit/parse/python_adapter.h index 98adcd4f73..0f49539bc8 100644 --- a/mindspore/ccsrc/pipeline/parse/python_adapter.h +++ b/mindspore/ccsrc/pipeline/jit/parse/python_adapter.h @@ -24,7 +24,7 @@ #include "pybind11/pybind11.h" #include "pybind11/stl.h" -#include "pipeline/parse/parse_base.h" +#include "pipeline/jit/parse/parse_base.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/parse/resolve.cc b/mindspore/ccsrc/pipeline/jit/parse/resolve.cc similarity index 97% rename from mindspore/ccsrc/pipeline/parse/resolve.cc rename to mindspore/ccsrc/pipeline/jit/parse/resolve.cc index b4b45c078a..9524da4cfd 100644 --- a/mindspore/ccsrc/pipeline/parse/resolve.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/resolve.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/parse/resolve.h" +#include "pipeline/jit/parse/resolve.h" #include #include @@ -22,13 +22,13 @@ #include #include "ir/param_value.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/parse/parse.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/parse/parse.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/any.h" -#include "operator/ops.h" -#include "optimizer/opt.h" -#include "optimizer/irpass.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/opt.h" +#include "frontend/optimizer/irpass.h" #include "./common.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/parse/resolve.h b/mindspore/ccsrc/pipeline/jit/parse/resolve.h similarity index 98% rename from mindspore/ccsrc/pipeline/parse/resolve.h rename to mindspore/ccsrc/pipeline/jit/parse/resolve.h index a84b533bd0..d924f1ef44 100644 --- a/mindspore/ccsrc/pipeline/parse/resolve.h +++ b/mindspore/ccsrc/pipeline/jit/parse/resolve.h @@ -21,8 +21,8 @@ #include #include "ir/anf.h" #include "ir/manager.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/parse_base.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/parse_base.h" #include "abstract/abstract_value.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/pipeline/pass.cc b/mindspore/ccsrc/pipeline/jit/pass.cc similarity index 95% rename from mindspore/ccsrc/pipeline/pass.cc rename to mindspore/ccsrc/pipeline/jit/pass.cc index abffc37bb2..bb9a517556 100644 --- a/mindspore/ccsrc/pipeline/pass.cc +++ b/mindspore/ccsrc/pipeline/jit/pass.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/pass.h" +#include "pipeline/jit/pass.h" #include #include @@ -26,19 +26,19 @@ #include "ir/func_graph_cloner.h" #include "debug/anf_ir_utils.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/resource.h" -#include "pipeline/validator.h" -#include "optimizer/optimizer.h" -#include "optimizer/cse.h" -#include "optimizer/graph_kernel_reuse.h" -#include "optimizer/clean.h" -#include "optimizer/irpass.h" -#include "optimizer/control_depend.h" -#include "parallel/step_parallel.h" -#include "parallel/step_auto_parallel.h" -#include "parallel/allreduce_fusion/step_allreduce_fusion.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/validator.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/cse.h" +#include "frontend/optimizer/graph_kernel_reuse.h" +#include "frontend/optimizer/clean.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/control_depend.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/step_auto_parallel.h" +#include "frontend/parallel/allreduce_fusion/step_allreduce_fusion.h" #include "utils/any.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/pipeline/pass.h b/mindspore/ccsrc/pipeline/jit/pass.h similarity index 97% rename from mindspore/ccsrc/pipeline/pass.h rename to mindspore/ccsrc/pipeline/jit/pass.h index 9064df52ee..0233b6cf26 100644 --- a/mindspore/ccsrc/pipeline/pass.h +++ b/mindspore/ccsrc/pipeline/jit/pass.h @@ -21,7 +21,7 @@ #include #include #include -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" namespace mindspore { namespace pipeline { diff --git a/mindspore/ccsrc/pipeline/pipeline.cc b/mindspore/ccsrc/pipeline/jit/pipeline.cc similarity index 98% rename from mindspore/ccsrc/pipeline/pipeline.cc rename to mindspore/ccsrc/pipeline/jit/pipeline.cc index 5325cc8249..05699793ff 100644 --- a/mindspore/ccsrc/pipeline/pipeline.cc +++ b/mindspore/ccsrc/pipeline/jit/pipeline.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "pipeline/pipeline.h" +#include "pipeline/jit/pipeline.h" #include #include @@ -25,26 +25,26 @@ #include #include "ir/param_value.h" -#include "pipeline/pass.h" -#include "pipeline/parse/data_converter.h" -#include "optimizer/ad/dfunctor.h" +#include "pipeline/jit/pass.h" +#include "pipeline/jit/parse/data_converter.h" +#include "frontend/optimizer/ad/dfunctor.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" #include "utils/config_manager.h" #include "utils/convert_utils.h" #include "utils/utils.h" #include "vm/segment_runner.h" -#include "parallel/context.h" -#include "parallel/graph_util/get_parallel_info.h" -#include "device/kernel_runtime_manager.h" +#include "frontend/parallel/context.h" +#include "frontend/parallel/graph_util/get_parallel_info.h" +#include "runtime/device/kernel_runtime_manager.h" #include "debug/trace.h" -#include "pynative/pynative_execute.h" -#include "optimizer/py_pass_manager.h" +#include "pipeline/pynative/pynative_execute.h" +#include "frontend/optimizer/py_pass_manager.h" #if (ENABLE_GE || ENABLE_D) -#include "pipeline/pipeline_ge.h" -#include "transform/convert.h" -#include "transform/df_graph_manager.h" +#include "pipeline/jit/pipeline_ge.h" +#include "transform/graph_ir/convert.h" +#include "transform/graph_ir/df_graph_manager.h" #endif namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/pipeline.h b/mindspore/ccsrc/pipeline/jit/pipeline.h similarity index 98% rename from mindspore/ccsrc/pipeline/pipeline.h rename to mindspore/ccsrc/pipeline/jit/pipeline.h index 58456c4d3b..705853d086 100644 --- a/mindspore/ccsrc/pipeline/pipeline.h +++ b/mindspore/ccsrc/pipeline/jit/pipeline.h @@ -29,10 +29,10 @@ #include "debug/draw.h" #include "ir/anf.h" #include "ir/tensor.h" -#include "pipeline/action.h" +#include "pipeline/jit/action.h" #include "vm/segment_runner.h" #include "vm/transform.h" -#include "pipeline/base.h" +#include "pipeline/jit/base.h" namespace mindspore { extern const char kMsConvert[]; diff --git a/mindspore/ccsrc/pipeline/pipeline_ge.cc b/mindspore/ccsrc/pipeline/jit/pipeline_ge.cc similarity index 98% rename from mindspore/ccsrc/pipeline/pipeline_ge.cc rename to mindspore/ccsrc/pipeline/jit/pipeline_ge.cc index ffc907f698..e08af4f2dc 100644 --- a/mindspore/ccsrc/pipeline/pipeline_ge.cc +++ b/mindspore/ccsrc/pipeline/jit/pipeline_ge.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/pipeline_ge.h" +#include "pipeline/jit/pipeline_ge.h" #include #include @@ -24,10 +24,10 @@ #include "debug/anf_ir_dump.h" #include "ir/tensor.h" -#include "transform/convert.h" -#include "transform/df_graph_manager.h" -#include "transform/graph_builder.h" -#include "transform/graph_runner.h" +#include "transform/graph_ir/convert.h" +#include "transform/graph_ir/df_graph_manager.h" +#include "transform/graph_ir/graph_builder.h" +#include "transform/graph_ir/graph_runner.h" #include "debug/draw.h" #include "abstract/abstract_value.h" diff --git a/mindspore/ccsrc/pipeline/pipeline_ge.h b/mindspore/ccsrc/pipeline/jit/pipeline_ge.h similarity index 96% rename from mindspore/ccsrc/pipeline/pipeline_ge.h rename to mindspore/ccsrc/pipeline/jit/pipeline_ge.h index f3a363dbe8..f834125231 100644 --- a/mindspore/ccsrc/pipeline/pipeline_ge.h +++ b/mindspore/ccsrc/pipeline/jit/pipeline_ge.h @@ -26,8 +26,8 @@ #include #include "pybind11/pybind11.h" -#include "pipeline/base.h" -#include "operator/ops.h" +#include "pipeline/jit/base.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace pipeline { diff --git a/mindspore/ccsrc/pipeline/remove_value_node_dup.cc b/mindspore/ccsrc/pipeline/jit/remove_value_node_dup.cc similarity index 96% rename from mindspore/ccsrc/pipeline/remove_value_node_dup.cc rename to mindspore/ccsrc/pipeline/jit/remove_value_node_dup.cc index 47881e4b91..e9467e4aeb 100644 --- a/mindspore/ccsrc/pipeline/remove_value_node_dup.cc +++ b/mindspore/ccsrc/pipeline/jit/remove_value_node_dup.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pipeline/remove_value_node_dup.h" +#include "pipeline/jit/remove_value_node_dup.h" #include "ir/anf.h" #include "ir/tensor.h" #include "ir/manager.h" -#include "optimizer/cse.h" +#include "frontend/optimizer/cse.h" #include "utils/log_adapter.h" #include "utils/hashing.h" diff --git a/mindspore/ccsrc/pipeline/remove_value_node_dup.h b/mindspore/ccsrc/pipeline/jit/remove_value_node_dup.h similarity index 100% rename from mindspore/ccsrc/pipeline/remove_value_node_dup.h rename to mindspore/ccsrc/pipeline/jit/remove_value_node_dup.h diff --git a/mindspore/ccsrc/pipeline/resource.cc b/mindspore/ccsrc/pipeline/jit/resource.cc similarity index 97% rename from mindspore/ccsrc/pipeline/resource.cc rename to mindspore/ccsrc/pipeline/jit/resource.cc index cd79b2466a..ece128b77b 100644 --- a/mindspore/ccsrc/pipeline/resource.cc +++ b/mindspore/ccsrc/pipeline/jit/resource.cc @@ -16,16 +16,16 @@ * limitations under the License. */ -#include "pipeline/resource.h" -#include "pipeline/pipeline.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/pipeline.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "debug/draw.h" #include "debug/trace.h" #include "ir/dtype.h" -#include "pipeline/parse/data_converter.h" -#include "operator/ops.h" +#include "pipeline/jit/parse/data_converter.h" +#include "frontend/operator/ops.h" #include "utils/graph_utils.h" -#include "optimizer/ad/dfunctor.h" +#include "frontend/optimizer/ad/dfunctor.h" #include "vm/segment_runner.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/resource.h b/mindspore/ccsrc/pipeline/jit/resource.h similarity index 96% rename from mindspore/ccsrc/pipeline/resource.h rename to mindspore/ccsrc/pipeline/jit/resource.h index 0c1348fd94..819fdd3d20 100644 --- a/mindspore/ccsrc/pipeline/resource.h +++ b/mindspore/ccsrc/pipeline/jit/resource.h @@ -29,8 +29,8 @@ #include "utils/any.h" #include "utils/profile.h" #include "ir/manager.h" -#include "pipeline/static_analysis/prim.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "./common.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/abstract_function.cc similarity index 98% rename from mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc rename to mindspore/ccsrc/pipeline/jit/static_analysis/abstract_function.cc index cd768f7515..8bdb2a0c6c 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/abstract_function.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/static_analysis/abstract_function.h b/mindspore/ccsrc/pipeline/jit/static_analysis/abstract_function.h similarity index 100% rename from mindspore/ccsrc/pipeline/static_analysis/abstract_function.h rename to mindspore/ccsrc/pipeline/jit/static_analysis/abstract_function.h diff --git a/mindspore/ccsrc/pipeline/static_analysis/evaluator.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/evaluator.cc rename to mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc index 14ebeb0fc7..3e820eed3a 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/evaluator.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pipeline/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/evaluator.h" #include #include diff --git a/mindspore/ccsrc/pipeline/static_analysis/evaluator.h b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/evaluator.h rename to mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h index 079c1aac61..461574257d 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/evaluator.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h @@ -24,7 +24,7 @@ #include #include -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/context/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/prim.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/prim.cc rename to mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc index bf16bb5237..99e613395c 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/prim.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" #include #include @@ -25,19 +25,19 @@ #include #include -#include "operator/cc_implementations.h" -#include "operator/ops.h" -#include "operator/composite/do_signature.h" -#include "operator/prim_to_function.h" +#include "frontend/operator/cc_implementations.h" +#include "frontend/operator/ops.h" +#include "frontend/operator/composite/do_signature.h" +#include "frontend/operator/prim_to_function.h" #include "abstract/utils.h" #include "utils/symbolic.h" #include "./common.h" -#include "pipeline/resource.h" -#include "pipeline/parse/resolve.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/parse/resolve.h" #include "ir/tensor.h" #include "utils/convert_utils.h" #include "utils/context/ms_context.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" #include "abstract/param_validator.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/pipeline/static_analysis/prim.h b/mindspore/ccsrc/pipeline/jit/static_analysis/prim.h similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/prim.h rename to mindspore/ccsrc/pipeline/jit/static_analysis/prim.h index 5a686fbadc..692fbe66e8 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/prim.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/prim.h @@ -25,7 +25,7 @@ #include #include -#include "pipeline/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/evaluator.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/static_analysis/program_specialize.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.cc similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/program_specialize.cc rename to mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.cc index b0ad1c3d67..ad39190dc3 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/program_specialize.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.cc @@ -16,14 +16,14 @@ * limitations under the License. */ -#include "pipeline/static_analysis/program_specialize.h" +#include "pipeline/jit/static_analysis/program_specialize.h" #include #include #include "./common.h" -#include "operator/ops.h" -#include "operator/composite/do_signature.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "frontend/operator/ops.h" +#include "frontend/operator/composite/do_signature.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include "utils/graph_utils.h" #include "utils/log_adapter.h" #include "utils/profile.h" diff --git a/mindspore/ccsrc/pipeline/static_analysis/program_specialize.h b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/program_specialize.h rename to mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h index 831c404873..d7f95be4ca 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/program_specialize.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/program_specialize.h @@ -29,7 +29,7 @@ #include "ir/anf.h" #include "ir/func_graph_cloner.h" -#include "pipeline/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/evaluator.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc rename to mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc index 53c2c064b4..acecb2980e 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.cc @@ -16,21 +16,21 @@ * limitations under the License. */ -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include #include #include "abstract/utils.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "utils/symbolic.h" #include "ir/tensor.h" #include "ir/func_graph_cloner.h" #include "./common.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" #include "debug/draw.h" -#include "pipeline/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/evaluator.h" #include "debug/trace.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.h b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h similarity index 99% rename from mindspore/ccsrc/pipeline/static_analysis/static_analysis.h rename to mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h index d4a3fd6a8d..181696f756 100644 --- a/mindspore/ccsrc/pipeline/static_analysis/static_analysis.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/static_analysis.h @@ -35,8 +35,8 @@ #include "ir/anf.h" #include "ir/primitive_py.h" #include "abstract/analysis_context.h" -#include "pipeline/static_analysis/abstract_function.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/static_analysis/abstract_function.h" +#include "pipeline/jit/parse/parse.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/validator.cc b/mindspore/ccsrc/pipeline/jit/validator.cc similarity index 97% rename from mindspore/ccsrc/pipeline/validator.cc rename to mindspore/ccsrc/pipeline/jit/validator.cc index bbca3c8721..04aa6efd05 100644 --- a/mindspore/ccsrc/pipeline/validator.cc +++ b/mindspore/ccsrc/pipeline/jit/validator.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "pipeline/validator.h" +#include "pipeline/jit/validator.h" #include #include @@ -24,7 +24,7 @@ #include "ir/manager.h" #include "ir/dtype.h" #include "./common.h" -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" namespace mindspore { namespace validator { diff --git a/mindspore/ccsrc/pipeline/validator.h b/mindspore/ccsrc/pipeline/jit/validator.h similarity index 97% rename from mindspore/ccsrc/pipeline/validator.h rename to mindspore/ccsrc/pipeline/jit/validator.h index 61f7470349..041448aed9 100644 --- a/mindspore/ccsrc/pipeline/validator.h +++ b/mindspore/ccsrc/pipeline/jit/validator.h @@ -23,7 +23,7 @@ #include #include #include -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/anf.h" #include "utils/misc.h" diff --git a/mindspore/ccsrc/pynative/CMakeLists.txt b/mindspore/ccsrc/pipeline/pynative/CMakeLists.txt similarity index 84% rename from mindspore/ccsrc/pynative/CMakeLists.txt rename to mindspore/ccsrc/pipeline/pynative/CMakeLists.txt index 5139160774..c15928ee76 100644 --- a/mindspore/ccsrc/pynative/CMakeLists.txt +++ b/mindspore/ccsrc/pipeline/pynative/CMakeLists.txt @@ -6,4 +6,4 @@ if (ENABLE_GE) endif () set_property(SOURCE ${_PYNATIVE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PYNATIVE) -add_library(_mindspore_pynative_obj OBJECT ${_PYNATIVE_SRC_LIST}) +add_library(_mindspore_pipeline_pynative_obj OBJECT ${_PYNATIVE_SRC_LIST}) diff --git a/mindspore/ccsrc/pynative/base.h b/mindspore/ccsrc/pipeline/pynative/base.h similarity index 100% rename from mindspore/ccsrc/pynative/base.h rename to mindspore/ccsrc/pipeline/pynative/base.h diff --git a/mindspore/ccsrc/pynative/pynative_execute.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc similarity index 98% rename from mindspore/ccsrc/pynative/pynative_execute.cc rename to mindspore/ccsrc/pipeline/pynative/pynative_execute.cc index 16b55554d4..5e3add1b5f 100644 --- a/mindspore/ccsrc/pynative/pynative_execute.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pynative/pynative_execute.h" +#include "pipeline/pynative/pynative_execute.h" #include #include @@ -28,29 +28,29 @@ #include "utils/any.h" #include "utils/utils.h" #include "utils/context/ms_context.h" -#include "operator/ops.h" -#include "operator/composite/composite.h" -#include "operator/composite/do_signature.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/resolve.h" -#include "pipeline/static_analysis/prim.h" -#include "session/session_factory.h" -#include "pre_activate/pass/const_input_to_attr_registry.h" -#include "pre_activate/common/helper.h" -#include "pipeline/action.h" - -#include "pynative/base.h" +#include "frontend/operator/ops.h" +#include "frontend/operator/composite/composite.h" +#include "frontend/operator/composite/do_signature.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/resolve.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "backend/session/session_factory.h" +#include "backend/optimizer/pass/const_input_to_attr_registry.h" +#include "backend/optimizer/common/helper.h" +#include "pipeline/jit/action.h" + +#include "pipeline/pynative/base.h" #include "pybind_api/api_register.h" #include "vm/transform.h" -#include "optimizer/ad/grad.h" -#include "pipeline/resource.h" -#include "pipeline/pipeline.h" -#include "pipeline/pass.h" +#include "frontend/optimizer/ad/grad.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/pipeline.h" +#include "pipeline/jit/pass.h" #ifdef ENABLE_GE -#include "pynative/pynative_execute_ge.h" +#include "pipeline/pynative/pynative_execute_ge.h" #endif using mindspore::tensor::TensorPy; diff --git a/mindspore/ccsrc/pynative/pynative_execute.h b/mindspore/ccsrc/pipeline/pynative/pynative_execute.h similarity index 97% rename from mindspore/ccsrc/pynative/pynative_execute.h rename to mindspore/ccsrc/pipeline/pynative/pynative_execute.h index 83cbea88d4..152d58aca4 100644 --- a/mindspore/ccsrc/pynative/pynative_execute.h +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.h @@ -28,11 +28,11 @@ #include "pybind11/pybind11.h" #include "pybind11/numpy.h" -#include "pynative/base.h" +#include "pipeline/pynative/base.h" #include "utils/context/ms_context.h" #include "ir/anf.h" -#include "pipeline/resource.h" -#include "operator/composite/composite.h" +#include "pipeline/jit/resource.h" +#include "frontend/operator/composite/composite.h" namespace mindspore { namespace pynative { diff --git a/mindspore/ccsrc/pynative/pynative_execute_ge.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc similarity index 98% rename from mindspore/ccsrc/pynative/pynative_execute_ge.cc rename to mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc index 8e10468236..897c21fc90 100644 --- a/mindspore/ccsrc/pynative/pynative_execute_ge.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pynative/pynative_execute_ge.h" +#include "pipeline/pynative/pynative_execute_ge.h" #include #include @@ -24,10 +24,10 @@ #include "utils/any.h" #include "utils/utils.h" #include "utils/context/ms_context.h" -#include "operator/ops.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/static_analysis/prim.h" -#include "session/session_factory.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "backend/session/session_factory.h" #include "ir/tensor_py.h" const char SINGLE_OP_GRAPH[] = "single_op_graph"; diff --git a/mindspore/ccsrc/pynative/pynative_execute_ge.h b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h similarity index 90% rename from mindspore/ccsrc/pynative/pynative_execute_ge.h rename to mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h index 2dca3df018..2978278489 100644 --- a/mindspore/ccsrc/pynative/pynative_execute_ge.h +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h @@ -23,10 +23,10 @@ #include #include -#include "pynative/base.h" -#include "transform/convert.h" -#include "transform/graph_runner.h" -#include "transform/types.h" +#include "pipeline/pynative/base.h" +#include "transform/graph_ir/convert.h" +#include "transform/graph_ir/graph_runner.h" +#include "transform/graph_ir/types.h" #include "utils/context/ms_context.h" using GeTensor = ge::Tensor; diff --git a/mindspore/ccsrc/predict/converter/attr_utils/convert_util.h b/mindspore/ccsrc/predict/converter/attr_utils/convert_util.h index 5c7551a190..612ccde1a5 100644 --- a/mindspore/ccsrc/predict/converter/attr_utils/convert_util.h +++ b/mindspore/ccsrc/predict/converter/attr_utils/convert_util.h @@ -25,7 +25,7 @@ #include #include #include "ir/tensor.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "predict/schema/inner/ms_generated.h" using TensorPtr = mindspore::tensor::TensorPtr; diff --git a/mindspore/ccsrc/predict/converter/kernel2ms.cc b/mindspore/ccsrc/predict/converter/kernel2ms.cc index 1b1277aade..04aceb62eb 100644 --- a/mindspore/ccsrc/predict/converter/kernel2ms.cc +++ b/mindspore/ccsrc/predict/converter/kernel2ms.cc @@ -18,7 +18,7 @@ #include #include "ir/anf.h" #include "predict/converter/lite_model/op_attr_packer.h" -#include "mindspore/ccsrc/operator/ops.h" +#include "mindspore/ccsrc/frontend/operator/ops.h" namespace mindspore { namespace executor { diff --git a/mindspore/ccsrc/predict/converter/kernel2ms.h b/mindspore/ccsrc/predict/converter/kernel2ms.h index 7013f88107..8cbc89ed6a 100644 --- a/mindspore/ccsrc/predict/converter/kernel2ms.h +++ b/mindspore/ccsrc/predict/converter/kernel2ms.h @@ -22,7 +22,7 @@ #include #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "predict/converter/executor_tensor.h" #include "predict/schema/inner/ms_generated.h" #include "predict/converter/attr_utils/convert_util.h" diff --git a/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.h b/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.h index 89e38d1871..31f14ef73a 100644 --- a/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.h +++ b/mindspore/ccsrc/predict/converter/lite_model/op_attr_packer.h @@ -20,7 +20,7 @@ #include #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "predict/schema/inner/ms_generated.h" static constexpr size_t kNIndex = 0; diff --git a/mindspore/ccsrc/predict/predict.h b/mindspore/ccsrc/predict/predict.h index 7c65f16619..9125451492 100644 --- a/mindspore/ccsrc/predict/predict.h +++ b/mindspore/ccsrc/predict/predict.h @@ -19,7 +19,7 @@ #include #include -#include "session/session_basic.h" +#include "backend/session/session_basic.h" #include "predict/converter/kernel2ms.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/CMakeLists.txt b/mindspore/ccsrc/runtime/device/CMakeLists.txt similarity index 96% rename from mindspore/ccsrc/device/CMakeLists.txt rename to mindspore/ccsrc/runtime/device/CMakeLists.txt index 652c04d4cd..9c95aee0dc 100644 --- a/mindspore/ccsrc/device/CMakeLists.txt +++ b/mindspore/ccsrc/runtime/device/CMakeLists.txt @@ -62,4 +62,4 @@ endif () set_property(SOURCE ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) -add_library(_mindspore_device_obj OBJECT ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST}) +add_library(_mindspore_runtime_device_obj OBJECT ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST}) diff --git a/mindspore/ccsrc/device/ascend/ascend_device_address.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc similarity index 98% rename from mindspore/ccsrc/device/ascend/ascend_device_address.cc rename to mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc index 1b5645ab30..32238a0603 100644 --- a/mindspore/ccsrc/device/ascend/ascend_device_address.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/ascend/ascend_device_address.h" +#include "runtime/device/ascend/ascend_device_address.h" #include #include #include #include #include "runtime/mem.h" -#include "device/kernel_runtime_manager.h" -#include "device/convert_tensor_utils.h" +#include "runtime/device/kernel_runtime_manager.h" +#include "runtime/device/convert_tensor_utils.h" #include "ir/dtype/type.h" #include "ir/tensor.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" #include "utils/utils.h" #include "common/utils.h" #include "common/trans.h" diff --git a/mindspore/ccsrc/device/ascend/ascend_device_address.h b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h similarity index 96% rename from mindspore/ccsrc/device/ascend/ascend_device_address.h rename to mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h index 27bcea814c..78d7006b56 100644 --- a/mindspore/ccsrc/device/ascend/ascend_device_address.h +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h @@ -20,8 +20,8 @@ #include #include #include -#include "device/device_address.h" -#include "device/ascend/ascend_memory_pool.h" +#include "runtime/device/device_address.h" +#include "runtime/device/ascend/ascend_memory_pool.h" #include "ir/dtype.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/ascend_kernel_runtime.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc similarity index 96% rename from mindspore/ccsrc/device/ascend/ascend_kernel_runtime.cc rename to mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc index 42b1d93dd5..07669a9b3c 100644 --- a/mindspore/ccsrc/device/ascend/ascend_kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc @@ -14,32 +14,32 @@ * limitations under the License. */ #define PATH_MAX 0x3ffff -#include "device/ascend/ascend_kernel_runtime.h" +#include "runtime/device/ascend/ascend_kernel_runtime.h" #include #include #include #include #include #include -#include "device/ascend/ascend_device_address.h" -#include "device/cpu/mpi/mpi_adapter.h" +#include "runtime/device/ascend/ascend_device_address.h" +#include "runtime/device/cpu/mpi/mpi_adapter.h" #include "utils/context/ms_context.h" #include "utils/mpi/mpi_config.h" -#include "device/ascend/profiling/profiling_manager.h" +#include "runtime/device/ascend/profiling/profiling_manager.h" #include "hccl/hcom.h" #include "common/trans.h" #include "runtime/context.h" -#include "device/ascend/ascend_label_assign.h" -#include "device/ascend/ascend_stream_assign.h" -#include "device/ascend/ascend_memory_pool.h" +#include "runtime/device/ascend/ascend_label_assign.h" +#include "runtime/device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_memory_pool.h" #include "framework/ge_runtime/model_runner.h" -#include "device/ascend/tasksink/task_generator.h" -#include "session/anf_runtime_algorithm.h" -#include "device/ascend/profiling/profiling_utils.h" -#include "kernel/tbe/tbe_utils.h" -#include "kernel/tbe/tbe_python_funcs.h" -#include "pre_activate/mem_reuse/mem_reuse_checker.h" -#include "device/ascend/ascend_memory_manager.h" +#include "runtime/device/ascend/tasksink/task_generator.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "backend/kernel_compiler/tbe/tbe_python_funcs.h" +#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" +#include "runtime/device/ascend/ascend_memory_manager.h" #include "debug/tensor_load.h" using ge::model_runner::ModelRunner; diff --git a/mindspore/ccsrc/device/ascend/ascend_kernel_runtime.h b/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h similarity index 93% rename from mindspore/ccsrc/device/ascend/ascend_kernel_runtime.h rename to mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h index 771c3f8c4f..4f1663d4d5 100644 --- a/mindspore/ccsrc/device/ascend/ascend_kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h @@ -19,14 +19,14 @@ #include #include #include -#include "device/kernel_runtime.h" +#include "runtime/device/kernel_runtime.h" #include "runtime/context.h" #include "framework/ge_runtime/davinci_model.h" -#include "device/kernel_runtime_manager.h" -#include "session/session_basic.h" +#include "runtime/device/kernel_runtime_manager.h" +#include "backend/session/session_basic.h" #ifdef ENABLE_DATA_DUMP #include "debug/data_dump_parser.h" -#include "device/ascend/dump/data_dumper.h" +#include "runtime/device/ascend/dump/data_dumper.h" #endif using ge::model_runner::TaskInfo; diff --git a/mindspore/ccsrc/device/ascend/ascend_label_assign.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.cc similarity index 98% rename from mindspore/ccsrc/device/ascend/ascend_label_assign.cc rename to mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.cc index 2db81a1725..035f4dd8e3 100644 --- a/mindspore/ccsrc/device/ascend/ascend_label_assign.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.cc @@ -17,8 +17,8 @@ #include #include #include -#include "device/ascend/ascend_label_assign.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/ascend_label_assign.h" +#include "backend/session/anf_runtime_algorithm.h" static constexpr uint32_t kLabelGotoLabelId = 1; static constexpr uint32_t kLabelSwitchLabelId = 2; diff --git a/mindspore/ccsrc/device/ascend/ascend_label_assign.h b/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.h similarity index 97% rename from mindspore/ccsrc/device/ascend/ascend_label_assign.h rename to mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.h index 98055576eb..6b09f2940e 100644 --- a/mindspore/ccsrc/device/ascend/ascend_label_assign.h +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.h @@ -19,7 +19,7 @@ #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "utils/contract.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/ascend_memory_manager.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc similarity index 97% rename from mindspore/ccsrc/device/ascend/ascend_memory_manager.cc rename to mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc index a664232a28..f9da0850c6 100644 --- a/mindspore/ccsrc/device/ascend/ascend_memory_manager.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include -#include "device/ascend/ascend_memory_manager.h" -#include "device/ascend/ascend_memory_pool.h" +#include "runtime/device/ascend/ascend_memory_manager.h" +#include "runtime/device/ascend/ascend_memory_pool.h" #include "utils/context/ms_context.h" #include "runtime/mem.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/ascend_memory_manager.h b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.h similarity index 97% rename from mindspore/ccsrc/device/ascend/ascend_memory_manager.h rename to mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.h index 5b52412d78..720f15be00 100644 --- a/mindspore/ccsrc/device/ascend/ascend_memory_manager.h +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_MINDSPORE_CCSRC_DEVICE_ASCEND_ASCEND_MEMORY_MANAGER_H_ #define MINDSPORE_MINDSPORE_CCSRC_DEVICE_ASCEND_ASCEND_MEMORY_MANAGER_H_ -#include "device/memory_manager.h" +#include "runtime/device/memory_manager.h" namespace mindspore { namespace device { namespace ascend { diff --git a/mindspore/ccsrc/device/ascend/ascend_memory_pool.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc similarity index 96% rename from mindspore/ccsrc/device/ascend/ascend_memory_pool.cc rename to mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc index f325046486..fe71ba43fc 100644 --- a/mindspore/ccsrc/device/ascend/ascend_memory_pool.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/ascend/ascend_memory_pool.h" -#include "device/ascend/ascend_kernel_runtime.h" +#include "runtime/device/ascend/ascend_memory_pool.h" +#include "runtime/device/ascend/ascend_kernel_runtime.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/ascend_memory_pool.h b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.h similarity index 96% rename from mindspore/ccsrc/device/ascend/ascend_memory_pool.h rename to mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.h index ef02f21cde..7a75198ab4 100644 --- a/mindspore/ccsrc/device/ascend/ascend_memory_pool.h +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_DEVICE_ASCEND_ASCEND_MEMORY_POOL_H_ #include -#include "pre_activate/mem_reuse/mem_dynamic_allocator.h" +#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/ascend_stream_assign.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc similarity index 99% rename from mindspore/ccsrc/device/ascend/ascend_stream_assign.cc rename to mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc index a68c408221..7cf5b94d45 100644 --- a/mindspore/ccsrc/device/ascend/ascend_stream_assign.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_stream_assign.h" #include #include @@ -22,10 +22,10 @@ #include "ir/manager.h" #include "utils/context/ms_context.h" #include "common/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_adjust.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_adjust.h" #include "predict/generator/utils/ir_model_util.h" -#include "pre_activate/common/helper.h" +#include "backend/optimizer/common/helper.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/ascend_stream_assign.h b/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h similarity index 99% rename from mindspore/ccsrc/device/ascend/ascend_stream_assign.h rename to mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h index d268e0c975..00fca60e8d 100644 --- a/mindspore/ccsrc/device/ascend/ascend_stream_assign.h +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h @@ -28,7 +28,7 @@ #include "runtime/base.h" #include "runtime/rt_model.h" #include "runtime/stream.h" -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "utils/contract.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/dump/data_dumper.cc b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc similarity index 98% rename from mindspore/ccsrc/device/ascend/dump/data_dumper.cc rename to mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc index 14f2c2a524..ab2c6b2748 100644 --- a/mindspore/ccsrc/device/ascend/dump/data_dumper.cc +++ b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc @@ -14,16 +14,16 @@ * limitations under the License. */ #ifdef ENABLE_DATA_DUMP -#include "device/ascend/dump/data_dumper.h" +#include "runtime/device/ascend/dump/data_dumper.h" #include #include #include #include "utility" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "runtime/mem.h" #include "runtime/kernel.h" -#include "device/ascend/dump/ge_dump.h" +#include "runtime/device/ascend/dump/ge_dump.h" #include "proto/op_mapping_info.pb.h" #include "utils/context/ms_context.h" #include "debug/data_dump_parser.h" diff --git a/mindspore/ccsrc/device/ascend/dump/data_dumper.h b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.h similarity index 98% rename from mindspore/ccsrc/device/ascend/dump/data_dumper.h rename to mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.h index 65b01c61c4..d99eb4db68 100644 --- a/mindspore/ccsrc/device/ascend/dump/data_dumper.h +++ b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.h @@ -22,7 +22,7 @@ #include #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace aicpu { namespace dump { diff --git a/mindspore/ccsrc/device/ascend/dump/ge_dump.h b/mindspore/ccsrc/runtime/device/ascend/dump/ge_dump.h similarity index 100% rename from mindspore/ccsrc/device/ascend/dump/ge_dump.h rename to mindspore/ccsrc/runtime/device/ascend/dump/ge_dump.h diff --git a/mindspore/ccsrc/device/ascend/dump/proto/ge_dtype.proto b/mindspore/ccsrc/runtime/device/ascend/dump/proto/ge_dtype.proto similarity index 100% rename from mindspore/ccsrc/device/ascend/dump/proto/ge_dtype.proto rename to mindspore/ccsrc/runtime/device/ascend/dump/proto/ge_dtype.proto diff --git a/mindspore/ccsrc/device/ascend/dump/proto/op_mapping_info.proto b/mindspore/ccsrc/runtime/device/ascend/dump/proto/op_mapping_info.proto similarity index 100% rename from mindspore/ccsrc/device/ascend/dump/proto/op_mapping_info.proto rename to mindspore/ccsrc/runtime/device/ascend/dump/proto/op_mapping_info.proto diff --git a/mindspore/ccsrc/device/ascend/kernel_build_ascend.cc b/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc similarity index 93% rename from mindspore/ccsrc/device/ascend/kernel_build_ascend.cc rename to mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc index bd0b436344..39cefcb020 100644 --- a/mindspore/ccsrc/device/ascend/kernel_build_ascend.cc +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc @@ -14,26 +14,26 @@ * limitations under the License. */ -#include "device/ascend/kernel_build_ascend.h" +#include "runtime/device/ascend/kernel_build_ascend.h" #include #include #include #include -#include "device/ascend/kernel_select_ascend.h" -#include "device/kernel_info.h" -#include "kernel/kernel.h" -#include "kernel/tbe/tbe_kernel_build.h" -#include "kernel/tbe/tbe_kernel_parallel_build.h" -#include "kernel/akg/ascend/akg_ascend_kernel_build.h" -#include "kernel/aicpu/aicpu_kernel_build.h" -#include "kernel/hccl/hccl_kernel_build.h" -#include "kernel/rts/rt_kernel_build.h" -#include "kernel/tbe/tbe_utils.h" -#include "kernel/common_utils.h" -#include "operator/ops.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/kernel_select_ascend.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h" +#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h" +#include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h" +#include "backend/kernel_compiler/hccl/hccl_kernel_build.h" +#include "backend/kernel_compiler/rts/rt_kernel_build.h" +#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "backend/kernel_compiler/common_utils.h" +#include "frontend/operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" #include "./common.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/ascend/kernel_build_ascend.h b/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.h similarity index 97% rename from mindspore/ccsrc/device/ascend/kernel_build_ascend.h rename to mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.h index d987b6ce7a..0d2870eb0a 100644 --- a/mindspore/ccsrc/device/ascend/kernel_build_ascend.h +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_DEVICE_ASCEND_KERNEL_BUILD_ASCEND_H_ #define MINDSPORE_CCSRC_DEVICE_ASCEND_KERNEL_BUILD_ASCEND_H_ -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/kernel_select_ascend.cc b/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc similarity index 98% rename from mindspore/ccsrc/device/ascend/kernel_select_ascend.cc rename to mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc index cde79a18f7..e8fc6c7a98 100644 --- a/mindspore/ccsrc/device/ascend/kernel_select_ascend.cc +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/ascend/kernel_select_ascend.h" +#include "runtime/device/ascend/kernel_select_ascend.h" #include #include @@ -26,15 +26,15 @@ #include #include "common/utils.h" #include "debug/anf_ir_dump.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/func_graph.h" #include "utils/context/ms_context.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" -#include "kernel/common_utils.h" -#include "kernel/kernel_query.h" -#include "kernel/oplib/oplib.h" -#include "kernel/kernel_build_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/kernel_compiler/kernel_query.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/kernel_select_ascend.h b/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.h similarity index 96% rename from mindspore/ccsrc/device/ascend/kernel_select_ascend.h rename to mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.h index 7b7a7b9fb9..8a93b77cec 100644 --- a/mindspore/ccsrc/device/ascend/kernel_select_ascend.h +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_MINDSPORE_CCSRC_DEVICE_ASCEND_KERNEL_SELECT_ASCEND_ANFALGO_H_ #define MINDSPORE_MINDSPORE_CCSRC_DEVICE_ASCEND_KERNEL_SELECT_ASCEND_ANFALGO_H_ #include "ir/anf.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace device { namespace ascend { diff --git a/mindspore/ccsrc/device/ascend/kernel_select_graph_kernel.cc b/mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc similarity index 98% rename from mindspore/ccsrc/device/ascend/kernel_select_graph_kernel.cc rename to mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc index db31460d31..42e856d112 100644 --- a/mindspore/ccsrc/device/ascend/kernel_select_graph_kernel.cc +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "device/ascend/kernel_select_ascend.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" +#include "runtime/device/ascend/kernel_select_ascend.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" #include "ir/func_graph.h" -#include "kernel/common_utils.h" -#include "kernel/kernel_query.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/kernel_compiler/kernel_query.h" +#include "backend/kernel_compiler/kernel_build_info.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/plugin_impl.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/plugin_impl.cc similarity index 95% rename from mindspore/ccsrc/device/ascend/profiling/plugin_impl.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/plugin_impl.cc index 7790107aa1..4886c00a8e 100644 --- a/mindspore/ccsrc/device/ascend/profiling/plugin_impl.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/plugin_impl.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/ascend/profiling/plugin_impl.h" +#include "runtime/device/ascend/profiling/plugin_impl.h" #include #include "utils/log_adapter.h" using std::string; diff --git a/mindspore/ccsrc/device/ascend/profiling/plugin_impl.h b/mindspore/ccsrc/runtime/device/ascend/profiling/plugin_impl.h similarity index 100% rename from mindspore/ccsrc/device/ascend/profiling/plugin_impl.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/plugin_impl.h diff --git a/mindspore/ccsrc/device/ascend/profiling/profiling_engine_impl.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_engine_impl.cc similarity index 89% rename from mindspore/ccsrc/device/ascend/profiling/profiling_engine_impl.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/profiling_engine_impl.cc index a393409334..1f35cba0f7 100644 --- a/mindspore/ccsrc/device/ascend/profiling/profiling_engine_impl.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_engine_impl.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/ascend/profiling/profiling_engine_impl.h" +#include "runtime/device/ascend/profiling/profiling_engine_impl.h" #include "utils/log_adapter.h" -#include "device/ascend/profiling/plugin_impl.h" +#include "runtime/device/ascend/profiling/plugin_impl.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/profiling_engine_impl.h b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_engine_impl.h similarity index 100% rename from mindspore/ccsrc/device/ascend/profiling/profiling_engine_impl.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/profiling_engine_impl.h diff --git a/mindspore/ccsrc/device/ascend/profiling/profiling_manager.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc similarity index 97% rename from mindspore/ccsrc/device/ascend/profiling/profiling_manager.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc index a2fe5b852d..6117fe5ecf 100644 --- a/mindspore/ccsrc/device/ascend/profiling/profiling_manager.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "device/ascend/profiling/profiling_manager.h" +#include "runtime/device/ascend/profiling/profiling_manager.h" #include #include #include "securec/include/securec.h" #include "./prof_mgr_core.h" -#include "device/ascend/profiling/plugin_impl.h" -#include "device/ascend/profiling/profiling_engine_impl.h" +#include "runtime/device/ascend/profiling/plugin_impl.h" +#include "runtime/device/ascend/profiling/profiling_engine_impl.h" #include "utils/log_adapter.h" #include "utils/context/ms_context.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/device/ascend/profiling/profiling_manager.h b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h similarity index 100% rename from mindspore/ccsrc/device/ascend/profiling/profiling_manager.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h diff --git a/mindspore/ccsrc/device/ascend/profiling/profiling_utils.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc similarity index 97% rename from mindspore/ccsrc/device/ascend/profiling/profiling_utils.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc index 17ac4c4530..5b1db6a404 100644 --- a/mindspore/ccsrc/device/ascend/profiling/profiling_utils.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "device/ascend/profiling/reporter/graph_desc_reporter.h" -#include "device/ascend/profiling/profiling_utils.h" -#include "kernel/kernel.h" -#include "device/ascend/profiling/profiling_manager.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/profiling/reporter/graph_desc_reporter.h" +#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "backend/kernel_compiler/kernel.h" +#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" #include "utils/utils.h" -#include "device/ascend/profiling/reporter/task_desc_reporter.h" +#include "runtime/device/ascend/profiling/reporter/task_desc_reporter.h" #include "utils/context/ms_context.h" -#include "device/ascend/profiling/reporter/point_reporter.h" +#include "runtime/device/ascend/profiling/reporter/point_reporter.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/profiling_utils.h b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.h similarity index 98% rename from mindspore/ccsrc/device/ascend/profiling/profiling_utils.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.h index a3c7739447..de8ff2ac39 100644 --- a/mindspore/ccsrc/device/ascend/profiling/profiling_utils.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.h @@ -22,9 +22,9 @@ #include #include #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" #include "utils/contract.h" -#include "device/ascend/profiling/reporter/profiling_desc.h" +#include "runtime/device/ascend/profiling/reporter/profiling_desc.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/desc_reporter.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/desc_reporter.cc similarity index 94% rename from mindspore/ccsrc/device/ascend/profiling/reporter/desc_reporter.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/desc_reporter.cc index cf80c07ca9..87e2bbcb06 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/desc_reporter.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/desc_reporter.cc @@ -15,8 +15,8 @@ */ #include -#include "device/ascend/profiling/reporter/desc_reporter.h" -#include "device/ascend/profiling/plugin_impl.h" +#include "runtime/device/ascend/profiling/reporter/desc_reporter.h" +#include "runtime/device/ascend/profiling/plugin_impl.h" #include "utils/log_adapter.h" constexpr size_t kReportMaxLen = 2048; diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/desc_reporter.h b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/desc_reporter.h similarity index 93% rename from mindspore/ccsrc/device/ascend/profiling/reporter/desc_reporter.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/desc_reporter.h index c8e1b3ed62..f25c64ce05 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/desc_reporter.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/desc_reporter.h @@ -22,9 +22,9 @@ #include #include #include "toolchain/prof_reporter.h" -#include "device/ascend/profiling/reporter/profiling_desc.h" +#include "runtime/device/ascend/profiling/reporter/profiling_desc.h" #include "utils/contract.h" -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/graph_desc_reporter.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/graph_desc_reporter.cc similarity index 95% rename from mindspore/ccsrc/device/ascend/profiling/reporter/graph_desc_reporter.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/graph_desc_reporter.cc index 1f2d1570bb..5c028986d4 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/graph_desc_reporter.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/graph_desc_reporter.cc @@ -16,8 +16,8 @@ #include #include -#include "device/ascend/profiling/reporter/graph_desc_reporter.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/ascend/profiling/reporter/graph_desc_reporter.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/graph_desc_reporter.h b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/graph_desc_reporter.h similarity index 95% rename from mindspore/ccsrc/device/ascend/profiling/reporter/graph_desc_reporter.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/graph_desc_reporter.h index 10f78092f2..531f122cde 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/graph_desc_reporter.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/graph_desc_reporter.h @@ -20,7 +20,7 @@ #include #include #include -#include "device/ascend/profiling/reporter/desc_reporter.h" +#include "runtime/device/ascend/profiling/reporter/desc_reporter.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/point_reporter.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/point_reporter.cc similarity index 93% rename from mindspore/ccsrc/device/ascend/profiling/reporter/point_reporter.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/point_reporter.cc index 0024ab9c22..42a1b4c286 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/point_reporter.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/point_reporter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/ascend/profiling/reporter/point_reporter.h" +#include "runtime/device/ascend/profiling/reporter/point_reporter.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/point_reporter.h b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/point_reporter.h similarity index 95% rename from mindspore/ccsrc/device/ascend/profiling/reporter/point_reporter.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/point_reporter.h index ae12672df6..c24535f4ec 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/point_reporter.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/point_reporter.h @@ -19,7 +19,7 @@ #include #include -#include "device/ascend/profiling/reporter/desc_reporter.h" +#include "runtime/device/ascend/profiling/reporter/desc_reporter.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/profiling_desc.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/profiling_desc.cc similarity index 97% rename from mindspore/ccsrc/device/ascend/profiling/reporter/profiling_desc.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/profiling_desc.cc index 082cb81e42..4aec72472c 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/profiling_desc.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/profiling_desc.cc @@ -17,7 +17,7 @@ #include #include #include -#include "device/ascend/profiling/reporter/profiling_desc.h" +#include "runtime/device/ascend/profiling/reporter/profiling_desc.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/profiling_desc.h b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/profiling_desc.h similarity index 100% rename from mindspore/ccsrc/device/ascend/profiling/reporter/profiling_desc.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/profiling_desc.h diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/task_desc_reporter.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/task_desc_reporter.cc similarity index 92% rename from mindspore/ccsrc/device/ascend/profiling/reporter/task_desc_reporter.cc rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/task_desc_reporter.cc index 0bd66e31ef..26d722aa1a 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/task_desc_reporter.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/task_desc_reporter.cc @@ -15,9 +15,9 @@ */ #include -#include "device/ascend/profiling/reporter/task_desc_reporter.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/ascend_kernel_mod.h" +#include "runtime/device/ascend/profiling/reporter/task_desc_reporter.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/profiling/reporter/task_desc_reporter.h b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/task_desc_reporter.h similarity index 96% rename from mindspore/ccsrc/device/ascend/profiling/reporter/task_desc_reporter.h rename to mindspore/ccsrc/runtime/device/ascend/profiling/reporter/task_desc_reporter.h index 087c691a5f..51526735a9 100644 --- a/mindspore/ccsrc/device/ascend/profiling/reporter/task_desc_reporter.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/reporter/task_desc_reporter.h @@ -20,7 +20,7 @@ #include #include #include -#include "device/ascend/profiling/reporter/desc_reporter.h" +#include "runtime/device/ascend/profiling/reporter/desc_reporter.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/readme.md b/mindspore/ccsrc/runtime/device/ascend/readme.md similarity index 100% rename from mindspore/ccsrc/device/ascend/readme.md rename to mindspore/ccsrc/runtime/device/ascend/readme.md diff --git a/mindspore/ccsrc/device/ascend/tasksink/runtime_utils.cc b/mindspore/ccsrc/runtime/device/ascend/tasksink/runtime_utils.cc similarity index 98% rename from mindspore/ccsrc/device/ascend/tasksink/runtime_utils.cc rename to mindspore/ccsrc/runtime/device/ascend/tasksink/runtime_utils.cc index 3faeefb820..dba71edfd3 100644 --- a/mindspore/ccsrc/device/ascend/tasksink/runtime_utils.cc +++ b/mindspore/ccsrc/runtime/device/ascend/tasksink/runtime_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/ascend/tasksink/runtime_utils.h" +#include "runtime/device/ascend/tasksink/runtime_utils.h" #include diff --git a/mindspore/ccsrc/device/ascend/tasksink/runtime_utils.h b/mindspore/ccsrc/runtime/device/ascend/tasksink/runtime_utils.h similarity index 100% rename from mindspore/ccsrc/device/ascend/tasksink/runtime_utils.h rename to mindspore/ccsrc/runtime/device/ascend/tasksink/runtime_utils.h diff --git a/mindspore/ccsrc/device/ascend/tasksink/task_generator.cc b/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc similarity index 97% rename from mindspore/ccsrc/device/ascend/tasksink/task_generator.cc rename to mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc index 00489c7299..5aeb932105 100644 --- a/mindspore/ccsrc/device/ascend/tasksink/task_generator.cc +++ b/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "device/ascend/tasksink/task_generator.h" +#include "runtime/device/ascend/tasksink/task_generator.h" #include -#include "kernel/task_stream.h" +#include "backend/kernel_compiler/task_stream.h" #include "utils/context/ms_context.h" #include "common/utils.h" -#include "device/ascend/profiling/profiling_utils.h" -#include "device/ascend/profiling/profiling_manager.h" +#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "runtime/device/ascend/profiling/profiling_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/ascend/tasksink/task_generator.h b/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.h similarity index 95% rename from mindspore/ccsrc/device/ascend/tasksink/task_generator.h rename to mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.h index ecd5889b04..134dec48b6 100644 --- a/mindspore/ccsrc/device/ascend/tasksink/task_generator.h +++ b/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.h @@ -22,9 +22,9 @@ #include #include #include -#include "device/kernel_runtime.h" +#include "runtime/device/kernel_runtime.h" #include "ir/anf.h" -#include "kernel/ascend_kernel_mod.h" +#include "backend/kernel_compiler/ascend_kernel_mod.h" #include "framework/ge_runtime/task_info.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/convert_tensor_utils.cc b/mindspore/ccsrc/runtime/device/convert_tensor_utils.cc similarity index 97% rename from mindspore/ccsrc/device/convert_tensor_utils.cc rename to mindspore/ccsrc/runtime/device/convert_tensor_utils.cc index bac72727c2..cfd9b0fbdf 100644 --- a/mindspore/ccsrc/device/convert_tensor_utils.cc +++ b/mindspore/ccsrc/runtime/device/convert_tensor_utils.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/convert_tensor_utils.h" +#include "runtime/device/convert_tensor_utils.h" #include namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/convert_tensor_utils.h b/mindspore/ccsrc/runtime/device/convert_tensor_utils.h similarity index 100% rename from mindspore/ccsrc/device/convert_tensor_utils.h rename to mindspore/ccsrc/runtime/device/convert_tensor_utils.h diff --git a/mindspore/ccsrc/device/cpu/cpu_device_address.cc b/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc similarity index 95% rename from mindspore/ccsrc/device/cpu/cpu_device_address.cc rename to mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc index 09ab0da12b..92269233bd 100644 --- a/mindspore/ccsrc/device/cpu/cpu_device_address.cc +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/cpu/cpu_device_address.h" +#include "runtime/device/cpu/cpu_device_address.h" #include -#include "device/convert_tensor_utils.h" +#include "runtime/device/convert_tensor_utils.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/cpu_device_address.h b/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.h similarity index 94% rename from mindspore/ccsrc/device/cpu/cpu_device_address.h rename to mindspore/ccsrc/runtime/device/cpu/cpu_device_address.h index a041567f47..63cf171fa2 100644 --- a/mindspore/ccsrc/device/cpu/cpu_device_address.h +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.h @@ -18,7 +18,7 @@ #include #include -#include "device/device_address.h" +#include "runtime/device/device_address.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/cpu_kernel_runtime.cc b/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc similarity index 97% rename from mindspore/ccsrc/device/cpu/cpu_kernel_runtime.cc rename to mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc index f46d10ed82..d2e41a1fbd 100644 --- a/mindspore/ccsrc/device/cpu/cpu_kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/cpu/cpu_kernel_runtime.h" +#include "runtime/device/cpu/cpu_kernel_runtime.h" #include #include #include @@ -22,15 +22,15 @@ #include #include #include -#include "kernel/kernel.h" -#include "device/cpu/cpu_device_address.h" +#include "backend/kernel_compiler/kernel.h" +#include "runtime/device/cpu/cpu_device_address.h" #include "utils/context/ms_context.h" #include "utils/config_manager.h" #include "utils/profile.h" #include "common/utils.h" -#include "session/anf_runtime_algorithm.h" -#include "session/session_basic.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/session/session_basic.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/cpu_kernel_runtime.h b/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.h similarity index 92% rename from mindspore/ccsrc/device/cpu/cpu_kernel_runtime.h rename to mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.h index 354d2922c2..a29f840bfd 100644 --- a/mindspore/ccsrc/device/cpu/cpu_kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.h @@ -21,11 +21,11 @@ #include #include #include -#include "device/kernel_runtime.h" -#include "session/kernel_graph.h" -#include "session/session_basic.h" -#include "device/cpu/cpu_resource_manager.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_runtime.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/session_basic.h" +#include "runtime/device/cpu/cpu_resource_manager.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/any.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/cpu_resource_manager.cc b/mindspore/ccsrc/runtime/device/cpu/cpu_resource_manager.cc similarity index 97% rename from mindspore/ccsrc/device/cpu/cpu_resource_manager.cc rename to mindspore/ccsrc/runtime/device/cpu/cpu_resource_manager.cc index c69ef35305..c607260ab3 100644 --- a/mindspore/ccsrc/device/cpu/cpu_resource_manager.cc +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_resource_manager.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/cpu/cpu_resource_manager.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/cpu/cpu_resource_manager.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/cpu_resource_manager.h b/mindspore/ccsrc/runtime/device/cpu/cpu_resource_manager.h similarity index 90% rename from mindspore/ccsrc/device/cpu/cpu_resource_manager.h rename to mindspore/ccsrc/runtime/device/cpu/cpu_resource_manager.h index d130241464..d251760dd2 100644 --- a/mindspore/ccsrc/device/cpu/cpu_resource_manager.h +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_resource_manager.h @@ -18,10 +18,10 @@ #include #include -#include "session/kernel_graph.h" -#include "session/session_basic.h" -#include "device/device_address.h" -#include "device/cpu/cpu_simple_mem_plan.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/session_basic.h" +#include "runtime/device/device_address.h" +#include "runtime/device/cpu/cpu_simple_mem_plan.h" namespace mindspore { namespace device { namespace cpu { diff --git a/mindspore/ccsrc/device/cpu/cpu_simple_mem_plan.cc b/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.cc similarity index 97% rename from mindspore/ccsrc/device/cpu/cpu_simple_mem_plan.cc rename to mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.cc index e6cb6ee53a..7838e66984 100644 --- a/mindspore/ccsrc/device/cpu/cpu_simple_mem_plan.cc +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/cpu/cpu_simple_mem_plan.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/cpu/cpu_simple_mem_plan.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/cpu_simple_mem_plan.h b/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.h similarity index 94% rename from mindspore/ccsrc/device/cpu/cpu_simple_mem_plan.h rename to mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.h index 7633ef3f45..123e29fbe5 100644 --- a/mindspore/ccsrc/device/cpu/cpu_simple_mem_plan.h +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.h @@ -18,8 +18,8 @@ #include #include -#include "session/kernel_graph.h" -#include "device/device_address.h" +#include "backend/session/kernel_graph.h" +#include "runtime/device/device_address.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/kernel_select_cpu.cc b/mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.cc similarity index 98% rename from mindspore/ccsrc/device/cpu/kernel_select_cpu.cc rename to mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.cc index 9d72bcab89..9528e61ee9 100644 --- a/mindspore/ccsrc/device/cpu/kernel_select_cpu.cc +++ b/mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "device/cpu/kernel_select_cpu.h" +#include "runtime/device/cpu/kernel_select_cpu.h" #include #include #include -#include "kernel/cpu/cpu_kernel_factory.h" +#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/cpu/kernel_select_cpu.h b/mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.h similarity index 100% rename from mindspore/ccsrc/device/cpu/kernel_select_cpu.h rename to mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.h diff --git a/mindspore/ccsrc/device/cpu/mpi/mpi_adapter.cc b/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.cc similarity index 99% rename from mindspore/ccsrc/device/cpu/mpi/mpi_adapter.cc rename to mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.cc index 9b06c0a40a..c124523d59 100644 --- a/mindspore/ccsrc/device/cpu/mpi/mpi_adapter.cc +++ b/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/cpu/mpi/mpi_adapter.h" +#include "runtime/device/cpu/mpi/mpi_adapter.h" #ifdef ENABLE_MPI #include #include diff --git a/mindspore/ccsrc/device/cpu/mpi/mpi_adapter.h b/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.h similarity index 100% rename from mindspore/ccsrc/device/cpu/mpi/mpi_adapter.h rename to mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.h diff --git a/mindspore/ccsrc/device/cpu/readme.md b/mindspore/ccsrc/runtime/device/cpu/readme.md similarity index 100% rename from mindspore/ccsrc/device/cpu/readme.md rename to mindspore/ccsrc/runtime/device/cpu/readme.md diff --git a/mindspore/ccsrc/device/device_address.h b/mindspore/ccsrc/runtime/device/device_address.h similarity index 100% rename from mindspore/ccsrc/device/device_address.h rename to mindspore/ccsrc/runtime/device/device_address.h diff --git a/mindspore/ccsrc/device/gpu/blocking_queue.cc b/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc similarity index 98% rename from mindspore/ccsrc/device/gpu/blocking_queue.cc rename to mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc index 3b5e75f551..547c2fbe64 100644 --- a/mindspore/ccsrc/device/gpu/blocking_queue.cc +++ b/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "device/gpu/blocking_queue.h" +#include "runtime/device/gpu/blocking_queue.h" #include -#include "device/gpu/gpu_common.h" +#include "runtime/device/gpu/gpu_common.h" #include "common/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/gpu/blocking_queue.h b/mindspore/ccsrc/runtime/device/gpu/blocking_queue.h similarity index 100% rename from mindspore/ccsrc/device/gpu/blocking_queue.h rename to mindspore/ccsrc/runtime/device/gpu/blocking_queue.h diff --git a/mindspore/ccsrc/device/gpu/cuda_common.h b/mindspore/ccsrc/runtime/device/gpu/cuda_common.h similarity index 97% rename from mindspore/ccsrc/device/gpu/cuda_common.h rename to mindspore/ccsrc/runtime/device/gpu/cuda_common.h index b79ba8bc28..2689fdbaca 100644 --- a/mindspore/ccsrc/device/gpu/cuda_common.h +++ b/mindspore/ccsrc/runtime/device/gpu/cuda_common.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_DEVICE_GPU_CUDA_COMMON_H_ #include -#include "device/gpu/gpu_device_manager.h" +#include "runtime/device/gpu/gpu_device_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/cuda_driver.cc b/mindspore/ccsrc/runtime/device/gpu/cuda_driver.cc similarity index 99% rename from mindspore/ccsrc/device/gpu/cuda_driver.cc rename to mindspore/ccsrc/runtime/device/gpu/cuda_driver.cc index 0dee53df64..1f5e5e3c22 100644 --- a/mindspore/ccsrc/device/gpu/cuda_driver.cc +++ b/mindspore/ccsrc/runtime/device/gpu/cuda_driver.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/gpu/cuda_driver.h" +#include "runtime/device/gpu/cuda_driver.h" #include #include "utils/log_adapter.h" #include "utils/convert_utils.h" diff --git a/mindspore/ccsrc/device/gpu/cuda_driver.h b/mindspore/ccsrc/runtime/device/gpu/cuda_driver.h similarity index 100% rename from mindspore/ccsrc/device/gpu/cuda_driver.h rename to mindspore/ccsrc/runtime/device/gpu/cuda_driver.h diff --git a/mindspore/ccsrc/device/gpu/distribution/collective_common.h b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_common.h similarity index 100% rename from mindspore/ccsrc/device/gpu/distribution/collective_common.h rename to mindspore/ccsrc/runtime/device/gpu/distribution/collective_common.h diff --git a/mindspore/ccsrc/device/gpu/distribution/collective_fake_init.cc b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.cc similarity index 93% rename from mindspore/ccsrc/device/gpu/distribution/collective_fake_init.cc rename to mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.cc index 06497a2e82..80793042fd 100644 --- a/mindspore/ccsrc/device/gpu/distribution/collective_fake_init.cc +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/gpu/distribution/collective_fake_init.h" +#include "runtime/device/gpu/distribution/collective_fake_init.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/gpu/distribution/collective_fake_init.h b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.h similarity index 100% rename from mindspore/ccsrc/device/gpu/distribution/collective_fake_init.h rename to mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.h diff --git a/mindspore/ccsrc/device/gpu/distribution/collective_init.cc b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.cc similarity index 97% rename from mindspore/ccsrc/device/gpu/distribution/collective_init.cc rename to mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.cc index d7ab95bbe8..cba789b38d 100644 --- a/mindspore/ccsrc/device/gpu/distribution/collective_init.cc +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/gpu/distribution/collective_init.h" +#include "runtime/device/gpu/distribution/collective_init.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/gpu/distribution/collective_init.h b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.h similarity index 100% rename from mindspore/ccsrc/device/gpu/distribution/collective_init.h rename to mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.h diff --git a/mindspore/ccsrc/device/gpu/distribution/collective_wrapper.cc b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.cc similarity index 95% rename from mindspore/ccsrc/device/gpu/distribution/collective_wrapper.cc rename to mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.cc index 5fb0f74849..927c93cfaf 100644 --- a/mindspore/ccsrc/device/gpu/distribution/collective_wrapper.cc +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.cc @@ -20,8 +20,8 @@ #include #include #include -#include "device/gpu/distribution/mpi_wrapper.h" -#include "device/gpu/distribution/nccl_wrapper.h" +#include "runtime/device/gpu/distribution/mpi_wrapper.h" +#include "runtime/device/gpu/distribution/nccl_wrapper.h" #ifndef EXPORT_WRAPPER #define EXPORT_WRAPPER __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/device/gpu/distribution/mpi_wrapper.cc b/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.cc similarity index 96% rename from mindspore/ccsrc/device/gpu/distribution/mpi_wrapper.cc rename to mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.cc index 46b574c575..ed768fbbe5 100644 --- a/mindspore/ccsrc/device/gpu/distribution/mpi_wrapper.cc +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "device/gpu/distribution/mpi_wrapper.h" +#include "runtime/device/gpu/distribution/mpi_wrapper.h" #include #include -#include "device/gpu/distribution/nccl_wrapper.h" +#include "runtime/device/gpu/distribution/nccl_wrapper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/distribution/mpi_wrapper.h b/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.h similarity index 95% rename from mindspore/ccsrc/device/gpu/distribution/mpi_wrapper.h rename to mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.h index 6dfedea922..3d54b376cf 100644 --- a/mindspore/ccsrc/device/gpu/distribution/mpi_wrapper.h +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.h @@ -22,7 +22,7 @@ #include #include #include -#include "device/gpu/distribution/collective_common.h" +#include "runtime/device/gpu/distribution/collective_common.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/distribution/nccl_wrapper.cc b/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.cc similarity index 97% rename from mindspore/ccsrc/device/gpu/distribution/nccl_wrapper.cc rename to mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.cc index aa4756a69f..adf0b2f6fb 100644 --- a/mindspore/ccsrc/device/gpu/distribution/nccl_wrapper.cc +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/gpu/distribution/nccl_wrapper.h" +#include "runtime/device/gpu/distribution/nccl_wrapper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/distribution/nccl_wrapper.h b/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.h similarity index 96% rename from mindspore/ccsrc/device/gpu/distribution/nccl_wrapper.h rename to mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.h index 5df1e63bb8..fb09efc085 100644 --- a/mindspore/ccsrc/device/gpu/distribution/nccl_wrapper.h +++ b/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.h @@ -20,7 +20,7 @@ #include #include #include -#include "device/gpu/distribution/collective_common.h" +#include "runtime/device/gpu/distribution/collective_common.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_buffer_mgr.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc similarity index 99% rename from mindspore/ccsrc/device/gpu/gpu_buffer_mgr.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc index 621ba557e5..a1b1fa9b79 100644 --- a/mindspore/ccsrc/device/gpu/gpu_buffer_mgr.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/gpu/gpu_buffer_mgr.h" +#include "runtime/device/gpu/gpu_buffer_mgr.h" #include #include #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/device/gpu/gpu_buffer_mgr.h b/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.h similarity index 98% rename from mindspore/ccsrc/device/gpu/gpu_buffer_mgr.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.h index 5ce4a2cbdc..722a36c4ed 100644 --- a/mindspore/ccsrc/device/gpu/gpu_buffer_mgr.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.h @@ -25,7 +25,7 @@ #include #include #include -#include "device/gpu/blocking_queue.h" +#include "runtime/device/gpu/blocking_queue.h" #define EXPORT __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/device/gpu/gpu_common.h b/mindspore/ccsrc/runtime/device/gpu/gpu_common.h similarity index 100% rename from mindspore/ccsrc/device/gpu/gpu_common.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_common.h diff --git a/mindspore/ccsrc/device/gpu/gpu_device_address.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.cc similarity index 93% rename from mindspore/ccsrc/device/gpu/gpu_device_address.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_device_address.cc index 401eb9f34e..a20a6a9a3c 100644 --- a/mindspore/ccsrc/device/gpu/gpu_device_address.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "device/gpu/gpu_device_address.h" +#include "runtime/device/gpu/gpu_device_address.h" #include -#include "device/gpu/gpu_device_manager.h" +#include "runtime/device/gpu/gpu_device_manager.h" #include "utils/log_adapter.h" -#include "device/gpu/gpu_memory_allocator.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_device_address.h b/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.h similarity index 95% rename from mindspore/ccsrc/device/gpu/gpu_device_address.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_device_address.h index 4074cb6ce9..ade738deed 100644 --- a/mindspore/ccsrc/device/gpu/gpu_device_address.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.h @@ -19,7 +19,7 @@ #include #include -#include "device/device_address.h" +#include "runtime/device/device_address.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_device_manager.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.cc similarity index 94% rename from mindspore/ccsrc/device/gpu/gpu_device_manager.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.cc index 9f5f37c606..8f17fc20b5 100644 --- a/mindspore/ccsrc/device/gpu/gpu_device_manager.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "device/gpu/gpu_device_manager.h" -#include "device/gpu/gpu_common.h" +#include "runtime/device/gpu/gpu_device_manager.h" +#include "runtime/device/gpu/gpu_common.h" #include "utils/log_adapter.h" #include "utils/convert_utils.h" -#include "device/gpu/gpu_buffer_mgr.h" +#include "runtime/device/gpu/gpu_buffer_mgr.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_device_manager.h b/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.h similarity index 93% rename from mindspore/ccsrc/device/gpu/gpu_device_manager.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.h index b6b630181e..002806675c 100644 --- a/mindspore/ccsrc/device/gpu/gpu_device_manager.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.h @@ -21,8 +21,8 @@ #include #include #include -#include "device/gpu/cuda_driver.h" -#include "device/gpu/gpu_memory_allocator.h" +#include "runtime/device/gpu/cuda_driver.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_kernel_build.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.cc similarity index 85% rename from mindspore/ccsrc/device/gpu/gpu_kernel_build.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.cc index 19d2284510..9d88a205bc 100644 --- a/mindspore/ccsrc/device/gpu/gpu_kernel_build.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/gpu/gpu_kernel_build.h" +#include "runtime/device/gpu/gpu_kernel_build.h" #include -#include "kernel/kernel.h" -#include "kernel/akg/akg_kernel_build.h" -#include "kernel/akg/gpu/akg_gpu_kernel_build.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "operator/ops.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel.h" +#include "backend/kernel_compiler/akg/akg_kernel_build.h" +#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "frontend/operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { namespace gpu { diff --git a/mindspore/ccsrc/device/gpu/gpu_kernel_build.h b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.h similarity index 95% rename from mindspore/ccsrc/device/gpu/gpu_kernel_build.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.h index 5770e4d3b1..831c4e9511 100644 --- a/mindspore/ccsrc/device/gpu/gpu_kernel_build.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_DEVICE_GPU_GPUKERNELBUILD_H_ #include -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { namespace device { namespace gpu { diff --git a/mindspore/ccsrc/device/gpu/gpu_kernel_runtime.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc similarity index 95% rename from mindspore/ccsrc/device/gpu/gpu_kernel_runtime.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc index 839229be36..ddf73841b7 100644 --- a/mindspore/ccsrc/device/gpu/gpu_kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc @@ -14,21 +14,21 @@ * limitations under the License. */ -#include "device/gpu/gpu_kernel_runtime.h" -#include "device/gpu/gpu_device_address.h" -#include "device/gpu/cuda_driver.h" -#include "device/gpu/gpu_buffer_mgr.h" -#include "device/gpu/gpu_device_manager.h" -#include "device/gpu/gpu_memory_allocator.h" -#include "device/gpu/distribution/collective_init.h" +#include "runtime/device/gpu/gpu_kernel_runtime.h" +#include "runtime/device/gpu/gpu_device_address.h" +#include "runtime/device/gpu/cuda_driver.h" +#include "runtime/device/gpu/gpu_buffer_mgr.h" +#include "runtime/device/gpu/gpu_device_manager.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "runtime/device/gpu/distribution/collective_init.h" #include "utils/convert_utils.h" #include "utils/context/ms_context.h" -#include "device/kernel_runtime_manager.h" -#include "device/gpu/gpu_common.h" +#include "runtime/device/kernel_runtime_manager.h" +#include "runtime/device/gpu/gpu_common.h" #include "common/utils.h" -#include "device/gpu/gpu_memory_manager.h" -#include "kernel/common_utils.h" -#include "device/gpu/gpu_memory_copy_manager.h" +#include "runtime/device/gpu/gpu_memory_manager.h" +#include "backend/kernel_compiler/common_utils.h" +#include "runtime/device/gpu/gpu_memory_copy_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_kernel_runtime.h b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.h similarity index 94% rename from mindspore/ccsrc/device/gpu/gpu_kernel_runtime.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.h index bc7e4ed22c..2b1f8198ce 100644 --- a/mindspore/ccsrc/device/gpu/gpu_kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.h @@ -22,9 +22,9 @@ #include #include #include -#include "device/kernel_runtime.h" -#include "device/kernel_runtime_manager.h" -#include "pre_activate/mem_reuse/mem_swap_manager.h" +#include "runtime/device/kernel_runtime.h" +#include "runtime/device/kernel_runtime_manager.h" +#include "backend/optimizer/mem_reuse/mem_swap_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_memory_allocator.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc similarity index 95% rename from mindspore/ccsrc/device/gpu/gpu_memory_allocator.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc index 9137945661..e2395bbaf2 100644 --- a/mindspore/ccsrc/device/gpu/gpu_memory_allocator.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc @@ -15,8 +15,8 @@ */ #include -#include "device/gpu/gpu_memory_allocator.h" -#include "device/gpu/cuda_driver.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "runtime/device/gpu/cuda_driver.h" #include "utils/log_adapter.h" #include "utils/context/ms_context.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/device/gpu/gpu_memory_allocator.h b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.h similarity index 91% rename from mindspore/ccsrc/device/gpu/gpu_memory_allocator.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.h index 90d7791057..4b6eaa4e14 100644 --- a/mindspore/ccsrc/device/gpu/gpu_memory_allocator.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_DEVICE_GPU_GPU_MEMORY_ALLOCATOR_H_ #include -#include "device/gpu/cuda_driver.h" -#include "pre_activate/mem_reuse/mem_dynamic_allocator.h" +#include "runtime/device/gpu/cuda_driver.h" +#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.cc similarity index 96% rename from mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.cc index 80206f309d..0406c0f151 100644 --- a/mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "device/gpu/gpu_memory_copy_manager.h" -#include "device/gpu/gpu_common.h" -#include "device/gpu/gpu_device_manager.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/gpu/gpu_memory_copy_manager.h" +#include "runtime/device/gpu/gpu_common.h" +#include "runtime/device/gpu/gpu_device_manager.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.h b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.h similarity index 91% rename from mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.h index 36ff273015..dc99b7f7d0 100644 --- a/mindspore/ccsrc/device/gpu/gpu_memory_copy_manager.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.h @@ -20,10 +20,10 @@ #include #include #include -#include "pre_activate/mem_reuse/mem_copy_manager.h" -#include "device/device_address.h" -#include "device/gpu/cuda_driver.h" -#include "kernel/kernel.h" +#include "backend/optimizer/mem_reuse/mem_copy_manager.h" +#include "runtime/device/device_address.h" +#include "runtime/device/gpu/cuda_driver.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_memory_manager.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc similarity index 97% rename from mindspore/ccsrc/device/gpu/gpu_memory_manager.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc index 9a63921add..ffa07eea0d 100644 --- a/mindspore/ccsrc/device/gpu/gpu_memory_manager.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/gpu/gpu_memory_manager.h" -#include "device/gpu/gpu_memory_allocator.h" +#include "runtime/device/gpu/gpu_memory_manager.h" +#include "runtime/device/gpu/gpu_memory_allocator.h" #include "utils/context/ms_context.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/gpu/gpu_memory_manager.h b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.h similarity index 97% rename from mindspore/ccsrc/device/gpu/gpu_memory_manager.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.h index c79fb9cc22..533116cefc 100644 --- a/mindspore/ccsrc/device/gpu/gpu_memory_manager.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_MINDSPORE_CCSRC_DEVICE_GPU_GPU_MEMORY_MANAGER_H_ #define MINDSPORE_MINDSPORE_CCSRC_DEVICE_GPU_GPU_MEMORY_MANAGER_H_ #include -#include "device/memory_manager.h" +#include "runtime/device/memory_manager.h" namespace mindspore { namespace device { namespace gpu { diff --git a/mindspore/ccsrc/device/gpu/gpu_stream_assign.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.cc similarity index 97% rename from mindspore/ccsrc/device/gpu/gpu_stream_assign.cc rename to mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.cc index 42cdcf29ec..78915f10d7 100644 --- a/mindspore/ccsrc/device/gpu/gpu_stream_assign.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "device/gpu/gpu_stream_assign.h" +#include "runtime/device/gpu/gpu_stream_assign.h" #include #include #include #include -#include "device/gpu/gpu_common.h" -#include "device/gpu/kernel_info_setter.h" -#include "device/gpu/gpu_device_manager.h" +#include "runtime/device/gpu/gpu_common.h" +#include "runtime/device/gpu/kernel_info_setter.h" +#include "runtime/device/gpu/gpu_device_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/gpu_stream_assign.h b/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.h similarity index 97% rename from mindspore/ccsrc/device/gpu/gpu_stream_assign.h rename to mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.h index f8041878b2..f22ce8fe38 100644 --- a/mindspore/ccsrc/device/gpu/gpu_stream_assign.h +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.h @@ -20,8 +20,8 @@ #include #include #include -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/kernel_info_setter.cc b/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc similarity index 95% rename from mindspore/ccsrc/device/gpu/kernel_info_setter.cc rename to mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc index f4367e4714..4326987784 100644 --- a/mindspore/ccsrc/device/gpu/kernel_info_setter.cc +++ b/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "device/gpu/kernel_info_setter.h" +#include "runtime/device/gpu/kernel_info_setter.h" #include #include -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" #include "utils/utils.h" -#include "kernel/gpu/gpu_kernel_factory.h" -#include "kernel/kernel_build_info.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/common_utils.h" #include "common/utils.h" -#include "kernel/oplib/oplib.h" -#include "kernel/oplib/opinfo.h" +#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/kernel_compiler/oplib/opinfo.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/gpu/kernel_info_setter.h b/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.h similarity index 100% rename from mindspore/ccsrc/device/gpu/kernel_info_setter.h rename to mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.h diff --git a/mindspore/ccsrc/device/gpu/mpi/mpi_initializer.cc b/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc similarity index 97% rename from mindspore/ccsrc/device/gpu/mpi/mpi_initializer.cc rename to mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc index bcad74e5b5..4605a0eb4e 100644 --- a/mindspore/ccsrc/device/gpu/mpi/mpi_initializer.cc +++ b/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/gpu/mpi/mpi_initializer.h" +#include "runtime/device/gpu/mpi/mpi_initializer.h" #include #include diff --git a/mindspore/ccsrc/device/gpu/mpi/mpi_initializer.h b/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.h similarity index 100% rename from mindspore/ccsrc/device/gpu/mpi/mpi_initializer.h rename to mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.h diff --git a/mindspore/ccsrc/device/gpu/readme.md b/mindspore/ccsrc/runtime/device/gpu/readme.md similarity index 100% rename from mindspore/ccsrc/device/gpu/readme.md rename to mindspore/ccsrc/runtime/device/gpu/readme.md diff --git a/mindspore/ccsrc/device/kernel_adjust.cc b/mindspore/ccsrc/runtime/device/kernel_adjust.cc similarity index 98% rename from mindspore/ccsrc/device/kernel_adjust.cc rename to mindspore/ccsrc/runtime/device/kernel_adjust.cc index 86dcf2b449..bb1f7f723e 100644 --- a/mindspore/ccsrc/device/kernel_adjust.cc +++ b/mindspore/ccsrc/runtime/device/kernel_adjust.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/kernel_adjust.h" +#include "runtime/device/kernel_adjust.h" #include #include @@ -23,17 +23,17 @@ #include #include -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/context/ms_context.h" #include "common/trans.h" #include "utils/config_manager.h" #include "common/utils.h" -#include "kernel/kernel_build_info.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" -#include "device/ascend/profiling/profiling_manager.h" -#include "device/ascend/kernel_select_ascend.h" +#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "runtime/device/ascend/kernel_select_ascend.h" #include "runtime/base.h" -#include "device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_stream_assign.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/kernel_adjust.h b/mindspore/ccsrc/runtime/device/kernel_adjust.h similarity index 93% rename from mindspore/ccsrc/device/kernel_adjust.h rename to mindspore/ccsrc/runtime/device/kernel_adjust.h index 9f59c486bc..dbd6f226af 100644 --- a/mindspore/ccsrc/device/kernel_adjust.h +++ b/mindspore/ccsrc/runtime/device/kernel_adjust.h @@ -23,12 +23,12 @@ #include #include #include "ir/anf.h" -#include "session/kernel_graph.h" -#include "kernel/kernel_build_info.h" -#include "session/session_context.h" +#include "backend/session/kernel_graph.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/session/session_context.h" #include "ir/tensor.h" -#include "device/ascend/profiling/profiling_utils.h" -#include "device/kernel_info.h" +#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "runtime/device/kernel_info.h" using mindspore::device::ascend::ProfilingTraceInfo; using mindspore::device::ascend::ProfilingUtils; diff --git a/mindspore/ccsrc/device/kernel_info.cc b/mindspore/ccsrc/runtime/device/kernel_info.cc similarity index 99% rename from mindspore/ccsrc/device/kernel_info.cc rename to mindspore/ccsrc/runtime/device/kernel_info.cc index 59c9b0f411..692532e70b 100644 --- a/mindspore/ccsrc/device/kernel_info.cc +++ b/mindspore/ccsrc/runtime/device/kernel_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/device/kernel_info.h b/mindspore/ccsrc/runtime/device/kernel_info.h similarity index 95% rename from mindspore/ccsrc/device/kernel_info.h rename to mindspore/ccsrc/runtime/device/kernel_info.h index 84cfaa0fa3..b8ab985c86 100644 --- a/mindspore/ccsrc/device/kernel_info.h +++ b/mindspore/ccsrc/runtime/device/kernel_info.h @@ -19,9 +19,9 @@ #include #include -#include "kernel/kernel_build_info.h" -#include "device/ascend/ascend_device_address.h" -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "runtime/device/ascend/ascend_device_address.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { const uint32_t kInvalidGraphId = UINT32_MAX; diff --git a/mindspore/ccsrc/device/kernel_runtime.cc b/mindspore/ccsrc/runtime/device/kernel_runtime.cc similarity index 98% rename from mindspore/ccsrc/device/kernel_runtime.cc rename to mindspore/ccsrc/runtime/device/kernel_runtime.cc index 7efb4702e0..49fddcae45 100644 --- a/mindspore/ccsrc/device/kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/kernel_runtime.h" +#include "runtime/device/kernel_runtime.h" #include #include #include @@ -23,12 +23,12 @@ #include "common/trans.h" #include "utils/utils.h" #include "utils/context/ms_context.h" -#include "operator/ops.h" -#include "pipeline/parse/python_adapter.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/common_utils.h" -#include "kernel/oplib/oplib.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/common_utils.h" +#include "backend/kernel_compiler/oplib/oplib.h" #include "ir/value.h" using mindspore::kernel::Address; using mindspore::kernel::AddressPtr; diff --git a/mindspore/ccsrc/device/kernel_runtime.h b/mindspore/ccsrc/runtime/device/kernel_runtime.h similarity index 95% rename from mindspore/ccsrc/device/kernel_runtime.h rename to mindspore/ccsrc/runtime/device/kernel_runtime.h index 8c6a5eb19b..8320355b82 100644 --- a/mindspore/ccsrc/device/kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.h @@ -21,7 +21,7 @@ #include #include -#include "device/device_address.h" +#include "runtime/device/device_address.h" #include "ir/tensor.h" #include "predict/generator/utils/ir_model_util.h" #ifdef ENABLE_DUMP_E2E @@ -30,11 +30,11 @@ #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/kernel.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/kernel.h" #include "utils/context/ms_context.h" -#include "device/memory_manager.h" +#include "runtime/device/memory_manager.h" using mindspore::tensor::Tensor; using std::vector; diff --git a/mindspore/ccsrc/device/kernel_runtime_manager.cc b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc similarity index 98% rename from mindspore/ccsrc/device/kernel_runtime_manager.cc rename to mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc index 29d74762b4..626259f9ce 100644 --- a/mindspore/ccsrc/device/kernel_runtime_manager.cc +++ b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/kernel_runtime_manager.h" +#include "runtime/device/kernel_runtime_manager.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/device/kernel_runtime_manager.h b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h similarity index 98% rename from mindspore/ccsrc/device/kernel_runtime_manager.h rename to mindspore/ccsrc/runtime/device/kernel_runtime_manager.h index 89b45ff5f8..7fcb40ae67 100644 --- a/mindspore/ccsrc/device/kernel_runtime_manager.h +++ b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h @@ -23,7 +23,7 @@ #include #include #include "common/utils.h" -#include "device/kernel_runtime.h" +#include "runtime/device/kernel_runtime.h" namespace mindspore { namespace device { using KernelRuntimeCreator = std::function()>; diff --git a/mindspore/ccsrc/device/memory_manager.cc b/mindspore/ccsrc/runtime/device/memory_manager.cc similarity index 98% rename from mindspore/ccsrc/device/memory_manager.cc rename to mindspore/ccsrc/runtime/device/memory_manager.cc index c6a2329e8f..563d5f0f50 100644 --- a/mindspore/ccsrc/device/memory_manager.cc +++ b/mindspore/ccsrc/runtime/device/memory_manager.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "device/memory_manager.h" -#include "session/anf_runtime_algorithm.h" +#include "runtime/device/memory_manager.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/context/ms_context.h" using mindspore::memreuse::BestFitMemReuse; using mindspore::memreuse::MemReuseUtilPtr; diff --git a/mindspore/ccsrc/device/memory_manager.h b/mindspore/ccsrc/runtime/device/memory_manager.h similarity index 96% rename from mindspore/ccsrc/device/memory_manager.h rename to mindspore/ccsrc/runtime/device/memory_manager.h index fb9c539adb..3c6fb1b39a 100644 --- a/mindspore/ccsrc/device/memory_manager.h +++ b/mindspore/ccsrc/runtime/device/memory_manager.h @@ -18,8 +18,8 @@ #define MINDSPORE_MINDSPORE_CCSRC_DEVICE_MEMORY_MANAGER_H_ #include #include -#include "pre_activate/mem_reuse/mem_reuse.h" -#include "pre_activate/mem_reuse/mem_reuse_allocator.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "backend/optimizer/mem_reuse/mem_reuse_allocator.h" namespace mindspore { namespace device { const int kStaticMem = 0; diff --git a/mindspore/ccsrc/transform/CMakeLists.txt b/mindspore/ccsrc/transform/graph_ir/CMakeLists.txt similarity index 61% rename from mindspore/ccsrc/transform/CMakeLists.txt rename to mindspore/ccsrc/transform/graph_ir/CMakeLists.txt index c783cc0060..3f062609d5 100644 --- a/mindspore/ccsrc/transform/CMakeLists.txt +++ b/mindspore/ccsrc/transform/graph_ir/CMakeLists.txt @@ -1,9 +1,9 @@ if (ENABLE_GE OR ENABLE_D) file(GLOB_RECURSE _TRANSFORM_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") set_property(SOURCE ${_TRANSFORM_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_GE_ADPT) - add_library(_mindspore_transform_obj OBJECT ${_TRANSFORM_SRC_LIST}) + add_library(_mindspore_transform_graph_ir_obj OBJECT ${_TRANSFORM_SRC_LIST}) if (NOT ENABLE_GE) - target_compile_definitions(_mindspore_transform_obj PRIVATE NO_GE_CLIENT) + target_compile_definitions(_mindspore_transform_graph_ir_obj PRIVATE NO_GE_CLIENT) endif() endif () diff --git a/mindspore/ccsrc/transform/all_ops.h b/mindspore/ccsrc/transform/graph_ir/all_ops.h similarity index 100% rename from mindspore/ccsrc/transform/all_ops.h rename to mindspore/ccsrc/transform/graph_ir/all_ops.h diff --git a/mindspore/ccsrc/transform/convert.cc b/mindspore/ccsrc/transform/graph_ir/convert.cc similarity index 99% rename from mindspore/ccsrc/transform/convert.cc rename to mindspore/ccsrc/transform/graph_ir/convert.cc index 56ce06d2d7..7419dd2cc9 100644 --- a/mindspore/ccsrc/transform/convert.cc +++ b/mindspore/ccsrc/transform/graph_ir/convert.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "transform/convert.h" +#include "transform/graph_ir/convert.h" #include #include #include #include "utils/utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/log_adapter.h" #include "utils/graph_utils.h" #include "utils/symbolic.h" diff --git a/mindspore/ccsrc/transform/convert.h b/mindspore/ccsrc/transform/graph_ir/convert.h similarity index 98% rename from mindspore/ccsrc/transform/convert.h rename to mindspore/ccsrc/transform/graph_ir/convert.h index cca0371c2e..6fa27831bf 100644 --- a/mindspore/ccsrc/transform/convert.h +++ b/mindspore/ccsrc/transform/graph_ir/convert.h @@ -31,11 +31,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "transform/util.h" +#include "transform/graph_ir/util.h" #include "ir/tensor.h" -#include "transform/df_graph_manager.h" +#include "transform/graph_ir/df_graph_manager.h" #include "utils/config_manager.h" -#include "transform/op_declare.h" +#include "transform/graph_ir/op_declare.h" #include "graph/operator_reg.h" #ifdef OPEN_SOURCE #include "ge/client/ge_api.h" diff --git a/mindspore/ccsrc/transform/df_graph_manager.cc b/mindspore/ccsrc/transform/graph_ir/df_graph_manager.cc similarity index 97% rename from mindspore/ccsrc/transform/df_graph_manager.cc rename to mindspore/ccsrc/transform/graph_ir/df_graph_manager.cc index f62c386587..29985d6784 100644 --- a/mindspore/ccsrc/transform/df_graph_manager.cc +++ b/mindspore/ccsrc/transform/graph_ir/df_graph_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "transform/df_graph_manager.h" +#include "transform/graph_ir/df_graph_manager.h" #include #include @@ -22,8 +22,8 @@ #include #include "securec/include/securec.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/pipeline.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/pipeline.h" #include "utils/config_manager.h" #ifndef NO_DLIB #include "tdt/tsd_client.h" diff --git a/mindspore/ccsrc/transform/df_graph_manager.h b/mindspore/ccsrc/transform/graph_ir/df_graph_manager.h similarity index 98% rename from mindspore/ccsrc/transform/df_graph_manager.h rename to mindspore/ccsrc/transform/graph_ir/df_graph_manager.h index 2ca43d1f07..8a574b7a04 100644 --- a/mindspore/ccsrc/transform/df_graph_manager.h +++ b/mindspore/ccsrc/transform/graph_ir/df_graph_manager.h @@ -23,7 +23,7 @@ #include #include #include -#include "transform/types.h" +#include "transform/graph_ir/types.h" #include "ir/anf.h" namespace mindspore { diff --git a/mindspore/ccsrc/transform/graph_builder.cc b/mindspore/ccsrc/transform/graph_ir/graph_builder.cc similarity index 97% rename from mindspore/ccsrc/transform/graph_builder.cc rename to mindspore/ccsrc/transform/graph_ir/graph_builder.cc index 785c5c7f3a..6ee45feef8 100644 --- a/mindspore/ccsrc/transform/graph_builder.cc +++ b/mindspore/ccsrc/transform/graph_ir/graph_builder.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "transform/graph_builder.h" +#include "transform/graph_ir/graph_builder.h" #include #include diff --git a/mindspore/ccsrc/transform/graph_builder.h b/mindspore/ccsrc/transform/graph_ir/graph_builder.h similarity index 92% rename from mindspore/ccsrc/transform/graph_builder.h rename to mindspore/ccsrc/transform/graph_ir/graph_builder.h index 3d959f5a85..5162674242 100644 --- a/mindspore/ccsrc/transform/graph_builder.h +++ b/mindspore/ccsrc/transform/graph_ir/graph_builder.h @@ -22,8 +22,8 @@ #include #include #include -#include "transform/types.h" -#include "transform/convert.h" +#include "transform/graph_ir/types.h" +#include "transform/graph_ir/convert.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/transform/graph_runner.cc b/mindspore/ccsrc/transform/graph_ir/graph_runner.cc similarity index 99% rename from mindspore/ccsrc/transform/graph_runner.cc rename to mindspore/ccsrc/transform/graph_ir/graph_runner.cc index 52d0d8e17f..d20c49a381 100644 --- a/mindspore/ccsrc/transform/graph_runner.cc +++ b/mindspore/ccsrc/transform/graph_ir/graph_runner.cc @@ -14,7 +14,7 @@ * Limitations under the License. */ -#include "transform/graph_runner.h" +#include "transform/graph_ir/graph_runner.h" #include #include #include diff --git a/mindspore/ccsrc/transform/graph_runner.h b/mindspore/ccsrc/transform/graph_ir/graph_runner.h similarity index 93% rename from mindspore/ccsrc/transform/graph_runner.h rename to mindspore/ccsrc/transform/graph_ir/graph_runner.h index 30769c8310..92db9e1413 100644 --- a/mindspore/ccsrc/transform/graph_runner.h +++ b/mindspore/ccsrc/transform/graph_ir/graph_runner.h @@ -23,10 +23,10 @@ #include #include -#include "transform/types.h" -#include "transform/util.h" +#include "transform/graph_ir/types.h" +#include "transform/graph_ir/util.h" #include "ir/tensor.h" -#include "transform/df_graph_manager.h" +#include "transform/graph_ir/df_graph_manager.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/transform/op_adapter.h b/mindspore/ccsrc/transform/graph_ir/op_adapter.h similarity index 99% rename from mindspore/ccsrc/transform/op_adapter.h rename to mindspore/ccsrc/transform/graph_ir/op_adapter.h index caac4258df..358cbd20a1 100644 --- a/mindspore/ccsrc/transform/op_adapter.h +++ b/mindspore/ccsrc/transform/graph_ir/op_adapter.h @@ -22,7 +22,7 @@ #include #include -#include "transform/op_adapter_util.h" +#include "transform/graph_ir/op_adapter_util.h" #include "utils/utils.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/transform/op_adapter_base.h b/mindspore/ccsrc/transform/graph_ir/op_adapter_base.h similarity index 98% rename from mindspore/ccsrc/transform/op_adapter_base.h rename to mindspore/ccsrc/transform/graph_ir/op_adapter_base.h index 2c6fcedf09..77e28dda94 100644 --- a/mindspore/ccsrc/transform/op_adapter_base.h +++ b/mindspore/ccsrc/transform/graph_ir/op_adapter_base.h @@ -24,11 +24,11 @@ #include #include -#include "transform/util.h" +#include "transform/graph_ir/util.h" #include "ir/anf.h" #include "ir/primitive.h" #include "ir/value.h" -#include "transform/types.h" +#include "transform/graph_ir/types.h" #ifdef ENABLE_GE #ifdef OPEN_SOURCE #include "graph/types.h" @@ -42,7 +42,7 @@ #include "external/ge/ge_api.h" #endif #include "graph/tensor.h" -#include "transform/all_ops.h" +#include "transform/graph_ir/all_ops.h" namespace ge { class CustomOperator : public Operator { diff --git a/mindspore/ccsrc/transform/op_adapter_util.cc b/mindspore/ccsrc/transform/graph_ir/op_adapter_util.cc similarity index 99% rename from mindspore/ccsrc/transform/op_adapter_util.cc rename to mindspore/ccsrc/transform/graph_ir/op_adapter_util.cc index cae43c13dc..78f1f263de 100644 --- a/mindspore/ccsrc/transform/op_adapter_util.cc +++ b/mindspore/ccsrc/transform/graph_ir/op_adapter_util.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "transform/op_adapter_util.h" +#include "transform/graph_ir/op_adapter_util.h" #include #include #include #include "utils/utils.h" -#include "transform/op_adapter_base.h" +#include "transform/graph_ir/op_adapter_base.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/transform/op_adapter_util.h b/mindspore/ccsrc/transform/graph_ir/op_adapter_util.h similarity index 98% rename from mindspore/ccsrc/transform/op_adapter_util.h rename to mindspore/ccsrc/transform/graph_ir/op_adapter_util.h index fcabc732d5..0a0d745ba2 100644 --- a/mindspore/ccsrc/transform/op_adapter_util.h +++ b/mindspore/ccsrc/transform/graph_ir/op_adapter_util.h @@ -20,7 +20,7 @@ #include #include -#include "transform/op_adapter_base.h" +#include "transform/graph_ir/op_adapter_base.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/transform/op_declare.cc b/mindspore/ccsrc/transform/graph_ir/op_declare.cc similarity index 99% rename from mindspore/ccsrc/transform/op_declare.cc rename to mindspore/ccsrc/transform/graph_ir/op_declare.cc index ffaaa952db..e3751e0c92 100644 --- a/mindspore/ccsrc/transform/op_declare.cc +++ b/mindspore/ccsrc/transform/graph_ir/op_declare.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "transform/op_declare.h" +#include "transform/graph_ir/op_declare.h" #include -#include "transform/all_ops.h" +#include "transform/graph_ir/all_ops.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/transform/op_declare.h b/mindspore/ccsrc/transform/graph_ir/op_declare.h similarity index 99% rename from mindspore/ccsrc/transform/op_declare.h rename to mindspore/ccsrc/transform/graph_ir/op_declare.h index 2dfbf11fc4..e493ea0e52 100755 --- a/mindspore/ccsrc/transform/op_declare.h +++ b/mindspore/ccsrc/transform/graph_ir/op_declare.h @@ -19,7 +19,7 @@ #include #include -#include "transform/op_adapter.h" +#include "transform/graph_ir/op_adapter.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/transform/types.h b/mindspore/ccsrc/transform/graph_ir/types.h similarity index 100% rename from mindspore/ccsrc/transform/types.h rename to mindspore/ccsrc/transform/graph_ir/types.h diff --git a/mindspore/ccsrc/transform/util.cc b/mindspore/ccsrc/transform/graph_ir/util.cc similarity index 99% rename from mindspore/ccsrc/transform/util.cc rename to mindspore/ccsrc/transform/graph_ir/util.cc index b848ec117b..6ae665d69f 100644 --- a/mindspore/ccsrc/transform/util.cc +++ b/mindspore/ccsrc/transform/graph_ir/util.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "transform/util.h" +#include "transform/graph_ir/util.h" #include #include diff --git a/mindspore/ccsrc/transform/util.h b/mindspore/ccsrc/transform/graph_ir/util.h similarity index 99% rename from mindspore/ccsrc/transform/util.h rename to mindspore/ccsrc/transform/graph_ir/util.h index 5d8db26ad1..32d4242c4f 100644 --- a/mindspore/ccsrc/transform/util.h +++ b/mindspore/ccsrc/transform/graph_ir/util.h @@ -25,7 +25,7 @@ #include "ir/anf.h" #include "ir/dtype.h" #include "ir/tensor.h" -#include "transform/types.h" +#include "transform/graph_ir/types.h" #include "graph/tensor.h" diff --git a/mindspore/ccsrc/onnx/CMakeLists.txt b/mindspore/ccsrc/transform/onnx/CMakeLists.txt similarity index 72% rename from mindspore/ccsrc/onnx/CMakeLists.txt rename to mindspore/ccsrc/transform/onnx/CMakeLists.txt index a65ea6d450..0d2f6c947b 100644 --- a/mindspore/ccsrc/onnx/CMakeLists.txt +++ b/mindspore/ccsrc/transform/onnx/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB_RECURSE _ONNX_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") set_property(SOURCE ${_ONNX_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ONNX) -add_library(_mindspore_onnx_obj OBJECT ${_ONNX_SRC_FILES}) +add_library(_mindspore_transform_onnx_obj OBJECT ${_ONNX_SRC_FILES}) diff --git a/mindspore/ccsrc/onnx/ir_exporter.cc b/mindspore/ccsrc/transform/onnx/ir_exporter.cc similarity index 99% rename from mindspore/ccsrc/onnx/ir_exporter.cc rename to mindspore/ccsrc/transform/onnx/ir_exporter.cc index a2a9072090..78858eea8a 100644 --- a/mindspore/ccsrc/onnx/ir_exporter.cc +++ b/mindspore/ccsrc/transform/onnx/ir_exporter.cc @@ -26,7 +26,7 @@ #include "ir/tensor.h" #include "ir/param_value.h" #include "debug/anf_ir_utils.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "proto/onnx.pb.h" namespace mindspore { diff --git a/mindspore/ccsrc/onnx/onnx_exporter.cc b/mindspore/ccsrc/transform/onnx/onnx_exporter.cc similarity index 99% rename from mindspore/ccsrc/onnx/onnx_exporter.cc rename to mindspore/ccsrc/transform/onnx/onnx_exporter.cc index 43c5c118c1..f69fb81a7e 100644 --- a/mindspore/ccsrc/onnx/onnx_exporter.cc +++ b/mindspore/ccsrc/transform/onnx/onnx_exporter.cc @@ -25,7 +25,7 @@ #include "debug/anf_ir_utils.h" #include "proto/onnx.pb.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/param_value.h" diff --git a/mindspore/ccsrc/utils/callbacks.cc b/mindspore/ccsrc/utils/callbacks.cc index 427cc5e568..ceb95d5c8c 100644 --- a/mindspore/ccsrc/utils/callbacks.cc +++ b/mindspore/ccsrc/utils/callbacks.cc @@ -20,8 +20,8 @@ #include #include #include "pybind11/pybind11.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/visible.h" namespace mindspore { diff --git a/mindspore/ccsrc/utils/callbacks_ge.cc b/mindspore/ccsrc/utils/callbacks_ge.cc index 55125ebe91..6001b295ad 100644 --- a/mindspore/ccsrc/utils/callbacks_ge.cc +++ b/mindspore/ccsrc/utils/callbacks_ge.cc @@ -17,10 +17,10 @@ #include "utils/callbacks_ge.h" #include "pybind11/pybind11.h" #include "ir/param_value.h" -#include "transform/df_graph_manager.h" -#include "transform/util.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/parse/python_adapter.h" +#include "transform/graph_ir/df_graph_manager.h" +#include "transform/graph_ir/util.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/visible.h" namespace mindspore { diff --git a/mindspore/ccsrc/utils/callbacks_ge.h b/mindspore/ccsrc/utils/callbacks_ge.h index 9735c3000a..f0ef583aaa 100644 --- a/mindspore/ccsrc/utils/callbacks_ge.h +++ b/mindspore/ccsrc/utils/callbacks_ge.h @@ -20,8 +20,8 @@ #include #include #include -#include "transform/types.h" -#include "transform/util.h" +#include "transform/graph_ir/types.h" +#include "transform/graph_ir/util.h" #include "ir/tensor.h" namespace mindspore { diff --git a/mindspore/ccsrc/utils/context/ms_context.cc b/mindspore/ccsrc/utils/context/ms_context.cc index 92bf92abea..37b6bf638b 100644 --- a/mindspore/ccsrc/utils/context/ms_context.cc +++ b/mindspore/ccsrc/utils/context/ms_context.cc @@ -27,7 +27,7 @@ #include "tdt/data_common.h" #endif #ifdef ENABLE_GE -#include "transform/df_graph_manager.h" +#include "transform/graph_ir/df_graph_manager.h" #endif #include "ir/tensor.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/utils/convert_utils.cc b/mindspore/ccsrc/utils/convert_utils.cc index a5a618dff4..b1847d1df5 100644 --- a/mindspore/ccsrc/utils/convert_utils.cc +++ b/mindspore/ccsrc/utils/convert_utils.cc @@ -26,8 +26,8 @@ #include "pybind11/pybind11.h" #include "abstract/abstract_value.h" -#include "pipeline/parse/parse.h" -#include "pipeline/parse/parse_base.h" +#include "pipeline/jit/parse/parse.h" +#include "pipeline/jit/parse/parse_base.h" #include "ir/value.h" #include "ir/tensor.h" #include "ir/param_value.h" diff --git a/mindspore/ccsrc/utils/graph_utils_extends.cc b/mindspore/ccsrc/utils/graph_utils_extends.cc index 0740c24236..852dd0e3f2 100644 --- a/mindspore/ccsrc/utils/graph_utils_extends.cc +++ b/mindspore/ccsrc/utils/graph_utils_extends.cc @@ -31,8 +31,8 @@ #include "debug/label.h" #include "utils/log_adapter.h" #include "common/utils.h" -#include "pipeline/parse/function_block.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/function_block.h" +#include "pipeline/jit/parse/python_adapter.h" namespace mindspore { namespace { diff --git a/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc b/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc index d676be895e..fa1137e3f6 100644 --- a/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc +++ b/mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc @@ -23,7 +23,7 @@ #include "google/protobuf/io/zero_copy_stream_impl.h" #include "ir/tensor.h" #include "ir/param_value.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "abstract/abstract_value.h" #include "proto/onnx.pb.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/utils/primitive_utils.cc b/mindspore/ccsrc/utils/primitive_utils.cc index 97fa954e12..490e2517a9 100644 --- a/mindspore/ccsrc/utils/primitive_utils.cc +++ b/mindspore/ccsrc/utils/primitive_utils.cc @@ -15,7 +15,7 @@ */ #include "utils/primitive_utils.h" -#include "pipeline/parse/python_adapter.h" +#include "pipeline/jit/parse/python_adapter.h" #include "utils/log_adapter.h" #include "common/utils.h" diff --git a/mindspore/ccsrc/utils/tensorprint_utils.cc b/mindspore/ccsrc/utils/tensorprint_utils.cc index cdaa826c82..08cd4e4291 100644 --- a/mindspore/ccsrc/utils/tensorprint_utils.cc +++ b/mindspore/ccsrc/utils/tensorprint_utils.cc @@ -21,7 +21,7 @@ #include #include #include "ir/tensor.h" -#include "device/convert_tensor_utils.h" +#include "runtime/device/convert_tensor_utils.h" #include "./securec.h" #ifndef NO_DLIB #include "tdt/tsd_client.h" diff --git a/mindspore/ccsrc/vm/backend.cc b/mindspore/ccsrc/vm/backend.cc index 88a07c7c12..0290ee57fc 100644 --- a/mindspore/ccsrc/vm/backend.cc +++ b/mindspore/ccsrc/vm/backend.cc @@ -23,7 +23,7 @@ #include "utils/callbacks.h" #include "utils/graph_utils.h" #include "utils/base_ref_extends.h" -#include "session/session_factory.h" +#include "backend/session/session_factory.h" #include "common/utils.h" #ifdef ENABLE_GE #include "utils/callbacks_ge.h" diff --git a/mindspore/ccsrc/vm/backend.h b/mindspore/ccsrc/vm/backend.h index c8d0696fa4..208c4010fb 100644 --- a/mindspore/ccsrc/vm/backend.h +++ b/mindspore/ccsrc/vm/backend.h @@ -26,7 +26,7 @@ #include "ir/anf.h" #include "vm/segment_runner.h" #include "vm/vm.h" -#include "session/session_basic.h" +#include "backend/session/session_basic.h" namespace mindspore { namespace compile { diff --git a/mindspore/ccsrc/vm/segment_runner.cc b/mindspore/ccsrc/vm/segment_runner.cc index db27506134..540b77bcaf 100644 --- a/mindspore/ccsrc/vm/segment_runner.cc +++ b/mindspore/ccsrc/vm/segment_runner.cc @@ -31,7 +31,7 @@ #include "utils/utils.h" #include "ir/manager.h" #include "ir/func_graph_cloner.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { const char kMsConvert[] = "ms"; diff --git a/mindspore/ccsrc/vm/transform.cc b/mindspore/ccsrc/vm/transform.cc index ccad0112c3..2cf6ead813 100644 --- a/mindspore/ccsrc/vm/transform.cc +++ b/mindspore/ccsrc/vm/transform.cc @@ -28,7 +28,7 @@ #include "abstract/abstract_value.h" #ifdef ENABLE_GE -#include "transform/convert.h" +#include "transform/graph_ir/convert.h" #endif #include "utils/graph_utils.h" #include "utils/context/ms_context.h" diff --git a/mindspore/ccsrc/vm/transform.h b/mindspore/ccsrc/vm/transform.h index 55c32ea4e3..d08a24d188 100644 --- a/mindspore/ccsrc/vm/transform.h +++ b/mindspore/ccsrc/vm/transform.h @@ -28,7 +28,7 @@ #include "vm/vm.h" #include "ir/anf.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "vm/segment_runner.h" #include "vm/backend.h" diff --git a/mindspore/ccsrc/vm/vm.cc b/mindspore/ccsrc/vm/vm.cc index 047b330158..baa5b0ea11 100644 --- a/mindspore/ccsrc/vm/vm.cc +++ b/mindspore/ccsrc/vm/vm.cc @@ -23,7 +23,7 @@ #include "vm/vmimpl.h" #include "vm/backend.h" #include "vm/transform.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" #include "utils/base_ref_extends.h" namespace mindspore { diff --git a/mindspore/ccsrc/vm/vmimpl.cc b/mindspore/ccsrc/vm/vmimpl.cc index cb23cdaf43..2aebf8ad0d 100644 --- a/mindspore/ccsrc/vm/vmimpl.cc +++ b/mindspore/ccsrc/vm/vmimpl.cc @@ -27,7 +27,7 @@ #include #include "ir/tensor.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/manager.h" #include "ir/func_graph_cloner.h" #include "ir/primitive_py.h" diff --git a/mindspore/ccsrc/ir/CMakeLists.txt b/mindspore/core/ir/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/ir/CMakeLists.txt rename to mindspore/core/ir/CMakeLists.txt diff --git a/mindspore/ccsrc/ir/anf.cc b/mindspore/core/ir/anf.cc similarity index 99% rename from mindspore/ccsrc/ir/anf.cc rename to mindspore/core/ir/anf.cc index 45cce7b473..0d96ddf263 100644 --- a/mindspore/ccsrc/ir/anf.cc +++ b/mindspore/core/ir/anf.cc @@ -26,7 +26,7 @@ #include "ir/func_graph.h" #include "ir/primitive.h" #include "utils/context/ms_context.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { // namespace to support intermediate representation definition diff --git a/mindspore/ccsrc/ir/anf.h b/mindspore/core/ir/anf.h similarity index 100% rename from mindspore/ccsrc/ir/anf.h rename to mindspore/core/ir/anf.h diff --git a/mindspore/ccsrc/ir/anf_extends.cc b/mindspore/core/ir/anf_extends.cc similarity index 96% rename from mindspore/ccsrc/ir/anf_extends.cc rename to mindspore/core/ir/anf_extends.cc index 432ffdb606..1caf7f1b36 100644 --- a/mindspore/ccsrc/ir/anf_extends.cc +++ b/mindspore/core/ir/anf_extends.cc @@ -22,9 +22,9 @@ #include #include "ir/visitor.h" -#include "pipeline/static_analysis/static_analysis.h" -#include "operator/ops.h" -#include "parallel/ops_info/ops_utils.h" +#include "pipeline/jit/static_analysis/static_analysis.h" +#include "frontend/operator/ops.h" +#include "frontend/parallel/ops_info/ops_utils.h" #include "debug/label.h" namespace mindspore { diff --git a/mindspore/ccsrc/ir/anf_py.cc b/mindspore/core/ir/anf_py.cc similarity index 100% rename from mindspore/ccsrc/ir/anf_py.cc rename to mindspore/core/ir/anf_py.cc diff --git a/mindspore/ccsrc/ir/dtype.cc b/mindspore/core/ir/dtype.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype.cc rename to mindspore/core/ir/dtype.cc diff --git a/mindspore/ccsrc/ir/dtype.h b/mindspore/core/ir/dtype.h similarity index 100% rename from mindspore/ccsrc/ir/dtype.h rename to mindspore/core/ir/dtype.h diff --git a/mindspore/ccsrc/ir/dtype/container.cc b/mindspore/core/ir/dtype/container.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype/container.cc rename to mindspore/core/ir/dtype/container.cc diff --git a/mindspore/ccsrc/ir/dtype/container.h b/mindspore/core/ir/dtype/container.h similarity index 100% rename from mindspore/ccsrc/ir/dtype/container.h rename to mindspore/core/ir/dtype/container.h diff --git a/mindspore/ccsrc/ir/dtype/empty.cc b/mindspore/core/ir/dtype/empty.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype/empty.cc rename to mindspore/core/ir/dtype/empty.cc diff --git a/mindspore/ccsrc/ir/dtype/empty.h b/mindspore/core/ir/dtype/empty.h similarity index 100% rename from mindspore/ccsrc/ir/dtype/empty.h rename to mindspore/core/ir/dtype/empty.h diff --git a/mindspore/ccsrc/ir/dtype/number.cc b/mindspore/core/ir/dtype/number.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype/number.cc rename to mindspore/core/ir/dtype/number.cc diff --git a/mindspore/ccsrc/ir/dtype/number.h b/mindspore/core/ir/dtype/number.h similarity index 100% rename from mindspore/ccsrc/ir/dtype/number.h rename to mindspore/core/ir/dtype/number.h diff --git a/mindspore/ccsrc/ir/dtype/ref.cc b/mindspore/core/ir/dtype/ref.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype/ref.cc rename to mindspore/core/ir/dtype/ref.cc diff --git a/mindspore/ccsrc/ir/dtype/ref.h b/mindspore/core/ir/dtype/ref.h similarity index 100% rename from mindspore/ccsrc/ir/dtype/ref.h rename to mindspore/core/ir/dtype/ref.h diff --git a/mindspore/ccsrc/ir/dtype/type.cc b/mindspore/core/ir/dtype/type.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype/type.cc rename to mindspore/core/ir/dtype/type.cc diff --git a/mindspore/ccsrc/ir/dtype/type.h b/mindspore/core/ir/dtype/type.h similarity index 100% rename from mindspore/ccsrc/ir/dtype/type.h rename to mindspore/core/ir/dtype/type.h diff --git a/mindspore/ccsrc/ir/dtype/type_extends.cc b/mindspore/core/ir/dtype/type_extends.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype/type_extends.cc rename to mindspore/core/ir/dtype/type_extends.cc diff --git a/mindspore/ccsrc/ir/dtype/type_id.h b/mindspore/core/ir/dtype/type_id.h similarity index 100% rename from mindspore/ccsrc/ir/dtype/type_id.h rename to mindspore/core/ir/dtype/type_id.h diff --git a/mindspore/ccsrc/ir/dtype_extends.cc b/mindspore/core/ir/dtype_extends.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype_extends.cc rename to mindspore/core/ir/dtype_extends.cc diff --git a/mindspore/ccsrc/ir/dtype_py.cc b/mindspore/core/ir/dtype_py.cc similarity index 100% rename from mindspore/ccsrc/ir/dtype_py.cc rename to mindspore/core/ir/dtype_py.cc diff --git a/mindspore/ccsrc/ir/func_graph.cc b/mindspore/core/ir/func_graph.cc similarity index 99% rename from mindspore/ccsrc/ir/func_graph.cc rename to mindspore/core/ir/func_graph.cc index b0d0910304..fabdd3e7d3 100644 --- a/mindspore/ccsrc/ir/func_graph.cc +++ b/mindspore/core/ir/func_graph.cc @@ -24,7 +24,7 @@ #include "debug/trace.h" #include "ir/manager.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/ordered_set.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/ir/func_graph.h b/mindspore/core/ir/func_graph.h similarity index 100% rename from mindspore/ccsrc/ir/func_graph.h rename to mindspore/core/ir/func_graph.h diff --git a/mindspore/ccsrc/ir/func_graph_cloner.cc b/mindspore/core/ir/func_graph_cloner.cc similarity index 99% rename from mindspore/ccsrc/ir/func_graph_cloner.cc rename to mindspore/core/ir/func_graph_cloner.cc index f720913b98..0857770cad 100644 --- a/mindspore/ccsrc/ir/func_graph_cloner.cc +++ b/mindspore/core/ir/func_graph_cloner.cc @@ -20,7 +20,7 @@ #include "ir/manager.h" #include "ir/param_value.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/convert_utils_base.h" #include "utils/log_adapter.h" #include "utils/profile.h" diff --git a/mindspore/ccsrc/ir/func_graph_cloner.h b/mindspore/core/ir/func_graph_cloner.h similarity index 100% rename from mindspore/ccsrc/ir/func_graph_cloner.h rename to mindspore/core/ir/func_graph_cloner.h diff --git a/mindspore/ccsrc/ir/func_graph_extends.cc b/mindspore/core/ir/func_graph_extends.cc similarity index 99% rename from mindspore/ccsrc/ir/func_graph_extends.cc rename to mindspore/core/ir/func_graph_extends.cc index 02f37f343d..27f9958a5e 100644 --- a/mindspore/ccsrc/ir/func_graph_extends.cc +++ b/mindspore/core/ir/func_graph_extends.cc @@ -22,11 +22,11 @@ #include "ir/manager.h" #include "ir/func_graph_cloner.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/ordered_set.h" #include "abstract/abstract_value.h" -#include "pipeline/static_analysis/static_analysis.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include "debug/anf_ir_dump.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/ir/func_graph_py.cc b/mindspore/core/ir/func_graph_py.cc similarity index 100% rename from mindspore/ccsrc/ir/func_graph_py.cc rename to mindspore/core/ir/func_graph_py.cc diff --git a/mindspore/ccsrc/ir/lite/param_value_lite.h b/mindspore/core/ir/lite/param_value_lite.h similarity index 100% rename from mindspore/ccsrc/ir/lite/param_value_lite.h rename to mindspore/core/ir/lite/param_value_lite.h diff --git a/mindspore/ccsrc/ir/lite/tensor.cc b/mindspore/core/ir/lite/tensor.cc similarity index 100% rename from mindspore/ccsrc/ir/lite/tensor.cc rename to mindspore/core/ir/lite/tensor.cc diff --git a/mindspore/ccsrc/ir/lite/tensor.h b/mindspore/core/ir/lite/tensor.h similarity index 100% rename from mindspore/ccsrc/ir/lite/tensor.h rename to mindspore/core/ir/lite/tensor.h diff --git a/mindspore/ccsrc/ir/manager.cc b/mindspore/core/ir/manager.cc similarity index 99% rename from mindspore/ccsrc/ir/manager.cc rename to mindspore/core/ir/manager.cc index cf56500aea..00c39679cd 100644 --- a/mindspore/ccsrc/ir/manager.cc +++ b/mindspore/core/ir/manager.cc @@ -26,7 +26,7 @@ #include "ir/func_graph.h" #include "utils/profile.h" #include "utils/convert_utils_base.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/ir/manager.h b/mindspore/core/ir/manager.h similarity index 100% rename from mindspore/ccsrc/ir/manager.h rename to mindspore/core/ir/manager.h diff --git a/mindspore/ccsrc/ir/meta_func_graph.cc b/mindspore/core/ir/meta_func_graph.cc similarity index 95% rename from mindspore/ccsrc/ir/meta_func_graph.cc rename to mindspore/core/ir/meta_func_graph.cc index 3b2704613a..df07ea1b67 100644 --- a/mindspore/ccsrc/ir/meta_func_graph.cc +++ b/mindspore/core/ir/meta_func_graph.cc @@ -17,8 +17,8 @@ */ #include "ir/meta_func_graph.h" -#include "pipeline/static_analysis/static_analysis.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/abstract_function.h" // namespace to support intermediate representation definition namespace mindspore { diff --git a/mindspore/ccsrc/ir/meta_func_graph.h b/mindspore/core/ir/meta_func_graph.h similarity index 100% rename from mindspore/ccsrc/ir/meta_func_graph.h rename to mindspore/core/ir/meta_func_graph.h diff --git a/mindspore/ccsrc/ir/meta_tensor.cc b/mindspore/core/ir/meta_tensor.cc similarity index 100% rename from mindspore/ccsrc/ir/meta_tensor.cc rename to mindspore/core/ir/meta_tensor.cc diff --git a/mindspore/ccsrc/ir/meta_tensor.h b/mindspore/core/ir/meta_tensor.h similarity index 100% rename from mindspore/ccsrc/ir/meta_tensor.h rename to mindspore/core/ir/meta_tensor.h diff --git a/mindspore/ccsrc/ir/meta_tensor_extends.cc b/mindspore/core/ir/meta_tensor_extends.cc similarity index 100% rename from mindspore/ccsrc/ir/meta_tensor_extends.cc rename to mindspore/core/ir/meta_tensor_extends.cc diff --git a/mindspore/ccsrc/ir/named.cc b/mindspore/core/ir/named.cc similarity index 100% rename from mindspore/ccsrc/ir/named.cc rename to mindspore/core/ir/named.cc diff --git a/mindspore/ccsrc/ir/named.h b/mindspore/core/ir/named.h similarity index 100% rename from mindspore/ccsrc/ir/named.h rename to mindspore/core/ir/named.h diff --git a/mindspore/ccsrc/ir/optimizer_caller.h b/mindspore/core/ir/optimizer_caller.h similarity index 100% rename from mindspore/ccsrc/ir/optimizer_caller.h rename to mindspore/core/ir/optimizer_caller.h diff --git a/mindspore/ccsrc/ir/param_value.h b/mindspore/core/ir/param_value.h similarity index 100% rename from mindspore/ccsrc/ir/param_value.h rename to mindspore/core/ir/param_value.h diff --git a/mindspore/ccsrc/ir/param_value_py.cc b/mindspore/core/ir/param_value_py.cc similarity index 100% rename from mindspore/ccsrc/ir/param_value_py.cc rename to mindspore/core/ir/param_value_py.cc diff --git a/mindspore/ccsrc/ir/pattern_matcher.h b/mindspore/core/ir/pattern_matcher.h similarity index 99% rename from mindspore/ccsrc/ir/pattern_matcher.h rename to mindspore/core/ir/pattern_matcher.h index 6605b9ce4c..94ba4a381a 100644 --- a/mindspore/ccsrc/ir/pattern_matcher.h +++ b/mindspore/core/ir/pattern_matcher.h @@ -21,7 +21,7 @@ #include #include "ir/anf.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/ir/primitive.cc b/mindspore/core/ir/primitive.cc similarity index 100% rename from mindspore/ccsrc/ir/primitive.cc rename to mindspore/core/ir/primitive.cc diff --git a/mindspore/ccsrc/ir/primitive.h b/mindspore/core/ir/primitive.h similarity index 98% rename from mindspore/ccsrc/ir/primitive.h rename to mindspore/core/ir/primitive.h index 2a4d689ae9..5471b58063 100644 --- a/mindspore/ccsrc/ir/primitive.h +++ b/mindspore/core/ir/primitive.h @@ -25,7 +25,7 @@ #include "ir/dtype/type.h" #include "abstract/abstract_value.h" -#include "parallel/ops_info/operator_info.h" +#include "frontend/parallel/ops_info/operator_info.h" #include "utils/base_ref_extends.h" namespace mindspore { diff --git a/mindspore/ccsrc/ir/primitive_extends.cc b/mindspore/core/ir/primitive_extends.cc similarity index 93% rename from mindspore/ccsrc/ir/primitive_extends.cc rename to mindspore/core/ir/primitive_extends.cc index 9df46920bf..8e04ba8233 100644 --- a/mindspore/ccsrc/ir/primitive_extends.cc +++ b/mindspore/core/ir/primitive_extends.cc @@ -15,7 +15,7 @@ */ #include "ir/primitive.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "pipeline/jit/static_analysis/abstract_function.h" namespace mindspore { abstract::AbstractBasePtr Primitive::ToPrimAbstract(const AnfNodePtr &anf_node) { diff --git a/mindspore/ccsrc/ir/primitive_py.cc b/mindspore/core/ir/primitive_py.cc similarity index 98% rename from mindspore/ccsrc/ir/primitive_py.cc rename to mindspore/core/ir/primitive_py.cc index b672f470c9..1a97487ddc 100644 --- a/mindspore/ccsrc/ir/primitive_py.cc +++ b/mindspore/core/ir/primitive_py.cc @@ -18,10 +18,10 @@ #include #include #include "ir/signature.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "./common.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/data_converter.h" #include "pybind11/pytypes.h" #include "utils/convert_utils_base.h" #include "utils/primitive_utils.h" diff --git a/mindspore/ccsrc/ir/primitive_py.h b/mindspore/core/ir/primitive_py.h similarity index 97% rename from mindspore/ccsrc/ir/primitive_py.h rename to mindspore/core/ir/primitive_py.h index 7dc26d1561..2dc45ac341 100644 --- a/mindspore/ccsrc/ir/primitive_py.h +++ b/mindspore/core/ir/primitive_py.h @@ -30,7 +30,7 @@ #include "utils/log_adapter.h" #include "ir/primitive.h" #include "ir/signature.h" -#include "parallel/ops_info/operator_info.h" +#include "frontend/parallel/ops_info/operator_info.h" namespace py = pybind11; namespace mindspore { diff --git a/mindspore/ccsrc/ir/scalar.h b/mindspore/core/ir/scalar.h similarity index 100% rename from mindspore/ccsrc/ir/scalar.h rename to mindspore/core/ir/scalar.h diff --git a/mindspore/ccsrc/ir/scope.cc b/mindspore/core/ir/scope.cc similarity index 100% rename from mindspore/ccsrc/ir/scope.cc rename to mindspore/core/ir/scope.cc diff --git a/mindspore/ccsrc/ir/scope.h b/mindspore/core/ir/scope.h similarity index 100% rename from mindspore/ccsrc/ir/scope.h rename to mindspore/core/ir/scope.h diff --git a/mindspore/ccsrc/ir/signature.h b/mindspore/core/ir/signature.h similarity index 100% rename from mindspore/ccsrc/ir/signature.h rename to mindspore/core/ir/signature.h diff --git a/mindspore/ccsrc/ir/signature_py.cc b/mindspore/core/ir/signature_py.cc similarity index 98% rename from mindspore/ccsrc/ir/signature_py.cc rename to mindspore/core/ir/signature_py.cc index 2b01b3e579..f513df8533 100644 --- a/mindspore/ccsrc/ir/signature_py.cc +++ b/mindspore/core/ir/signature_py.cc @@ -17,7 +17,7 @@ #include "ir/signature.h" #include "pybind11/operators.h" #include "pybind_api/api_register.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" namespace py = pybind11; diff --git a/mindspore/ccsrc/ir/tensor.cc b/mindspore/core/ir/tensor.cc similarity index 99% rename from mindspore/ccsrc/ir/tensor.cc rename to mindspore/core/ir/tensor.cc index b2a2f38915..6c966b32e3 100644 --- a/mindspore/ccsrc/ir/tensor.cc +++ b/mindspore/core/ir/tensor.cc @@ -28,7 +28,7 @@ #include #include -#include "device/device_address.h" +#include "runtime/device/device_address.h" #include "abstract/abstract_value.h" namespace mindspore { diff --git a/mindspore/ccsrc/ir/tensor.h b/mindspore/core/ir/tensor.h similarity index 99% rename from mindspore/ccsrc/ir/tensor.h rename to mindspore/core/ir/tensor.h index 8230780d02..f2ed2c1609 100644 --- a/mindspore/ccsrc/ir/tensor.h +++ b/mindspore/core/ir/tensor.h @@ -23,7 +23,7 @@ #include #include "Eigen/Core" -#include "device/device_address.h" +#include "runtime/device/device_address.h" #include "ir/meta_tensor.h" #include "include/ms_tensor.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/ir/tensor_py.cc b/mindspore/core/ir/tensor_py.cc similarity index 99% rename from mindspore/ccsrc/ir/tensor_py.cc rename to mindspore/core/ir/tensor_py.cc index 25339cff5b..f5f83d0e07 100644 --- a/mindspore/ccsrc/ir/tensor_py.cc +++ b/mindspore/core/ir/tensor_py.cc @@ -22,7 +22,7 @@ #include #include -#include "device/device_address.h" +#include "runtime/device/device_address.h" #include "pybind_api/api_register.h" #include "pybind_api/export_flags.h" #include "abstract/abstract_value.h" diff --git a/mindspore/ccsrc/ir/tensor_py.h b/mindspore/core/ir/tensor_py.h similarity index 100% rename from mindspore/ccsrc/ir/tensor_py.h rename to mindspore/core/ir/tensor_py.h diff --git a/mindspore/ccsrc/ir/value.cc b/mindspore/core/ir/value.cc similarity index 100% rename from mindspore/ccsrc/ir/value.cc rename to mindspore/core/ir/value.cc diff --git a/mindspore/ccsrc/ir/value.h b/mindspore/core/ir/value.h similarity index 100% rename from mindspore/ccsrc/ir/value.h rename to mindspore/core/ir/value.h diff --git a/mindspore/ccsrc/ir/value_extends.cc b/mindspore/core/ir/value_extends.cc similarity index 100% rename from mindspore/ccsrc/ir/value_extends.cc rename to mindspore/core/ir/value_extends.cc diff --git a/mindspore/ccsrc/ir/value_py.cc b/mindspore/core/ir/value_py.cc similarity index 100% rename from mindspore/ccsrc/ir/value_py.cc rename to mindspore/core/ir/value_py.cc diff --git a/mindspore/ccsrc/ir/visitor.cc b/mindspore/core/ir/visitor.cc similarity index 100% rename from mindspore/ccsrc/ir/visitor.cc rename to mindspore/core/ir/visitor.cc diff --git a/mindspore/ccsrc/ir/visitor.h b/mindspore/core/ir/visitor.h similarity index 100% rename from mindspore/ccsrc/ir/visitor.h rename to mindspore/core/ir/visitor.h diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index 65fbb43133..ef19433c4d 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -17,6 +17,7 @@ message("PYTHON_INCLUDE_DIRS = ${PYTHON_INCLUDE_DIRS}") message("PYTHON_LIBRARIES = ${PYTHON_LIBRARIES}") include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${MS_CCSRC_PATH}) +include_directories(${CMAKE_SOURCE_DIR}/mindspore/core) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/stub/runtime/) include_directories(${CMAKE_BINARY_DIR}) @@ -27,8 +28,8 @@ link_directories(${MS_CCSRC_BUILD_PATH}) if(ENABLE_MINDDATA) add_definitions(-D ENABLE_MINDDATA) - link_directories(${MS_CCSRC_BUILD_PATH}/dataset) - link_directories(${MS_CCSRC_BUILD_PATH}/mindrecord) + link_directories(${MS_CCSRC_BUILD_PATH}/minddata/dataset) + link_directories(${MS_CCSRC_BUILD_PATH}/minddata/mindrecord) endif() # fetch ut test files if(ENABLE_MINDDATA) @@ -53,82 +54,81 @@ endif() file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/ccsrc/base/*.cc" "../../../mindspore/ccsrc/abstract/*.cc" - "../../../mindspore/ccsrc/ir/*.cc" + "../../../mindspore/core/ir/*.cc" "../../../mindspore/ccsrc/common/*.cc" "../../../mindspore/ccsrc/utils/*.cc" - "../../../mindspore/ccsrc/parallel/*.cc" - "../../../mindspore/ccsrc/pipeline/parse/*.cc" - "../../../mindspore/ccsrc/pipeline/static_analysis/*.cc" - "../../../mindspore/ccsrc/pipeline/pipeline.cc" - "../../../mindspore/ccsrc/pipeline/resource.cc" - "../../../mindspore/ccsrc/pipeline/pass.cc" - "../../../mindspore/ccsrc/pipeline/action.cc" - "../../../mindspore/ccsrc/pipeline/validator.cc" - "../../../mindspore/ccsrc/pipeline/remove_value_node_dup.cc" - "../../../mindspore/ccsrc/optimizer/*.cc" + "../../../mindspore/ccsrc/pipeline/jit/parse/*.cc" + "../../../mindspore/ccsrc/pipeline/jit/static_analysis/*.cc" + "../../../mindspore/ccsrc/pipeline/jit/pipeline.cc" + "../../../mindspore/ccsrc/pipeline/jit/resource.cc" + "../../../mindspore/ccsrc/pipeline/jit/pass.cc" + "../../../mindspore/ccsrc/pipeline/jit/action.cc" + "../../../mindspore/ccsrc/pipeline/jit/validator.cc" + "../../../mindspore/ccsrc/pipeline/jit/remove_value_node_dup.cc" + "../../../mindspore/ccsrc/frontend/optimizer/*.cc" + "../../../mindspore/ccsrc/frontend/parallel/*.cc" "../../../mindspore/ccsrc/debug/*.cc" - "../../../mindspore/ccsrc/operator/*.cc" - "../../../mindspore/ccsrc/transform/*.cc" - "../../../mindspore/ccsrc/session/anf_runtime_algorithm.cc" - "../../../mindspore/ccsrc/session/ascend_session.cc" - "../../../mindspore/ccsrc/session/ascend_control_parser.cc" - "../../../mindspore/ccsrc/session/kernel_graph.cc" - "../../../mindspore/ccsrc/session/session_basic.cc" - "../../../mindspore/ccsrc/session/session_factory.cc" + "../../../mindspore/ccsrc/frontend/operator/*.cc" + "../../../mindspore/ccsrc/transform/graph_ir/*.cc" + "../../../mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc" + "../../../mindspore/ccsrc/backend/session/ascend_session.cc" + "../../../mindspore/ccsrc/backend/session/ascend_control_parser.cc" + "../../../mindspore/ccsrc/backend/session/kernel_graph.cc" + "../../../mindspore/ccsrc/backend/session/session_basic.cc" + "../../../mindspore/ccsrc/backend/session/session_factory.cc" "../../../mindspore/ccsrc/vm/*.cc" - "../../../mindspore/ccsrc/pynative/*.cc" + "../../../mindspore/ccsrc/pipeline/pynative/*.cc" "../../../mindspore/ccsrc/pybind_api/*.cc" - "../../../mindspore/ccsrc/kernel/akg/*.cc" - "../../../mindspore/ccsrc/kernel/kash/*.cc" - "../../../mindspore/ccsrc/kernel/cce/*.cc" - "../../../mindspore/ccsrc/kernel/rts/*.cc" - "../../../mindspore/ccsrc/kernel/hccl/*.cc" - "../../../mindspore/ccsrc/kernel/kernel_query.cc" - "../../../mindspore/ccsrc/kernel/kernel_build_info.cc" - "../../../mindspore/ccsrc/pre_activate/ascend/*.cc" - "../../../mindspore/ccsrc/pre_activate/common/*.cc" - "../../../mindspore/ccsrc/pre_activate/gpu/*.cc" - "../../../mindspore/ccsrc/pre_activate/mem_reuse/*.cc" - "../../../mindspore/ccsrc/pre_activate/pass/*.cc" - "../../../mindspore/ccsrc/kernel/aicpu/aicpu_kernel_metadata.cc" - "../../../mindspore/ccsrc/kernel/rts/rt_kernel_info.cc" - "../../../mindspore/ccsrc/kernel/common_utils.cc" - "../../../mindspore/ccsrc/kernel/oplib/*.cc" - "../../../mindspore/ccsrc/kernel/tbe/*.cc" - "../../../mindspore/ccsrc/device/kernel_runtime.cc" - "../../../mindspore/ccsrc/device/memory_manager.cc" - "../../../mindspore/ccsrc/device/kernel_runtime_manager.cc" - "../../../mindspore/ccsrc/device/kernel_info.cc" - "../../../mindspore/ccsrc/device/ascend/profiling/*.cc" - "../../../mindspore/ccsrc/device/ascend/kernel_select_ascend.cc" - "../../../mindspore/ccsrc/device/ascend/kernel_select_graph_kernel.cc" - "../../../mindspore/ccsrc/device/convert_tensor_utils.cc" - "../../../mindspore/ccsrc/device/ascend/kernel_build_ascend.cc" - "../../../mindspore/ccsrc/device/ascend/ascend_kernel_runtime.cc" - "../../../mindspore/ccsrc/device/ascend/ascend_memory_manager.cc" - "../../../mindspore/ccsrc/device/ascend/ascend_device_address.cc" - "../../../mindspore/ccsrc/device/ascend/ascend_memory_pool.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/akg/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/kash/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/rts/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/hccl/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc" + "../../../mindspore/ccsrc/backend/optimizer/ascend/*.cc" + "../../../mindspore/ccsrc/backend/optimizer/common/*.cc" + "../../../mindspore/ccsrc/backend/optimizer/gpu/*.cc" + "../../../mindspore/ccsrc/backend/optimizer/mem_reuse/*.cc" + "../../../mindspore/ccsrc/backend/optimizer/pass/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/common_utils.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/oplib/*.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/tbe/*.cc" + "../../../mindspore/ccsrc/runtime/device/kernel_runtime.cc" + "../../../mindspore/ccsrc/runtime/device/memory_manager.cc" + "../../../mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc" + "../../../mindspore/ccsrc/runtime/device/kernel_info.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/profiling/*.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc" + "../../../mindspore/ccsrc/runtime/device/convert_tensor_utils.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc" + "../../../mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc" "../../../mindspore/ccsrc/predict/generator/utils/ir_model_util.cc" "../../../mindspore/ccsrc/predict/predict.cc" "../../../mindspore/ccsrc/predict/converter/*.cc" "../../../mindspore/ccsrc/predict/converter/attr_utils/*.cc" "../../../mindspore/ccsrc/predict/converter/lite_model/*.cc" "../../../mindspore/ccsrc/predict/converter/lite_model/operations/*.cc" - "../../../mindspore/ccsrc/kernel/cpu/cpu_kernel.cc" - "../../../mindspore/ccsrc/kernel/cpu/cpu_kernel_factory.cc" - "../../../mindspore/ccsrc/kernel/cpu/sparse_apply_adam_cpu_kernel.cc" - "../../../mindspore/ccsrc/kernel/cpu/sparse_apply_ftrl_cpu_kernel.cc" - "../../../mindspore/ccsrc/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.cc" - "../../../mindspore/ccsrc/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc" + "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc" ) list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/debug/dump_proto.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ir/lite/tensor.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/parallel/ps/util.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/parallel/ps/scheduler.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/parallel/ps/optimizer_info.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/parallel/ps/optimizer_info_builder.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/core/ir/lite/tensor.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/util.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/scheduler.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/optimizer_info.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/frontend/parallel/ps/optimizer_info_builder.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/anf_ir.pb.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/node_strategy.pb.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/utils/load_onnx/anf_model_parser.cc") diff --git a/tests/ut/cpp/abstract/abstract_test.cc b/tests/ut/cpp/abstract/abstract_test.cc index ea0b5e5b61..2e3a2a8d1a 100644 --- a/tests/ut/cpp/abstract/abstract_test.cc +++ b/tests/ut/cpp/abstract/abstract_test.cc @@ -18,13 +18,13 @@ #include "common/common_test.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "abstract/utils.h" -#include "pipeline/static_analysis/prim.h" -#include "pipeline/parse/parse.h" -#include "pipeline/parse/resolve.h" -#include "pipeline/parse/data_converter.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "pipeline/jit/parse/parse.h" +#include "pipeline/jit/parse/resolve.h" +#include "pipeline/jit/parse/data_converter.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace abstract { diff --git a/tests/ut/cpp/abstract/utils_test.cc b/tests/ut/cpp/abstract/utils_test.cc index fbc6b3c3e2..33cada28d7 100644 --- a/tests/ut/cpp/abstract/utils_test.cc +++ b/tests/ut/cpp/abstract/utils_test.cc @@ -16,7 +16,7 @@ #include "abstract/utils.h" #include "common/common_test.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" namespace mindspore { namespace abstract { diff --git a/tests/ut/cpp/common/backend_common_test.cc b/tests/ut/cpp/common/backend_common_test.cc index 060b170a8c..3710349298 100644 --- a/tests/ut/cpp/common/backend_common_test.cc +++ b/tests/ut/cpp/common/backend_common_test.cc @@ -20,11 +20,11 @@ #include #include "utils/log_adapter.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" -#include "session/ascend_session.h" -#include "pipeline/resource.h" -#include "pipeline/action.h" +#include "backend/session/ascend_session.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/action.h" #include "ir/anf.h" #include "ir/manager.h" diff --git a/tests/ut/cpp/common/backend_common_test.h b/tests/ut/cpp/common/backend_common_test.h index fb3334182a..f5bfc9d6dd 100644 --- a/tests/ut/cpp/common/backend_common_test.h +++ b/tests/ut/cpp/common/backend_common_test.h @@ -17,7 +17,7 @@ #define TESTS_UT_CPP_COMMON_UT_BACKEND_COMMON_H_ #include "common/common_test.h" #include "utils/context/ms_context.h" -#include "session/kernel_graph.h" +#include "backend/session/kernel_graph.h" namespace mindspore { class BackendCommon : public UT::Common { diff --git a/tests/ut/cpp/common/py_func_graph_fetcher.h b/tests/ut/cpp/common/py_func_graph_fetcher.h index 98552a96b5..d864842760 100644 --- a/tests/ut/cpp/common/py_func_graph_fetcher.h +++ b/tests/ut/cpp/common/py_func_graph_fetcher.h @@ -22,8 +22,8 @@ #include "ir/primitive.h" #include "ir/manager.h" #include "ir/func_graph.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/parse.h" #include "./common.h" namespace UT { diff --git a/tests/ut/cpp/common/test_main.cc b/tests/ut/cpp/common/test_main.cc index f0cfc1778c..fa456ed260 100644 --- a/tests/ut/cpp/common/test_main.cc +++ b/tests/ut/cpp/common/test_main.cc @@ -16,8 +16,8 @@ #include #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "pipeline/pipeline.h" -#include "pipeline/resource.h" +#include "pipeline/jit/pipeline.h" +#include "pipeline/jit/resource.h" namespace mindspore { extern void InitSubModulesLogLevel(); diff --git a/tests/ut/cpp/dataset/arena_test.cc b/tests/ut/cpp/dataset/arena_test.cc index e8698ad979..10d27b51c6 100644 --- a/tests/ut/cpp/dataset/arena_test.cc +++ b/tests/ut/cpp/dataset/arena_test.cc @@ -15,7 +15,7 @@ */ #include -#include "dataset/util/arena.h" +#include "minddata/dataset/util/arena.h" #include "common/common.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/batch_op_test.cc b/tests/ut/cpp/dataset/batch_op_test.cc index a04da06e4e..3e1f3c0b32 100644 --- a/tests/ut/cpp/dataset/batch_op_test.cc +++ b/tests/ut/cpp/dataset/batch_op_test.cc @@ -16,14 +16,14 @@ #include #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" #include "securec.h" -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" namespace common = mindspore::common; namespace de = mindspore::dataset; diff --git a/tests/ut/cpp/dataset/bit_functions_test.cc b/tests/ut/cpp/dataset/bit_functions_test.cc index 02b6a25f76..cf1c1562db 100644 --- a/tests/ut/cpp/dataset/bit_functions_test.cc +++ b/tests/ut/cpp/dataset/bit_functions_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" #include "common/common.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc b/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc index 4633eefe35..dc59d39fac 100644 --- a/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc +++ b/tests/ut/cpp/dataset/bounding_box_augment_op_test.cc @@ -14,8 +14,8 @@ * limitations under the License. */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/bounding_box_augment_op.h" -#include "dataset/kernels/image/random_rotation_op.h" +#include "minddata/dataset/kernels/image/bounding_box_augment_op.h" +#include "minddata/dataset/kernels/image/random_rotation_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/btree_test.cc b/tests/ut/cpp/dataset/btree_test.cc index 67b6c4e6c7..9fa4fce812 100644 --- a/tests/ut/cpp/dataset/btree_test.cc +++ b/tests/ut/cpp/dataset/btree_test.cc @@ -15,10 +15,10 @@ */ #include -#include "dataset/util/btree.h" -#include "dataset/util/auto_index.h" -#include "dataset/util/system_pool.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/btree.h" +#include "minddata/dataset/util/auto_index.h" +#include "minddata/dataset/util/system_pool.h" +#include "minddata/dataset/util/task_manager.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/c_api_test.cc b/tests/ut/cpp/dataset/c_api_test.cc index 385b327768..902bc9a43b 100644 --- a/tests/ut/cpp/dataset/c_api_test.cc +++ b/tests/ut/cpp/dataset/c_api_test.cc @@ -24,12 +24,12 @@ #include "common/common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/include/datasets.h" -#include "dataset/include/status.h" -#include "dataset/include/transforms.h" -#include "dataset/include/iterator.h" -#include "dataset/core/constants.h" -#include "dataset/include/samplers.h" +#include "minddata/dataset/include/datasets.h" +#include "minddata/dataset/include/status.h" +#include "minddata/dataset/include/transforms.h" +#include "minddata/dataset/include/iterator.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/include/samplers.h" using namespace mindspore::dataset::api; using mindspore::MsLogLevel::ERROR; diff --git a/tests/ut/cpp/dataset/cache_op_test.cc b/tests/ut/cpp/dataset/cache_op_test.cc index a31a8f8ddf..bdb7c861b2 100644 --- a/tests/ut/cpp/dataset/cache_op_test.cc +++ b/tests/ut/cpp/dataset/cache_op_test.cc @@ -14,19 +14,19 @@ * limitations under the License. */ #include -#include "dataset/core/client.h" -#include "dataset/engine/cache/cache_client.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/datasetops/cache_op.h" -#include "dataset/engine/datasetops/cache_lookup_op.h" -#include "dataset/engine/datasetops/cache_merge_op.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/engine/cache/cache_client.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/cache_op.h" +#include "minddata/dataset/engine/datasetops/cache_lookup_op.h" +#include "minddata/dataset/engine/datasetops/cache_merge_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "dataset/util/storage_container.h" // lint !e322 -#include "dataset/engine/datasetops/source/random_data_op.h" -#include "dataset/engine/data_schema.h" +#include "minddata/dataset/util/storage_container.h" // lint !e322 +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/data_schema.h" using namespace mindspore::dataset; using mindspore::LogStream; diff --git a/tests/ut/cpp/dataset/celeba_op_test.cc b/tests/ut/cpp/dataset/celeba_op_test.cc index a109739fda..ccaed122f4 100644 --- a/tests/ut/cpp/dataset/celeba_op_test.cc +++ b/tests/ut/cpp/dataset/celeba_op_test.cc @@ -19,11 +19,11 @@ #include #include "common/common.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/celeba_op.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/celeba_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/center_crop_op_test.cc b/tests/ut/cpp/dataset/center_crop_op_test.cc index 54c45c957e..cd0f362f64 100644 --- a/tests/ut/cpp/dataset/center_crop_op_test.cc +++ b/tests/ut/cpp/dataset/center_crop_op_test.cc @@ -15,8 +15,8 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/center_crop_op.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/center_crop_op.h" +#include "minddata/dataset/core/cv_tensor.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/channel_swap_test.cc b/tests/ut/cpp/dataset/channel_swap_test.cc index f1dc1396ca..2000de15b2 100644 --- a/tests/ut/cpp/dataset/channel_swap_test.cc +++ b/tests/ut/cpp/dataset/channel_swap_test.cc @@ -15,8 +15,8 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/hwc_to_chw_op.h" -#include "dataset/core/data_type.h" +#include "minddata/dataset/kernels/image/hwc_to_chw_op.h" +#include "minddata/dataset/core/data_type.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/cifar_op_test.cc b/tests/ut/cpp/dataset/cifar_op_test.cc index b37b9acaee..ed22f4f347 100644 --- a/tests/ut/cpp/dataset/cifar_op_test.cc +++ b/tests/ut/cpp/dataset/cifar_op_test.cc @@ -20,14 +20,14 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/cifar_op.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/cifar_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/circular_pool_test.cc b/tests/ut/cpp/dataset/circular_pool_test.cc index c42b08ddcd..d06f846684 100644 --- a/tests/ut/cpp/dataset/circular_pool_test.cc +++ b/tests/ut/cpp/dataset/circular_pool_test.cc @@ -15,9 +15,9 @@ */ #include #include -#include "dataset/util/task_manager.h" -#include "dataset/util/circular_pool.h" -#include "dataset/util/services.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/util/services.h" #include "common/common.h" #include "common/utils.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/client_config_test.cc b/tests/ut/cpp/dataset/client_config_test.cc index a907d50134..5cc9600b4e 100644 --- a/tests/ut/cpp/dataset/client_config_test.cc +++ b/tests/ut/cpp/dataset/client_config_test.cc @@ -20,11 +20,11 @@ #include #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "gtest/gtest.h" -#include "dataset/core/global_context.h" -#include "dataset/util/status.h" -#include "dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/clue_op_test.cc b/tests/ut/cpp/dataset/clue_op_test.cc index ff2f01a9ff..0935434a06 100644 --- a/tests/ut/cpp/dataset/clue_op_test.cc +++ b/tests/ut/cpp/dataset/clue_op_test.cc @@ -17,13 +17,13 @@ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "dataset/engine/datasetops/source/clue_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/engine/datasetops/source/clue_op.h" +#include "minddata/dataset/util/status.h" namespace common = mindspore::common; diff --git a/tests/ut/cpp/dataset/coco_op_test.cc b/tests/ut/cpp/dataset/coco_op_test.cc index bcb82f8ec1..6e6d3c26e5 100644 --- a/tests/ut/cpp/dataset/coco_op_test.cc +++ b/tests/ut/cpp/dataset/coco_op_test.cc @@ -20,18 +20,18 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/coco_op.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/coco_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/common/bboxop_common.cc b/tests/ut/cpp/dataset/common/bboxop_common.cc index e4be1fbbe6..62c9f85348 100644 --- a/tests/ut/cpp/dataset/common/bboxop_common.cc +++ b/tests/ut/cpp/dataset/common/bboxop_common.cc @@ -26,9 +26,9 @@ #include "./tinyxml2.h" #include "opencv2/opencv.hpp" #include "common/utils.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/util/path.h" -#include "dataset/core/constants.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/core/constants.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/common/bboxop_common.h b/tests/ut/cpp/dataset/common/bboxop_common.h index ba3ceb62d9..243908e7a3 100644 --- a/tests/ut/cpp/dataset/common/bboxop_common.h +++ b/tests/ut/cpp/dataset/common/bboxop_common.h @@ -17,7 +17,7 @@ #define TESTS_DATASET_UT_CORE_COMMON_DE_UT_BBOXOP_COMMON_H_ #include "cvop_common.h" -#include "dataset/util/path.h" +#include "minddata/dataset/util/path.h" namespace UT { namespace CVOP { diff --git a/tests/ut/cpp/dataset/common/cvop_common.cc b/tests/ut/cpp/dataset/common/cvop_common.cc index 6f66229e80..48d69564fd 100644 --- a/tests/ut/cpp/dataset/common/cvop_common.cc +++ b/tests/ut/cpp/dataset/common/cvop_common.cc @@ -18,9 +18,9 @@ #include #include #include "cvop_common.h" -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" #include "common/utils.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/core/cv_tensor.h" #include "utils/log_adapter.h" #include #include diff --git a/tests/ut/cpp/dataset/common/cvop_common.h b/tests/ut/cpp/dataset/common/cvop_common.h index 02c079fd68..59134091fd 100644 --- a/tests/ut/cpp/dataset/common/cvop_common.h +++ b/tests/ut/cpp/dataset/common/cvop_common.h @@ -19,7 +19,7 @@ #include #include #include "common.h" -#include "dataset/kernels/image/image_utils.h" +#include "minddata/dataset/kernels/image/image_utils.h" namespace UT { namespace CVOP { diff --git a/tests/ut/cpp/dataset/concat_op_test.cc b/tests/ut/cpp/dataset/concat_op_test.cc index 70d0268ec7..9e991ce0d3 100644 --- a/tests/ut/cpp/dataset/concat_op_test.cc +++ b/tests/ut/cpp/dataset/concat_op_test.cc @@ -19,7 +19,7 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/concatenate_op_test.cc b/tests/ut/cpp/dataset/concatenate_op_test.cc index 1ceedbac38..dc2fc69266 100644 --- a/tests/ut/cpp/dataset/concatenate_op_test.cc +++ b/tests/ut/cpp/dataset/concatenate_op_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common.h" -#include "dataset/kernels/data/concatenate_op.h" +#include "minddata/dataset/kernels/data/concatenate_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/connector_test.cc b/tests/ut/cpp/dataset/connector_test.cc index 7ee36cc2c0..0fc5b100d7 100644 --- a/tests/ut/cpp/dataset/connector_test.cc +++ b/tests/ut/cpp/dataset/connector_test.cc @@ -23,8 +23,8 @@ #include "common/common.h" -#include "dataset/engine/connector.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/engine/connector.h" +#include "minddata/dataset/util/task_manager.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/cut_out_op_test.cc b/tests/ut/cpp/dataset/cut_out_op_test.cc index 462fb3a875..5d24d9c3f9 100644 --- a/tests/ut/cpp/dataset/cut_out_op_test.cc +++ b/tests/ut/cpp/dataset/cut_out_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/cut_out_op.h" +#include "minddata/dataset/kernels/image/cut_out_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/cyclic_array_test.cc b/tests/ut/cpp/dataset/cyclic_array_test.cc index 55f75c403f..380436de1b 100644 --- a/tests/ut/cpp/dataset/cyclic_array_test.cc +++ b/tests/ut/cpp/dataset/cyclic_array_test.cc @@ -19,7 +19,7 @@ #include "common/cvop_common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/engine/perf/cyclic_array.h" +#include "minddata/dataset/engine/perf/cyclic_array.h" #include using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/datatype_test.cc b/tests/ut/cpp/dataset/datatype_test.cc index 8cb2210228..b81618dc24 100644 --- a/tests/ut/cpp/dataset/datatype_test.cc +++ b/tests/ut/cpp/dataset/datatype_test.cc @@ -15,11 +15,11 @@ */ #include #include "./securec.h" -#include "dataset/core/data_type.h" +#include "minddata/dataset/core/data_type.h" #include "common/common.h" #include "gtest/gtest.h" #include -#include "dataset/core/constants.h" +#include "minddata/dataset/core/constants.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/decode_op_test.cc b/tests/ut/cpp/dataset/decode_op_test.cc index 7f3e129ac0..1cd03099ce 100644 --- a/tests/ut/cpp/dataset/decode_op_test.cc +++ b/tests/ut/cpp/dataset/decode_op_test.cc @@ -16,7 +16,7 @@ #include #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/decode_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/duplicate_op_test.cc b/tests/ut/cpp/dataset/duplicate_op_test.cc index b7ce32f655..93779b084d 100644 --- a/tests/ut/cpp/dataset/duplicate_op_test.cc +++ b/tests/ut/cpp/dataset/duplicate_op_test.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/core/tensor.h" -#include "dataset/kernels/data/duplicate_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/kernels/data/duplicate_op.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/execution_tree_test.cc b/tests/ut/cpp/dataset/execution_tree_test.cc index 529644331a..b871dd00d8 100644 --- a/tests/ut/cpp/dataset/execution_tree_test.cc +++ b/tests/ut/cpp/dataset/execution_tree_test.cc @@ -14,11 +14,11 @@ * limitations under the License. */ #include -#include "dataset/util/circular_pool.h" -#include "dataset/core/client.h" -#include "dataset/engine/execution_tree.h" -#include "dataset/engine/datasetops/shuffle_op.h" -#include "dataset/engine/datasetops/source/tf_reader_op.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/engine/execution_tree.h" +#include "minddata/dataset/engine/datasetops/shuffle_op.h" +#include "minddata/dataset/engine/datasetops/source/tf_reader_op.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/fill_op_test.cc b/tests/ut/cpp/dataset/fill_op_test.cc index d43b7d7548..20e323cc8d 100644 --- a/tests/ut/cpp/dataset/fill_op_test.cc +++ b/tests/ut/cpp/dataset/fill_op_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common.h" -#include "dataset/kernels/data/fill_op.h" +#include "minddata/dataset/kernels/data/fill_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/filter_op_test.cc b/tests/ut/cpp/dataset/filter_op_test.cc index 45ee714337..3e5be8dc04 100644 --- a/tests/ut/cpp/dataset/filter_op_test.cc +++ b/tests/ut/cpp/dataset/filter_op_test.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/circular_pool.h" -#include "dataset/core/client.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/global_context_test.cc b/tests/ut/cpp/dataset/global_context_test.cc index bb75d941aa..cd4c970ae6 100644 --- a/tests/ut/cpp/dataset/global_context_test.cc +++ b/tests/ut/cpp/dataset/global_context_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/global_context.h" #include "common/common.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/gnn_graph_test.cc b/tests/ut/cpp/dataset/gnn_graph_test.cc index 584fde5cef..c4dd7b055c 100644 --- a/tests/ut/cpp/dataset/gnn_graph_test.cc +++ b/tests/ut/cpp/dataset/gnn_graph_test.cc @@ -20,9 +20,9 @@ #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/status.h" -#include "dataset/engine/gnn/node.h" -#include "dataset/engine/gnn/graph_loader.h" +#include "minddata/dataset/util/status.h" +#include "minddata/dataset/engine/gnn/node.h" +#include "minddata/dataset/engine/gnn/graph_loader.h" using namespace mindspore::dataset; using namespace mindspore::dataset::gnn; diff --git a/tests/ut/cpp/dataset/image_folder_op_test.cc b/tests/ut/cpp/dataset/image_folder_op_test.cc index 576c5abbfc..3168efa196 100644 --- a/tests/ut/cpp/dataset/image_folder_op_test.cc +++ b/tests/ut/cpp/dataset/image_folder_op_test.cc @@ -19,18 +19,18 @@ #include #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/interrupt_test.cc b/tests/ut/cpp/dataset/interrupt_test.cc index 7ab608b9ae..8a06413175 100644 --- a/tests/ut/cpp/dataset/interrupt_test.cc +++ b/tests/ut/cpp/dataset/interrupt_test.cc @@ -15,10 +15,10 @@ */ #include "common/common.h" #include "utils/log_adapter.h" -#include "dataset/util/services.h" -#include "dataset/util/intrp_service.h" -#include "dataset/util/task_manager.h" -#include "dataset/util/queue.h" +#include "minddata/dataset/util/services.h" +#include "minddata/dataset/util/intrp_service.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/util/queue.h" using namespace mindspore::dataset; using mindspore::MsLogLevel::INFO; diff --git a/tests/ut/cpp/dataset/jieba_tokenizer_op_test.cc b/tests/ut/cpp/dataset/jieba_tokenizer_op_test.cc index 849943beb1..85b3384d36 100644 --- a/tests/ut/cpp/dataset/jieba_tokenizer_op_test.cc +++ b/tests/ut/cpp/dataset/jieba_tokenizer_op_test.cc @@ -18,7 +18,7 @@ #include #include "common/common.h" -#include "dataset/text/kernels/jieba_tokenizer_op.h" +#include "minddata/dataset/text/kernels/jieba_tokenizer_op.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/manifest_op_test.cc b/tests/ut/cpp/dataset/manifest_op_test.cc index 6317a6a345..a6eef4aaa2 100644 --- a/tests/ut/cpp/dataset/manifest_op_test.cc +++ b/tests/ut/cpp/dataset/manifest_op_test.cc @@ -20,12 +20,12 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/manifest_op.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/manifest_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/map_op_test.cc b/tests/ut/cpp/dataset/map_op_test.cc index e5deac723f..4e9cfe9ec9 100644 --- a/tests/ut/cpp/dataset/map_op_test.cc +++ b/tests/ut/cpp/dataset/map_op_test.cc @@ -19,12 +19,12 @@ #include "common/common.h" -#include "dataset/core/client.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/kernels/image/decode_op.h" -#include "dataset/kernels/image/resize_op.h" -#include "dataset/kernels/tensor_op.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/tensor_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/mask_test.cc b/tests/ut/cpp/dataset/mask_test.cc index 9ff5f51fce..609d5bf447 100644 --- a/tests/ut/cpp/dataset/mask_test.cc +++ b/tests/ut/cpp/dataset/mask_test.cc @@ -15,15 +15,15 @@ */ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/core/tensor.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/data_type.h" -#include "dataset/kernels/data/mask_op.h" -#include "dataset/kernels/data/data_utils.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/kernels/data/mask_op.h" +#include "minddata/dataset/kernels/data/data_utils.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/memory_pool_test.cc b/tests/ut/cpp/dataset/memory_pool_test.cc index 136f3fe1b8..b5907655dc 100644 --- a/tests/ut/cpp/dataset/memory_pool_test.cc +++ b/tests/ut/cpp/dataset/memory_pool_test.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "dataset/util/memory_pool.h" -#include "dataset/util/circular_pool.h" -#include "dataset/util/system_pool.h" -#include "dataset/util/allocator.h" +#include "minddata/dataset/util/memory_pool.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/util/system_pool.h" +#include "minddata/dataset/util/allocator.h" #include "common/common.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/mind_record_op_test.cc b/tests/ut/cpp/dataset/mind_record_op_test.cc index b2cbdf027e..c9067535d6 100644 --- a/tests/ut/cpp/dataset/mind_record_op_test.cc +++ b/tests/ut/cpp/dataset/mind_record_op_test.cc @@ -16,14 +16,14 @@ #include #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" -#include "mindrecord/include/shard_category.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_sample.h" -#include "mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/shard_category.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_shuffle.h" #include "utils/log_adapter.h" namespace common = mindspore::common; diff --git a/tests/ut/cpp/dataset/mnist_op_test.cc b/tests/ut/cpp/dataset/mnist_op_test.cc index da78cb6f7f..dfceeaa06a 100644 --- a/tests/ut/cpp/dataset/mnist_op_test.cc +++ b/tests/ut/cpp/dataset/mnist_op_test.cc @@ -20,18 +20,18 @@ #include "common/utils.h" #include "common/common.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/mnist_op.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/mnist_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/normalize_op_test.cc b/tests/ut/cpp/dataset/normalize_op_test.cc index 05ac3f6289..31791e0e66 100644 --- a/tests/ut/cpp/dataset/normalize_op_test.cc +++ b/tests/ut/cpp/dataset/normalize_op_test.cc @@ -15,8 +15,8 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/normalize_op.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/normalize_op.h" +#include "minddata/dataset/core/cv_tensor.h" #include "utils/log_adapter.h" #include diff --git a/tests/ut/cpp/dataset/one_hot_op_test.cc b/tests/ut/cpp/dataset/one_hot_op_test.cc index c414e371e5..2617ae4536 100644 --- a/tests/ut/cpp/dataset/one_hot_op_test.cc +++ b/tests/ut/cpp/dataset/one_hot_op_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common.h" -#include "dataset/kernels/data/one_hot_op.h" +#include "minddata/dataset/kernels/data/one_hot_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/pad_end_op_test.cc b/tests/ut/cpp/dataset/pad_end_op_test.cc index 2787501aa9..1c838da8e8 100644 --- a/tests/ut/cpp/dataset/pad_end_op_test.cc +++ b/tests/ut/cpp/dataset/pad_end_op_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common.h" -#include "dataset/kernels/data/pad_end_op.h" +#include "minddata/dataset/kernels/data/pad_end_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/pad_op_test.cc b/tests/ut/cpp/dataset/pad_op_test.cc index b659d009f3..e2bd822d02 100644 --- a/tests/ut/cpp/dataset/pad_op_test.cc +++ b/tests/ut/cpp/dataset/pad_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/pad_op.h" +#include "minddata/dataset/kernels/image/pad_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/path_test.cc b/tests/ut/cpp/dataset/path_test.cc index 4cf3b17968..b36b38bbc7 100644 --- a/tests/ut/cpp/dataset/path_test.cc +++ b/tests/ut/cpp/dataset/path_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/path.h" +#include "minddata/dataset/util/path.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/perf_data_test.cc b/tests/ut/cpp/dataset/perf_data_test.cc index 048ee1f21a..486209be21 100644 --- a/tests/ut/cpp/dataset/perf_data_test.cc +++ b/tests/ut/cpp/dataset/perf_data_test.cc @@ -17,8 +17,8 @@ #include "common/cvop_common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/engine/perf/cyclic_array.h" -#include "dataset/engine/perf/perf_data.h" +#include "minddata/dataset/engine/perf/cyclic_array.h" +#include "minddata/dataset/engine/perf/perf_data.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/project_op_test.cc b/tests/ut/cpp/dataset/project_op_test.cc index 484396321c..45ef11b88f 100644 --- a/tests/ut/cpp/dataset/project_op_test.cc +++ b/tests/ut/cpp/dataset/project_op_test.cc @@ -19,7 +19,7 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/queue_test.cc b/tests/ut/cpp/dataset/queue_test.cc index 05c80ea50f..ec40cc2ae4 100644 --- a/tests/ut/cpp/dataset/queue_test.cc +++ b/tests/ut/cpp/dataset/queue_test.cc @@ -16,8 +16,8 @@ #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/task_manager.h" -#include "dataset/util/queue.h" +#include "minddata/dataset/util/task_manager.h" +#include "minddata/dataset/util/queue.h" #include #include #include diff --git a/tests/ut/cpp/dataset/random_color_adjust_op_test.cc b/tests/ut/cpp/dataset/random_color_adjust_op_test.cc index 82df108ad1..96f4dd8145 100644 --- a/tests/ut/cpp/dataset/random_color_adjust_op_test.cc +++ b/tests/ut/cpp/dataset/random_color_adjust_op_test.cc @@ -15,8 +15,8 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/random_color_adjust_op.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/random_color_adjust_op.h" +#include "minddata/dataset/core/cv_tensor.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_crop_and_resize_op_test.cc b/tests/ut/cpp/dataset/random_crop_and_resize_op_test.cc index 3d5298b071..fd59a90117 100644 --- a/tests/ut/cpp/dataset/random_crop_and_resize_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_and_resize_op_test.cc @@ -16,7 +16,7 @@ #include "common/common.h" #include "common/cvop_common.h" #include -#include "dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc index a1d4481f55..4efdcb8b78 100644 --- a/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_and_resize_with_bbox_op_test.cc @@ -14,11 +14,11 @@ * limitations under the License. */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/random_crop_and_resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_with_bbox_op.h" #include "utils/log_adapter.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" using namespace mindspore::dataset; using mindspore::LogStream; diff --git a/tests/ut/cpp/dataset/random_crop_decode_resize_op_test.cc b/tests/ut/cpp/dataset/random_crop_decode_resize_op_test.cc index a2ed2fe9f1..170525b4e7 100644 --- a/tests/ut/cpp/dataset/random_crop_decode_resize_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_decode_resize_op_test.cc @@ -16,10 +16,10 @@ #include #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/decode_op.h" -#include "dataset/kernels/image/random_crop_and_resize_op.h" -#include "dataset/kernels/image/random_crop_decode_resize_op.h" -#include "dataset/core/config_manager.h" +#include "minddata/dataset/kernels/image/decode_op.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/image/random_crop_decode_resize_op.h" +#include "minddata/dataset/core/config_manager.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_crop_op_test.cc b/tests/ut/cpp/dataset/random_crop_op_test.cc index 2f3b19e2f4..9c8f1f31ed 100644 --- a/tests/ut/cpp/dataset/random_crop_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/random_crop_op.h" +#include "minddata/dataset/kernels/image/random_crop_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc index 3790574e02..fcf8ba2605 100644 --- a/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_crop_with_bbox_op_test.cc @@ -15,11 +15,11 @@ */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/random_crop_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_crop_with_bbox_op.h" #include "utils/log_adapter.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" using namespace mindspore::dataset; using mindspore::LogStream; diff --git a/tests/ut/cpp/dataset/random_data_op_test.cc b/tests/ut/cpp/dataset/random_data_op_test.cc index f8a7440c03..3cb7b57ad6 100644 --- a/tests/ut/cpp/dataset/random_data_op_test.cc +++ b/tests/ut/cpp/dataset/random_data_op_test.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include #include #include -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/datasetops/source/random_data_op.h" -#include "dataset/engine/data_schema.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/datasetops/source/random_data_op.h" +#include "minddata/dataset/engine/data_schema.h" using namespace mindspore::dataset; using mindspore::MsLogLevel::INFO; diff --git a/tests/ut/cpp/dataset/random_horizontal_flip_op_test.cc b/tests/ut/cpp/dataset/random_horizontal_flip_op_test.cc index eb2f753554..bb4ba7498d 100644 --- a/tests/ut/cpp/dataset/random_horizontal_flip_op_test.cc +++ b/tests/ut/cpp/dataset/random_horizontal_flip_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/random_horizontal_flip_op.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc b/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc index 7bdd547918..ed4e866478 100644 --- a/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc +++ b/tests/ut/cpp/dataset/random_horizontal_flip_with_bbox_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/random_horizontal_flip_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_horizontal_flip_with_bbox_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_resize_op_test.cc b/tests/ut/cpp/dataset/random_resize_op_test.cc index ee185f2fc6..d9e85de6e5 100644 --- a/tests/ut/cpp/dataset/random_resize_op_test.cc +++ b/tests/ut/cpp/dataset/random_resize_op_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/kernels/image/random_resize_op.h" +#include "minddata/dataset/kernels/image/random_resize_op.h" #include "common/common.h" #include "common/cvop_common.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc index 01e2bf3fbb..e106f57375 100644 --- a/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_resize_with_bbox_op_test.cc @@ -15,11 +15,11 @@ */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/random_resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_resize_with_bbox_op.h" #include "utils/log_adapter.h" -#include "dataset/core/config_manager.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/config_manager.h" +#include "minddata/dataset/core/global_context.h" using namespace mindspore::dataset; using mindspore::LogStream; diff --git a/tests/ut/cpp/dataset/random_rotation_op_test.cc b/tests/ut/cpp/dataset/random_rotation_op_test.cc index 8b82ef1dcd..a6eb5a1ff3 100644 --- a/tests/ut/cpp/dataset/random_rotation_op_test.cc +++ b/tests/ut/cpp/dataset/random_rotation_op_test.cc @@ -16,8 +16,8 @@ #include #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/random_rotation_op.h" -#include "dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/image/random_rotation_op.h" +#include "minddata/dataset/core/cv_tensor.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_vertical_flip_op_test.cc b/tests/ut/cpp/dataset/random_vertical_flip_op_test.cc index a2583cab96..db8cc89893 100644 --- a/tests/ut/cpp/dataset/random_vertical_flip_op_test.cc +++ b/tests/ut/cpp/dataset/random_vertical_flip_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/random_vertical_flip_op.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc b/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc index 2fea8c6c34..d1946ef700 100644 --- a/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/random_vertical_flip_with_bbox_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/random_vertical_flip_with_bbox_op.h" +#include "minddata/dataset/kernels/image/random_vertical_flip_with_bbox_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/rename_op_test.cc b/tests/ut/cpp/dataset/rename_op_test.cc index b6849ec53e..f2091ff466 100644 --- a/tests/ut/cpp/dataset/rename_op_test.cc +++ b/tests/ut/cpp/dataset/rename_op_test.cc @@ -17,15 +17,15 @@ #include #include #include -#include "dataset/core/client.h" -#include "dataset/core/constants.h" -#include "dataset/engine/datasetops/map_op.h" -#include "dataset/engine/datasetops/rename_op.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/engine/datasetops/rename_op.h" #include "common/common.h" #include "common/utils.h" -#include "dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_buffer.h" #include "gtest/gtest.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" namespace common = mindspore::common; diff --git a/tests/ut/cpp/dataset/repeat_op_test.cc b/tests/ut/cpp/dataset/repeat_op_test.cc index 42549546ba..74d494c0dc 100644 --- a/tests/ut/cpp/dataset/repeat_op_test.cc +++ b/tests/ut/cpp/dataset/repeat_op_test.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/circular_pool.h" -#include "dataset/core/client.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/rescale_op_test.cc b/tests/ut/cpp/dataset/rescale_op_test.cc index 86abbe972e..5d9bf32a9f 100644 --- a/tests/ut/cpp/dataset/rescale_op_test.cc +++ b/tests/ut/cpp/dataset/rescale_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/rescale_op.h" +#include "minddata/dataset/kernels/image/rescale_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/resize_bilinear_op_test.cc b/tests/ut/cpp/dataset/resize_bilinear_op_test.cc index 8642484149..910c8af2a2 100644 --- a/tests/ut/cpp/dataset/resize_bilinear_op_test.cc +++ b/tests/ut/cpp/dataset/resize_bilinear_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/resize_bilinear_op.h" +#include "minddata/dataset/kernels/image/resize_bilinear_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/resize_op_test.cc b/tests/ut/cpp/dataset/resize_op_test.cc index e23320a65a..807668dde4 100644 --- a/tests/ut/cpp/dataset/resize_op_test.cc +++ b/tests/ut/cpp/dataset/resize_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/resize_op.h" +#include "minddata/dataset/kernels/image/resize_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc b/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc index b81e4f9649..f9eaf85a55 100644 --- a/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc +++ b/tests/ut/cpp/dataset/resize_with_bbox_op_test.cc @@ -15,7 +15,7 @@ */ #include "common/bboxop_common.h" -#include "dataset/kernels/image/resize_with_bbox_op.h" +#include "minddata/dataset/kernels/image/resize_with_bbox_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/schema_test.cc b/tests/ut/cpp/dataset/schema_test.cc index 2da61bc047..95b9c75d9e 100644 --- a/tests/ut/cpp/dataset/schema_test.cc +++ b/tests/ut/cpp/dataset/schema_test.cc @@ -19,11 +19,11 @@ #include #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/data_schema.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/data_schema.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/shuffle_op_test.cc b/tests/ut/cpp/dataset/shuffle_op_test.cc index c9bcb24c4e..98b4878efb 100644 --- a/tests/ut/cpp/dataset/shuffle_op_test.cc +++ b/tests/ut/cpp/dataset/shuffle_op_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/skip_op_test.cc b/tests/ut/cpp/dataset/skip_op_test.cc index 697745512d..387d2f69ff 100644 --- a/tests/ut/cpp/dataset/skip_op_test.cc +++ b/tests/ut/cpp/dataset/skip_op_test.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/circular_pool.h" -#include "dataset/core/client.h" +#include "minddata/dataset/util/circular_pool.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/stand_alone_samplers_test.cc b/tests/ut/cpp/dataset/stand_alone_samplers_test.cc index dfe15a8f15..96e9652bbc 100644 --- a/tests/ut/cpp/dataset/stand_alone_samplers_test.cc +++ b/tests/ut/cpp/dataset/stand_alone_samplers_test.cc @@ -15,13 +15,13 @@ */ #include "common/common.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/status_test.cc b/tests/ut/cpp/dataset/status_test.cc index c64a86b8ba..195da1c119 100644 --- a/tests/ut/cpp/dataset/status_test.cc +++ b/tests/ut/cpp/dataset/status_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/status.h" +#include "minddata/dataset/util/status.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/subset_random_sampler_test.cc b/tests/ut/cpp/dataset/subset_random_sampler_test.cc index 22200ccbac..c389686014 100644 --- a/tests/ut/cpp/dataset/subset_random_sampler_test.cc +++ b/tests/ut/cpp/dataset/subset_random_sampler_test.cc @@ -16,11 +16,11 @@ #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/core/constants.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" #include #include diff --git a/tests/ut/cpp/dataset/take_op_test.cc b/tests/ut/cpp/dataset/take_op_test.cc index b7be066d6c..a8bfe40b10 100644 --- a/tests/ut/cpp/dataset/take_op_test.cc +++ b/tests/ut/cpp/dataset/take_op_test.cc @@ -19,7 +19,7 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/task_manager_test.cc b/tests/ut/cpp/dataset/task_manager_test.cc index 3d34ec9ec5..7b8101fa56 100644 --- a/tests/ut/cpp/dataset/task_manager_test.cc +++ b/tests/ut/cpp/dataset/task_manager_test.cc @@ -16,7 +16,7 @@ #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/util/task_manager.h" +#include "minddata/dataset/util/task_manager.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tensor_op_fusion_pass_test.cc b/tests/ut/cpp/dataset/tensor_op_fusion_pass_test.cc index 1849227877..70832c04b5 100644 --- a/tests/ut/cpp/dataset/tensor_op_fusion_pass_test.cc +++ b/tests/ut/cpp/dataset/tensor_op_fusion_pass_test.cc @@ -16,13 +16,13 @@ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/kernels/image/random_crop_and_resize_op.h" -#include "dataset/kernels/image/decode_op.h" -#include "dataset/engine/datasetops/source/image_folder_op.h" -#include "dataset/engine/execution_tree.h" +#include "minddata/dataset/kernels/image/random_crop_and_resize_op.h" +#include "minddata/dataset/kernels/image/decode_op.h" +#include "minddata/dataset/engine/datasetops/source/image_folder_op.h" +#include "minddata/dataset/engine/execution_tree.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tensor_string_test.cc b/tests/ut/cpp/dataset/tensor_string_test.cc index 43b235304d..fe336a34c5 100644 --- a/tests/ut/cpp/dataset/tensor_string_test.cc +++ b/tests/ut/cpp/dataset/tensor_string_test.cc @@ -15,13 +15,13 @@ */ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/core/tensor.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/data_type.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tensor_test.cc b/tests/ut/cpp/dataset/tensor_test.cc index 72181a0caf..fce4652b47 100644 --- a/tests/ut/cpp/dataset/tensor_test.cc +++ b/tests/ut/cpp/dataset/tensor_test.cc @@ -15,13 +15,13 @@ */ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/core/tensor.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/data_type.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tensorshape_test.cc b/tests/ut/cpp/dataset/tensorshape_test.cc index 1af0bf9c82..65ab386db0 100644 --- a/tests/ut/cpp/dataset/tensorshape_test.cc +++ b/tests/ut/cpp/dataset/tensorshape_test.cc @@ -15,10 +15,10 @@ */ #include #include "./securec.h" -#include "dataset/core/client.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor_shape.h" -#include "dataset/engine/data_schema.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor_shape.h" +#include "minddata/dataset/engine/data_schema.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/text_file_op_test.cc b/tests/ut/cpp/dataset/text_file_op_test.cc index 7887eda955..bc2674a6a3 100644 --- a/tests/ut/cpp/dataset/text_file_op_test.cc +++ b/tests/ut/cpp/dataset/text_file_op_test.cc @@ -17,13 +17,13 @@ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "dataset/engine/datasetops/source/text_file_op.h" -#include "dataset/util/status.h" +#include "minddata/dataset/engine/datasetops/source/text_file_op.h" +#include "minddata/dataset/util/status.h" namespace common = mindspore::common; diff --git a/tests/ut/cpp/dataset/tfReader_op_test.cc b/tests/ut/cpp/dataset/tfReader_op_test.cc index 9b312296d8..30fde33ff9 100644 --- a/tests/ut/cpp/dataset/tfReader_op_test.cc +++ b/tests/ut/cpp/dataset/tfReader_op_test.cc @@ -17,8 +17,8 @@ #include #include -#include "dataset/core/client.h" -#include "dataset/engine/data_schema.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/engine/data_schema.h" #include "common/common.h" #include "common/utils.h" #include "gtest/gtest.h" diff --git a/tests/ut/cpp/dataset/to_float16_op_test.cc b/tests/ut/cpp/dataset/to_float16_op_test.cc index 9c49c67b2c..5c886690c9 100644 --- a/tests/ut/cpp/dataset/to_float16_op_test.cc +++ b/tests/ut/cpp/dataset/to_float16_op_test.cc @@ -15,9 +15,9 @@ */ #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/image/random_rotation_op.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/kernels/data/to_float16_op.h" +#include "minddata/dataset/kernels/image/random_rotation_op.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/kernels/data/to_float16_op.h" #include "utils/log_adapter.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/tokenizer_op_test.cc b/tests/ut/cpp/dataset/tokenizer_op_test.cc index afac92aa4b..cc2d7473ff 100644 --- a/tests/ut/cpp/dataset/tokenizer_op_test.cc +++ b/tests/ut/cpp/dataset/tokenizer_op_test.cc @@ -18,14 +18,14 @@ #include #include "common/common.h" -#include "dataset/text/kernels/basic_tokenizer_op.h" -#include "dataset/text/kernels/case_fold_op.h" -#include "dataset/text/kernels/normalize_utf8_op.h" -#include "dataset/text/kernels/regex_replace_op.h" -#include "dataset/text/kernels/regex_tokenizer_op.h" -#include "dataset/text/kernels/unicode_char_tokenizer_op.h" -#include "dataset/text/kernels/unicode_script_tokenizer_op.h" -#include "dataset/text/kernels/whitespace_tokenizer_op.h" +#include "minddata/dataset/text/kernels/basic_tokenizer_op.h" +#include "minddata/dataset/text/kernels/case_fold_op.h" +#include "minddata/dataset/text/kernels/normalize_utf8_op.h" +#include "minddata/dataset/text/kernels/regex_replace_op.h" +#include "minddata/dataset/text/kernels/regex_tokenizer_op.h" +#include "minddata/dataset/text/kernels/unicode_char_tokenizer_op.h" +#include "minddata/dataset/text/kernels/unicode_script_tokenizer_op.h" +#include "minddata/dataset/text/kernels/whitespace_tokenizer_op.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/treap_test.cc b/tests/ut/cpp/dataset/treap_test.cc index b454ab108e..b9c534719c 100644 --- a/tests/ut/cpp/dataset/treap_test.cc +++ b/tests/ut/cpp/dataset/treap_test.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dataset/util/treap.h" +#include "minddata/dataset/util/treap.h" #include "common/common.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/trucate_pair_test.cc b/tests/ut/cpp/dataset/trucate_pair_test.cc index 95e2aaa11b..af7e61c16a 100644 --- a/tests/ut/cpp/dataset/trucate_pair_test.cc +++ b/tests/ut/cpp/dataset/trucate_pair_test.cc @@ -15,12 +15,12 @@ */ #include #include -#include "dataset/core/client.h" +#include "minddata/dataset/core/client.h" #include "common/common.h" #include "gtest/gtest.h" #include "securec.h" -#include "dataset/core/tensor.h" -#include "mindspore/ccsrc/dataset/text/kernels/truncate_sequence_pair_op.h" +#include "minddata/dataset/core/tensor.h" +#include "mindspore/ccsrc/minddata/dataset/text/kernels/truncate_sequence_pair_op.h" using namespace mindspore::dataset; diff --git a/tests/ut/cpp/dataset/type_cast_op_test.cc b/tests/ut/cpp/dataset/type_cast_op_test.cc index 543eb71637..a94a7fedba 100644 --- a/tests/ut/cpp/dataset/type_cast_op_test.cc +++ b/tests/ut/cpp/dataset/type_cast_op_test.cc @@ -17,12 +17,12 @@ #include #include "common/common.h" #include "common/cvop_common.h" -#include "dataset/kernels/data/type_cast_op.h" -#include "dataset/core/client.h" -#include "dataset/core/cv_tensor.h" -#include "dataset/core/data_type.h" -#include "dataset/core/tensor.h" -#include "dataset/core/pybind_support.h" +#include "minddata/dataset/kernels/data/type_cast_op.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/cv_tensor.h" +#include "minddata/dataset/core/data_type.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/pybind_support.h" #include "gtest/gtest.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/voc_op_test.cc b/tests/ut/cpp/dataset/voc_op_test.cc index 05dc28b487..4bb212ffc7 100644 --- a/tests/ut/cpp/dataset/voc_op_test.cc +++ b/tests/ut/cpp/dataset/voc_op_test.cc @@ -20,18 +20,18 @@ #include "common/common.h" #include "common/utils.h" -#include "dataset/core/client.h" -#include "dataset/core/global_context.h" -#include "dataset/engine/datasetops/source/voc_op.h" -#include "dataset/engine/datasetops/source/sampler/distributed_sampler.h" -#include "dataset/engine/datasetops/source/sampler/pk_sampler.h" -#include "dataset/engine/datasetops/source/sampler/random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/sequential_sampler.h" -#include "dataset/engine/datasetops/source/sampler/subset_random_sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" -#include "dataset/util/path.h" -#include "dataset/util/status.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/global_context.h" +#include "minddata/dataset/engine/datasetops/source/voc_op.h" +#include "minddata/dataset/engine/datasetops/source/sampler/distributed_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/pk_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/subset_random_sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/util/path.h" +#include "minddata/dataset/util/status.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/weighted_random_sampler_test.cc b/tests/ut/cpp/dataset/weighted_random_sampler_test.cc index d146ed10ac..bb3079aec8 100644 --- a/tests/ut/cpp/dataset/weighted_random_sampler_test.cc +++ b/tests/ut/cpp/dataset/weighted_random_sampler_test.cc @@ -16,11 +16,11 @@ #include "common/common.h" #include "gtest/gtest.h" -#include "dataset/core/constants.h" -#include "dataset/core/tensor.h" -#include "dataset/engine/data_buffer.h" -#include "dataset/engine/datasetops/source/sampler/sampler.h" -#include "dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/datasetops/source/sampler/sampler.h" +#include "minddata/dataset/engine/datasetops/source/sampler/weighted_random_sampler.h" #include "utils/log_adapter.h" #include diff --git a/tests/ut/cpp/dataset/zip_op_test.cc b/tests/ut/cpp/dataset/zip_op_test.cc index b387341398..3ff6d1697e 100644 --- a/tests/ut/cpp/dataset/zip_op_test.cc +++ b/tests/ut/cpp/dataset/zip_op_test.cc @@ -21,17 +21,17 @@ #include #include #include -#include "dataset/core/client.h" -#include "dataset/core/constants.h" -#include "dataset/engine/datasetops/map_op.h" -#include "dataset/engine/datasetops/zip_op.h" -#include "dataset/core/tensor.h" -#include "dataset/core/config_manager.h" +#include "minddata/dataset/core/client.h" +#include "minddata/dataset/core/constants.h" +#include "minddata/dataset/engine/datasetops/map_op.h" +#include "minddata/dataset/engine/datasetops/zip_op.h" +#include "minddata/dataset/core/tensor.h" +#include "minddata/dataset/core/config_manager.h" #include "common/common.h" #include "common/utils.h" -#include "dataset/engine/data_buffer.h" +#include "minddata/dataset/engine/data_buffer.h" #include "gtest/gtest.h" -#include "dataset/core/global_context.h" +#include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" namespace common = mindspore::common; diff --git a/tests/ut/cpp/device/ascend_kernel_runtime_test.cc b/tests/ut/cpp/device/ascend_kernel_runtime_test.cc index effa0b212d..2aa9512808 100644 --- a/tests/ut/cpp/device/ascend_kernel_runtime_test.cc +++ b/tests/ut/cpp/device/ascend_kernel_runtime_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" -#include "device/kernel_runtime.h" +#include "runtime/device/kernel_runtime.h" #include "./common.h" namespace mindspore { diff --git a/tests/ut/cpp/device/ascend_profiling_test.cc b/tests/ut/cpp/device/ascend_profiling_test.cc index 2829a5fd4a..f862d84c4a 100644 --- a/tests/ut/cpp/device/ascend_profiling_test.cc +++ b/tests/ut/cpp/device/ascend_profiling_test.cc @@ -18,12 +18,12 @@ #include "./prof_reporter.h" #include "common/common_test.h" -#include "device/ascend/profiling/profiling_manager.h" +#include "runtime/device/ascend/profiling/profiling_manager.h" #include "./common.h" #define private public -#include "device/ascend/profiling/plugin_impl.h" +#include "runtime/device/ascend/profiling/plugin_impl.h" #undef private -#include "device/ascend/profiling/profiling_engine_impl.h" +#include "runtime/device/ascend/profiling/profiling_engine_impl.h" namespace mindspore { namespace device { diff --git a/tests/ut/cpp/ir/anf_test.cc b/tests/ut/cpp/ir/anf_test.cc index c649518e21..9b217a2321 100644 --- a/tests/ut/cpp/ir/anf_test.cc +++ b/tests/ut/cpp/ir/anf_test.cc @@ -19,7 +19,7 @@ #include "common/common_test.h" #include "ir/anf.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "./common.h" namespace mindspore { diff --git a/tests/ut/cpp/ir/clone_test.cc b/tests/ut/cpp/ir/clone_test.cc index bb8cae7fbb..20da3fb8b5 100644 --- a/tests/ut/cpp/ir/clone_test.cc +++ b/tests/ut/cpp/ir/clone_test.cc @@ -21,7 +21,7 @@ #include "ir/manager.h" #include "utils/log_adapter.h" #include "ir/func_graph_cloner.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "utils/graph_utils.h" #include "debug/draw.h" #include "./common.h" diff --git a/tests/ut/cpp/ir/manager_test.cc b/tests/ut/cpp/ir/manager_test.cc index 04b584ec10..3e6d1a312c 100644 --- a/tests/ut/cpp/ir/manager_test.cc +++ b/tests/ut/cpp/ir/manager_test.cc @@ -18,8 +18,8 @@ #include "ir/dtype.h" #include "ir/manager.h" #include "ir/func_graph_cloner.h" -#include "pipeline/parse/parse.h" -#include "operator/ops.h" +#include "pipeline/jit/parse/parse.h" +#include "frontend/operator/ops.h" #include "utils/log_adapter.h" #include "debug/draw.h" #include "debug/label.h" diff --git a/tests/ut/cpp/kernel/common_utils_test.cc b/tests/ut/cpp/kernel/common_utils_test.cc index 4bc05b5c05..83f7c59e52 100644 --- a/tests/ut/cpp/kernel/common_utils_test.cc +++ b/tests/ut/cpp/kernel/common_utils_test.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" -#include "kernel/common_utils.h" +#include "backend/kernel_compiler/common_utils.h" namespace mindspore { namespace kernel { diff --git a/tests/ut/cpp/kernel/cpu/sparse_apply_adam_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/sparse_apply_adam_cpu_kernel_test.cc index dfd6147389..e5cba86230 100644 --- a/tests/ut/cpp/kernel/cpu/sparse_apply_adam_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/sparse_apply_adam_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "kernel/cpu/sparse_apply_adam_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/kernel/cpu/sparse_apply_ftrl_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/sparse_apply_ftrl_cpu_kernel_test.cc index a7df66cf9a..230c8cbf9e 100644 --- a/tests/ut/cpp/kernel/cpu/sparse_apply_ftrl_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/sparse_apply_ftrl_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "kernel/cpu/sparse_apply_ftrl_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel_test.cc index 63e8706d1b..a829ead90e 100644 --- a/tests/ut/cpp/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/sparse_apply_lazy_adam_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "kernel/cpu/sparse_apply_lazy_adam_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel_test.cc index 0d679d7e5c..64bd5d3ef3 100644 --- a/tests/ut/cpp/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "kernel/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h" +#include "backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/mindrecord/ut_common.h b/tests/ut/cpp/mindrecord/ut_common.h index 8b244bf87a..ee943ab88e 100644 --- a/tests/ut/cpp/mindrecord/ut_common.h +++ b/tests/ut/cpp/mindrecord/ut_common.h @@ -25,10 +25,10 @@ #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_index.h" -#include "mindrecord/include/shard_header.h" -#include "mindrecord/include/shard_index_generator.h" -#include "mindrecord/include/shard_writer.h" +#include "minddata/mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_index_generator.h" +#include "minddata/mindrecord/include/shard_writer.h" using json = nlohmann::json; using std::ifstream; using std::pair; diff --git a/tests/ut/cpp/mindrecord/ut_shard.cc b/tests/ut/cpp/mindrecord/ut_shard.cc index b8c229e82f..11492e9f28 100644 --- a/tests/ut/cpp/mindrecord/ut_shard.cc +++ b/tests/ut/cpp/mindrecord/ut_shard.cc @@ -23,10 +23,10 @@ #include "configuration.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_index.h" -#include "mindrecord/include/shard_header.h" -#include "mindrecord/include/shard_statistics.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_statistics.h" #include "securec.h" #include "ut_common.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_header_test.cc b/tests/ut/cpp/mindrecord/ut_shard_header_test.cc index cea71c34b7..2ff3d1655d 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_header_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_header_test.cc @@ -29,13 +29,13 @@ #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/shard_writer.h" -#include "mindrecord/include/shard_index.h" -#include "mindrecord/include/shard_header.h" -#include "mindrecord/include/shard_schema.h" -#include "mindrecord/include/shard_statistics.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_writer.h" +#include "minddata/mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/shard_header.h" +#include "minddata/mindrecord/include/shard_schema.h" +#include "minddata/mindrecord/include/shard_statistics.h" #include "securec.h" #include "ut_common.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_index_generator_test.cc b/tests/ut/cpp/mindrecord/ut_shard_index_generator_test.cc index 140fff4166..8e264aafa0 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_index_generator_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_index_generator_test.cc @@ -29,10 +29,10 @@ #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_error.h" -#include "mindrecord/include/shard_index_generator.h" -#include "mindrecord/include/shard_index.h" -#include "mindrecord/include/shard_statistics.h" +#include "minddata/mindrecord/include/shard_error.h" +#include "minddata/mindrecord/include/shard_index_generator.h" +#include "minddata/mindrecord/include/shard_index.h" +#include "minddata/mindrecord/include/shard_statistics.h" #include "securec.h" #include "ut_common.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc b/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc index 7fe60c3bfa..4501ea0800 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc @@ -24,11 +24,11 @@ #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_category.h" -#include "mindrecord/include/shard_pk_sample.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/shard_sample.h" -#include "mindrecord/include/shard_shuffle.h" +#include "minddata/mindrecord/include/shard_category.h" +#include "minddata/mindrecord/include/shard_pk_sample.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_shuffle.h" #include "ut_common.h" using mindspore::LogStream; diff --git a/tests/ut/cpp/mindrecord/ut_shard_page_test.cc b/tests/ut/cpp/mindrecord/ut_shard_page_test.cc index dabd3d819f..a7e444c80f 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_page_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_page_test.cc @@ -21,7 +21,7 @@ #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_page.h" +#include "minddata/mindrecord/include/shard_page.h" #include "ut_common.h" using json = nlohmann::json; diff --git a/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc b/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc index c532fe28b8..8b5eb2cf69 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc @@ -24,8 +24,8 @@ #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/shard_sample.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_sample.h" #include "ut_common.h" using mindspore::LogStream; diff --git a/tests/ut/cpp/mindrecord/ut_shard_schema_test.cc b/tests/ut/cpp/mindrecord/ut_shard_schema_test.cc index 8d9654a5ef..6863a25791 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_schema_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_schema_test.cc @@ -29,9 +29,9 @@ #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_page.h" -#include "mindrecord/include/shard_schema.h" -#include "mindrecord/include/shard_statistics.h" +#include "minddata/mindrecord/include/shard_page.h" +#include "minddata/mindrecord/include/shard_schema.h" +#include "minddata/mindrecord/include/shard_statistics.h" #include "securec.h" #include "ut_common.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc b/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc index 3fa6812352..6b99e44d89 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc @@ -30,7 +30,7 @@ #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_segment.h" +#include "minddata/mindrecord/include/shard_segment.h" #include "ut_common.h" using mindspore::LogStream; diff --git a/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc b/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc index 159efbf2f8..046b4f93d5 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc @@ -24,9 +24,9 @@ #include "common/utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" -#include "mindrecord/include/shard_reader.h" -#include "mindrecord/include/shard_writer.h" -#include "mindrecord/include/shard_index_generator.h" +#include "minddata/mindrecord/include/shard_reader.h" +#include "minddata/mindrecord/include/shard_writer.h" +#include "minddata/mindrecord/include/shard_index_generator.h" #include "securec.h" #include "ut_common.h" diff --git a/tests/ut/cpp/operator/cc_implementations_test.cc b/tests/ut/cpp/operator/cc_implementations_test.cc index bac885db88..4bc5aea964 100644 --- a/tests/ut/cpp/operator/cc_implementations_test.cc +++ b/tests/ut/cpp/operator/cc_implementations_test.cc @@ -18,7 +18,7 @@ #include #include "common/common_test.h" -#include "operator/cc_implementations.h" +#include "frontend/operator/cc_implementations.h" namespace mindspore { namespace prim { diff --git a/tests/ut/cpp/operator/composite_test.cc b/tests/ut/cpp/operator/composite_test.cc index ce852175a6..a2108998bc 100644 --- a/tests/ut/cpp/operator/composite_test.cc +++ b/tests/ut/cpp/operator/composite_test.cc @@ -18,10 +18,10 @@ #include "common/common_test.h" #include "ir/anf.h" #include "ir/value.h" -#include "operator/composite/composite.h" -#include "operator/ops.h" -#include "pipeline/static_analysis/prim.h" -#include "pipeline/static_analysis/abstract_function.h" +#include "frontend/operator/composite/composite.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/abstract_function.h" #include "debug/trace.h" namespace mindspore { diff --git a/tests/ut/cpp/operator/grad_implementations_test.cc b/tests/ut/cpp/operator/grad_implementations_test.cc index e9035e63b6..f55553ab72 100644 --- a/tests/ut/cpp/operator/grad_implementations_test.cc +++ b/tests/ut/cpp/operator/grad_implementations_test.cc @@ -20,7 +20,7 @@ #include "ir/value.h" #include "ir/manager.h" #include "common/common_test.h" -#include "optimizer/ad/dfunctor.h" +#include "frontend/optimizer/ad/dfunctor.h" #include "debug/draw.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/operator/ops_test.cc b/tests/ut/cpp/operator/ops_test.cc index 87d32f3e76..789b1cab25 100644 --- a/tests/ut/cpp/operator/ops_test.cc +++ b/tests/ut/cpp/operator/ops_test.cc @@ -20,7 +20,7 @@ #include "common/common_test.h" #include "ir/value.h" #include "ir/primitive_py.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "./common.h" namespace mindspore { diff --git a/tests/ut/cpp/operator/prim2func_test.cc b/tests/ut/cpp/operator/prim2func_test.cc index 8f7c73a064..3952128b52 100644 --- a/tests/ut/cpp/operator/prim2func_test.cc +++ b/tests/ut/cpp/operator/prim2func_test.cc @@ -21,7 +21,7 @@ #include "ir/anf.h" #include "ir/dtype.h" -#include "operator/prim_to_function.h" +#include "frontend/operator/prim_to_function.h" namespace mindspore { namespace prim { diff --git a/tests/ut/cpp/optimizer/ad/ad_test.cc b/tests/ut/cpp/optimizer/ad/ad_test.cc index 34612b5474..3f861d3604 100644 --- a/tests/ut/cpp/optimizer/ad/ad_test.cc +++ b/tests/ut/cpp/optimizer/ad/ad_test.cc @@ -16,7 +16,7 @@ #include #include -#include "optimizer/ad/grad.h" +#include "frontend/optimizer/ad/grad.h" #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" @@ -24,10 +24,10 @@ #include "ir/func_graph_cloner.h" #include "utils/log_adapter.h" #include "utils/graph_utils.h" -#include "pipeline/resource.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace ad { diff --git a/tests/ut/cpp/optimizer/cconv_test.cc b/tests/ut/cpp/optimizer/cconv_test.cc index 8bd6957e85..c004409058 100644 --- a/tests/ut/cpp/optimizer/cconv_test.cc +++ b/tests/ut/cpp/optimizer/cconv_test.cc @@ -20,7 +20,7 @@ #include "ir/func_graph_cloner.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/optimizer/clean_test.cc b/tests/ut/cpp/optimizer/clean_test.cc index c4f393c233..82bec1b5a8 100644 --- a/tests/ut/cpp/optimizer/clean_test.cc +++ b/tests/ut/cpp/optimizer/clean_test.cc @@ -19,9 +19,9 @@ #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" -#include "optimizer/clean.h" +#include "frontend/optimizer/clean.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/optimizer/lib_test.cc b/tests/ut/cpp/optimizer/lib_test.cc index bc8561f171..751b301283 100644 --- a/tests/ut/cpp/optimizer/lib_test.cc +++ b/tests/ut/cpp/optimizer/lib_test.cc @@ -25,11 +25,11 @@ #include "ir/manager.h" #include "ir/value.h" #include "ir/visitor.h" -#include "operator/ops.h" -#include "optimizer/irpass.h" -#include "pipeline/resource.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/irpass.h" +#include "pipeline/jit/resource.h" #include "debug/draw.h" -#include "pipeline/parse/data_converter.h" +#include "pipeline/jit/parse/data_converter.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/optimizer/opt_test.cc b/tests/ut/cpp/optimizer/opt_test.cc index 2428d0dddb..c329adc4a5 100644 --- a/tests/ut/cpp/optimizer/opt_test.cc +++ b/tests/ut/cpp/optimizer/opt_test.cc @@ -22,13 +22,13 @@ #include "ir/anf.h" #include "ir/visitor.h" #include "ir/func_graph_cloner.h" -#include "optimizer/opt.h" -#include "optimizer/irpass.h" -#include "optimizer/irpass/arithmetic_simplify.h" +#include "frontend/optimizer/opt.h" +#include "frontend/optimizer/irpass.h" +#include "frontend/optimizer/irpass/arithmetic_simplify.h" #include "debug/draw.h" -#include "operator/ops.h" -#include "optimizer/cse.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/cse.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/optimizer/optimizer_test.cc b/tests/ut/cpp/optimizer/optimizer_test.cc index ca7c589d47..c5c99531e4 100644 --- a/tests/ut/cpp/optimizer/optimizer_test.cc +++ b/tests/ut/cpp/optimizer/optimizer_test.cc @@ -20,10 +20,10 @@ #include "common/py_func_graph_fetcher.h" #include "ir/anf.h" -#include "operator/ops.h" -#include "optimizer/cse.h" -#include "optimizer/optimizer.h" -#include "optimizer/irpass.h" +#include "frontend/operator/ops.h" +#include "frontend/optimizer/cse.h" +#include "frontend/optimizer/optimizer.h" +#include "frontend/optimizer/irpass.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc b/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc index 0462993672..a500afc859 100644 --- a/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/dp_algo_test.cc @@ -15,12 +15,12 @@ */ #include "common/common_test.h" -#include "parallel/device_manager.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/ops_info/matmul_info.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/ops_info/tmp_identity_info.h" -#include "parallel/auto_parallel/dp_algo_costmodel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/ops_info/matmul_info.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/ops_info/tmp_identity_info.h" +#include "frontend/parallel/auto_parallel/dp_algo_costmodel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc b/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc index 291539c27d..190a189a2d 100644 --- a/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/edge_costmodel_test.cc @@ -16,9 +16,9 @@ #include "common/common_test.h" #include "ir/dtype/number.h" -#include "parallel/device_manager.h" -#include "parallel/auto_parallel/edge_costmodel.h" -#include "parallel/ops_info/matmul_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/ops_info/matmul_info.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc b/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc index 78d05c7235..7d63f03179 100644 --- a/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/graph_costmodel_test.cc @@ -15,9 +15,9 @@ */ #include "common/common_test.h" -#include "parallel/device_manager.h" -#include "parallel/auto_parallel/graph_costmodel.h" -#include "parallel/ops_info/matmul_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/ops_info/matmul_info.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc b/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc index 919c5b43ec..b9b6bb67d9 100644 --- a/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/operator_costmodel_test.cc @@ -15,10 +15,10 @@ */ #include -#include "parallel/tensor_layout/tensor_layout.h" -#include "parallel/tensor_layout/tensor_info.h" -#include "parallel/auto_parallel/operator_costmodel.h" -#include "parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/tensor_info.h" +#include "frontend/parallel/auto_parallel/operator_costmodel.h" +#include "frontend/parallel/device_manager.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/auto_parallel/rec_partition_test.cc b/tests/ut/cpp/parallel/auto_parallel/rec_partition_test.cc index 1eb65b468f..7942fa2a10 100644 --- a/tests/ut/cpp/parallel/auto_parallel/rec_partition_test.cc +++ b/tests/ut/cpp/parallel/auto_parallel/rec_partition_test.cc @@ -15,9 +15,9 @@ */ #include "common/common_test.h" -#include "parallel/auto_parallel/rec_core/rec_tensor.h" -#include "parallel/auto_parallel/rec_core/rec_graph.h" -#include "parallel/auto_parallel/rec_core/rec_partition.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_tensor.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_graph.h" +#include "frontend/parallel/auto_parallel/rec_core/rec_partition.h" #include #include "ir/value.h" diff --git a/tests/ut/cpp/parallel/device_manager_test.cc b/tests/ut/cpp/parallel/device_manager_test.cc index 056896f514..0c048d647b 100644 --- a/tests/ut/cpp/parallel/device_manager_test.cc +++ b/tests/ut/cpp/parallel/device_manager_test.cc @@ -15,9 +15,9 @@ */ #include #include "common/common_test.h" -#include "parallel/device.h" -#include "parallel/device_manager.h" -#include "parallel/group_manager.h" +#include "frontend/parallel/device.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/group_manager.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/device_matrix_test.cc b/tests/ut/cpp/parallel/device_matrix_test.cc index 877a211df8..57a438e76e 100644 --- a/tests/ut/cpp/parallel/device_matrix_test.cc +++ b/tests/ut/cpp/parallel/device_matrix_test.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/device_matrix.h" +#include "frontend/parallel/device_matrix.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/group_manager_test.cc b/tests/ut/cpp/parallel/group_manager_test.cc index e3d2b3a364..fa4abfcb7e 100644 --- a/tests/ut/cpp/parallel/group_manager_test.cc +++ b/tests/ut/cpp/parallel/group_manager_test.cc @@ -14,10 +14,10 @@ * limitations under the License. */ #include -#include "parallel/device_manager.h" +#include "frontend/parallel/device_manager.h" #include "common/common_test.h" -#include "parallel/device.h" -#include "parallel/group_manager.h" +#include "frontend/parallel/device.h" +#include "frontend/parallel/group_manager.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/activation_info_test.cc b/tests/ut/cpp/parallel/ops_info/activation_info_test.cc index a9fe9b4c48..5f09de9e48 100644 --- a/tests/ut/cpp/parallel/ops_info/activation_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/activation_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/activation_test.cc b/tests/ut/cpp/parallel/ops_info/activation_test.cc index 9af7203799..9d129b7a18 100644 --- a/tests/ut/cpp/parallel/ops_info/activation_test.cc +++ b/tests/ut/cpp/parallel/ops_info/activation_test.cc @@ -18,9 +18,9 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/device_manager.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/device_manager.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc b/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc index e54d1f2423..e49ed4e79d 100644 --- a/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/gelu_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc b/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc index 947ad60cca..125723868a 100644 --- a/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc +++ b/tests/ut/cpp/parallel/ops_info/generate_strategy_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/arithmetic_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/arithmetic_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc b/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc index 503edf2eda..029e0f2dc6 100644 --- a/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/get_next_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/get_next_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/get_next_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc b/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc index b59481e1f6..7037a85699 100644 --- a/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/l2_normalize_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/l2_normalize_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/l2_normalize_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc b/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc index cf5a4239a2..8de5c07226 100644 --- a/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/log_softmax_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc b/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc index f710f51265..2d5676f211 100644 --- a/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/matmul_info_test.cc @@ -18,11 +18,11 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/matmul_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" -#include "parallel/auto_parallel/graph_costmodel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/matmul_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/auto_parallel/graph_costmodel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc b/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc index 07d150a294..074e4582f0 100644 --- a/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/onehot_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/onehot_info.h" -#include "parallel/device_manager.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/onehot_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc b/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc index c89bf97fb3..769d5bec45 100644 --- a/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc +++ b/tests/ut/cpp/parallel/ops_info/onehot_info_test_axis_0.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/onehot_info.h" -#include "parallel/device_manager.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/onehot_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/pow_info_test.cc b/tests/ut/cpp/parallel/ops_info/pow_info_test.cc index 7b37a90fd8..f582640db8 100644 --- a/tests/ut/cpp/parallel/ops_info/pow_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/pow_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/arithmetic_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/arithmetic_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/prelu_test.cc b/tests/ut/cpp/parallel/ops_info/prelu_test.cc index d6db1b8460..1d4cf5eff0 100644 --- a/tests/ut/cpp/parallel/ops_info/prelu_test.cc +++ b/tests/ut/cpp/parallel/ops_info/prelu_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/prelu_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/prelu_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc b/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc index a1fe46ca33..64ba6af70b 100644 --- a/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc +++ b/tests/ut/cpp/parallel/ops_info/reduce_method_test.cc @@ -18,11 +18,11 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/reduce_method_info.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/reduce_method_info.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/reshape_test.cc b/tests/ut/cpp/parallel/ops_info/reshape_test.cc index fb60c6d250..8cc8390e9a 100644 --- a/tests/ut/cpp/parallel/ops_info/reshape_test.cc +++ b/tests/ut/cpp/parallel/ops_info/reshape_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/reshape_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/reshape_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc b/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc index 03634b9a6f..d370c168c9 100644 --- a/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/softmax_entropy_loss_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/loss_info.h" -#include "parallel/device_manager.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/loss_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc b/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc index bba6e89626..9c4205672b 100644 --- a/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/softmax_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc b/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc index a892c5c84a..2be6c5bf7f 100644 --- a/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/tanh_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/activation_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/activation_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc b/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc index 42d292c605..b523652fcb 100644 --- a/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc +++ b/tests/ut/cpp/parallel/ops_info/tensor_add_info_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/arithmetic_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/arithmetic_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc b/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc index eabac51e17..461a27d4ed 100644 --- a/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc +++ b/tests/ut/cpp/parallel/ops_info/tmpidentity_test.cc @@ -15,10 +15,10 @@ */ #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/device_manager.h" -#include "parallel/ops_info/operator_info.h" -#include "parallel/ops_info/tmp_identity_info.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/parallel/ops_info/tmp_identity_info.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/ops_info/transpose_test.cc b/tests/ut/cpp/parallel/ops_info/transpose_test.cc index 991ec47820..fe5cbb01b3 100644 --- a/tests/ut/cpp/parallel/ops_info/transpose_test.cc +++ b/tests/ut/cpp/parallel/ops_info/transpose_test.cc @@ -18,10 +18,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/transpose_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/transpose_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/step_auto_parallel_test.cc b/tests/ut/cpp/parallel/step_auto_parallel_test.cc index a1474ca244..6cf7ec66c6 100644 --- a/tests/ut/cpp/parallel/step_auto_parallel_test.cc +++ b/tests/ut/cpp/parallel/step_auto_parallel_test.cc @@ -14,12 +14,12 @@ * limitations under the License. */ #include "common/common_test.h" -#include "parallel/step_parallel.h" -#include "parallel/step_auto_parallel.h" -#include "parallel/auto_parallel/edge_costmodel.h" -#include "parallel/ops_info/operator_info.h" -#include "operator/ops.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/step_auto_parallel.h" +#include "frontend/parallel/auto_parallel/edge_costmodel.h" +#include "frontend/parallel/ops_info/operator_info.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/static_analysis/static_analysis.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/step_parallel_test.cc b/tests/ut/cpp/parallel/step_parallel_test.cc index d8f8681a34..5657db8790 100644 --- a/tests/ut/cpp/parallel/step_parallel_test.cc +++ b/tests/ut/cpp/parallel/step_parallel_test.cc @@ -14,12 +14,12 @@ * limitations under the License. */ #include "common/common_test.h" -#include "parallel/step_parallel.h" -#include "parallel/graph_util/generate_graph.h" +#include "frontend/parallel/step_parallel.h" +#include "frontend/parallel/graph_util/generate_graph.h" #include "common/py_func_graph_fetcher.h" #include "debug/draw.h" -#include "operator/ops.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/static_analysis/static_analysis.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/strategy_test.cc b/tests/ut/cpp/parallel/strategy_test.cc index 9a2f92f018..c13b71944e 100644 --- a/tests/ut/cpp/parallel/strategy_test.cc +++ b/tests/ut/cpp/parallel/strategy_test.cc @@ -17,7 +17,7 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" +#include "frontend/parallel/strategy.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc b/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc index 2ba8cc9dfc..b80f199035 100644 --- a/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/construct_operator_test.cc @@ -17,10 +17,10 @@ #include #include "common/common_test.h" #include "ir/value.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/matmul_info.h" -#include "parallel/device_manager.h" -#include "parallel/tensor_layout/construct_operator.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/matmul_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/construct_operator.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/tensor_layout/redistribution_layout_transfer_test.cc b/tests/ut/cpp/parallel/tensor_layout/redistribution_layout_transfer_test.cc index 5291e2f48d..4ddc130a45 100644 --- a/tests/ut/cpp/parallel/tensor_layout/redistribution_layout_transfer_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/redistribution_layout_transfer_test.cc @@ -17,8 +17,8 @@ #include #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/tensor_layout/tensor_layout.h" -#include "parallel/tensor_layout/redistribution_layout_transfer.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/redistribution_layout_transfer.h" #include "util_layout_gen_test.h" namespace mindspore { diff --git a/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc b/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc index 1b1dd4af04..f6caad2f9d 100644 --- a/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/redistribution_operator_infer_test.cc @@ -16,8 +16,8 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/tensor_layout/redistribution_operator_infer.h" -#include "parallel/device_manager.h" +#include "frontend/parallel/tensor_layout/redistribution_operator_infer.h" +#include "frontend/parallel/device_manager.h" #include "util_layout_gen_test.h" namespace mindspore { diff --git a/tests/ut/cpp/parallel/tensor_layout/reshape_layout_transfer_test.cc b/tests/ut/cpp/parallel/tensor_layout/reshape_layout_transfer_test.cc index 9d6152721e..11f471ea33 100644 --- a/tests/ut/cpp/parallel/tensor_layout/reshape_layout_transfer_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/reshape_layout_transfer_test.cc @@ -17,8 +17,8 @@ #include #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/tensor_layout/tensor_layout.h" -#include "parallel/tensor_layout/reshape_layout_transfer.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/reshape_layout_transfer.h" #include "util_layout_gen_test.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/parallel/tensor_layout/shape_util_test.cc b/tests/ut/cpp/parallel/tensor_layout/shape_util_test.cc index b5e2ea3e5b..824ab876cd 100644 --- a/tests/ut/cpp/parallel/tensor_layout/shape_util_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/shape_util_test.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/tensor_layout/shape_util.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/tensor_layout/tensor_layout_test.cc b/tests/ut/cpp/parallel/tensor_layout/tensor_layout_test.cc index bae05d650a..15fb16f088 100644 --- a/tests/ut/cpp/parallel/tensor_layout/tensor_layout_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/tensor_layout_test.cc @@ -17,7 +17,7 @@ #include #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc b/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc index 572763faa3..40a4017c4b 100644 --- a/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/tensor_redistribution_test.cc @@ -17,7 +17,7 @@ #include #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "parallel/tensor_layout/tensor_redistribution.h" +#include "frontend/parallel/tensor_layout/tensor_redistribution.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.cc b/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.cc index 6f5c1e49ed..330b571ae7 100644 --- a/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.cc +++ b/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.cc @@ -21,7 +21,7 @@ #include #include #include -#include "parallel/tensor_layout/shape_util.h" +#include "frontend/parallel/tensor_layout/shape_util.h" #include "common/common_test.h" using std::pow; diff --git a/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.h b/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.h index a359cadbea..c16a1fc6d4 100644 --- a/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.h +++ b/tests/ut/cpp/parallel/tensor_layout/util_layout_gen_test.h @@ -20,7 +20,7 @@ #include #include -#include "parallel/tensor_layout/tensor_layout.h" +#include "frontend/parallel/tensor_layout/tensor_layout.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/parallel/virtual_dataset_test.cc b/tests/ut/cpp/parallel/virtual_dataset_test.cc index 1d3ff081c7..4cafdebc17 100644 --- a/tests/ut/cpp/parallel/virtual_dataset_test.cc +++ b/tests/ut/cpp/parallel/virtual_dataset_test.cc @@ -17,10 +17,10 @@ #include #include #include "common/common_test.h" -#include "parallel/strategy.h" -#include "parallel/ops_info/virtual_dataset_info.h" -#include "parallel/device_manager.h" -#include "parallel/step_parallel.h" +#include "frontend/parallel/strategy.h" +#include "frontend/parallel/ops_info/virtual_dataset_info.h" +#include "frontend/parallel/device_manager.h" +#include "frontend/parallel/step_parallel.h" namespace mindspore { namespace parallel { diff --git a/tests/ut/cpp/pipeline/parse/parser_abnormal_test.cc b/tests/ut/cpp/pipeline/parse/parser_abnormal_test.cc index 3c97cfb203..2d21b591ea 100644 --- a/tests/ut/cpp/pipeline/parse/parser_abnormal_test.cc +++ b/tests/ut/cpp/pipeline/parse/parser_abnormal_test.cc @@ -19,7 +19,7 @@ #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" #include "utils/profile.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/parse/parser_class_test.cc b/tests/ut/cpp/pipeline/parse/parser_class_test.cc index dcedc32b1b..8d9cc8ebc8 100644 --- a/tests/ut/cpp/pipeline/parse/parser_class_test.cc +++ b/tests/ut/cpp/pipeline/parse/parser_class_test.cc @@ -19,7 +19,7 @@ #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/parse/parser_integrate_test.cc b/tests/ut/cpp/pipeline/parse/parser_integrate_test.cc index fd8438503f..1f54298a81 100644 --- a/tests/ut/cpp/pipeline/parse/parser_integrate_test.cc +++ b/tests/ut/cpp/pipeline/parse/parser_integrate_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/parse/parser_primitive_test.cc b/tests/ut/cpp/pipeline/parse/parser_primitive_test.cc index adc09cca32..937ad1fe5e 100644 --- a/tests/ut/cpp/pipeline/parse/parser_primitive_test.cc +++ b/tests/ut/cpp/pipeline/parse/parser_primitive_test.cc @@ -19,7 +19,7 @@ #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/parse/parser_test.cc b/tests/ut/cpp/pipeline/parse/parser_test.cc index 4d7731dfd1..f1d9087110 100644 --- a/tests/ut/cpp/pipeline/parse/parser_test.cc +++ b/tests/ut/cpp/pipeline/parse/parser_test.cc @@ -19,7 +19,7 @@ #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/parse/resolve_test.cc b/tests/ut/cpp/pipeline/parse/resolve_test.cc index 8ade92bb34..5a2d0ebd7f 100644 --- a/tests/ut/cpp/pipeline/parse/resolve_test.cc +++ b/tests/ut/cpp/pipeline/parse/resolve_test.cc @@ -19,7 +19,7 @@ #include "common/py_func_graph_fetcher.h" #include "utils/log_adapter.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/resource_test.cc b/tests/ut/cpp/pipeline/resource_test.cc index 09bd2060dc..b6be393652 100644 --- a/tests/ut/cpp/pipeline/resource_test.cc +++ b/tests/ut/cpp/pipeline/resource_test.cc @@ -18,9 +18,9 @@ #include "common/common_test.h" #include "utils/log_adapter.h" -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" #include "ir/primitive.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace pipeline { diff --git a/tests/ut/cpp/pipeline/static_analysis/data_test.cc b/tests/ut/cpp/pipeline/static_analysis/data_test.cc index d431dcc0ec..fb9d8b1f7e 100644 --- a/tests/ut/cpp/pipeline/static_analysis/data_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/data_test.cc @@ -18,8 +18,8 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "abstract/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/pipeline/static_analysis/evaluator_test.cc b/tests/ut/cpp/pipeline/static_analysis/evaluator_test.cc index eebe6c252b..664f353faa 100644 --- a/tests/ut/cpp/pipeline/static_analysis/evaluator_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/evaluator_test.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "pipeline/static_analysis/evaluator.h" -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/prim.h" #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pipeline/static_analysis/helper.cc b/tests/ut/cpp/pipeline/static_analysis/helper.cc index db697e95e0..ebf8c233e2 100644 --- a/tests/ut/cpp/pipeline/static_analysis/helper.cc +++ b/tests/ut/cpp/pipeline/static_analysis/helper.cc @@ -16,7 +16,7 @@ #include "pipeline/static_analysis/helper.h" -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" namespace mindspore { namespace abstract { diff --git a/tests/ut/cpp/pipeline/static_analysis/helper.h b/tests/ut/cpp/pipeline/static_analysis/helper.h index 7ca902a1e9..44c647779e 100644 --- a/tests/ut/cpp/pipeline/static_analysis/helper.h +++ b/tests/ut/cpp/pipeline/static_analysis/helper.h @@ -17,7 +17,7 @@ #ifndef TESTS_UT_PIPELINE_STATIC_ANALYSIS_HELPER_H_ #define TESTS_UT_PIPELINE_STATIC_ANALYSIS_HELPER_H_ -#include "pipeline/static_analysis/evaluator.h" +#include "pipeline/jit/static_analysis/evaluator.h" namespace mindspore { namespace abstract { diff --git a/tests/ut/cpp/pipeline/static_analysis/prim_test.cc b/tests/ut/cpp/pipeline/static_analysis/prim_test.cc index 04a14a0f29..8ebea4d212 100644 --- a/tests/ut/cpp/pipeline/static_analysis/prim_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/prim_test.cc @@ -21,9 +21,9 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" #include "pipeline/static_analysis/helper.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "debug/draw.h" #include "ir/tensor.h" #include "utils/symbolic.h" diff --git a/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc b/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc index 23ea55f8f7..e32a86d9be 100644 --- a/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/specialize_test.cc @@ -20,8 +20,8 @@ #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" -#include "pipeline/static_analysis/prim.h" -#include "pipeline/static_analysis/program_specialize.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/program_specialize.h" #include "pipeline/static_analysis/helper.h" #include "utils/log_adapter.h" #include "utils/graph_utils.h" diff --git a/tests/ut/cpp/pipeline/static_analysis/static_analysis_test.cc b/tests/ut/cpp/pipeline/static_analysis/static_analysis_test.cc index 8a58969e12..78d3a7083a 100644 --- a/tests/ut/cpp/pipeline/static_analysis/static_analysis_test.cc +++ b/tests/ut/cpp/pipeline/static_analysis/static_analysis_test.cc @@ -16,16 +16,16 @@ #include #include -#include "pipeline/static_analysis/prim.h" +#include "pipeline/jit/static_analysis/prim.h" #include "pipeline/static_analysis/helper.h" #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" #include "ir/manager.h" #include "ir/tensor.h" -#include "operator/ops.h" -#include "pipeline/parse/parse.h" -#include "pipeline/parse/data_converter.h" -#include "pipeline/resource.h" +#include "frontend/operator/ops.h" +#include "pipeline/jit/parse/parse.h" +#include "pipeline/jit/parse/data_converter.h" +#include "pipeline/jit/resource.h" #include "debug/draw.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/pre_activate/ascend/buffer_fusion/buffer_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/buffer_fusion/buffer_fusion_test.cc index 483c144930..58b810a3e1 100644 --- a/tests/ut/cpp/pre_activate/ascend/buffer_fusion/buffer_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/buffer_fusion/buffer_fusion_test.cc @@ -17,23 +17,23 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" -#include "kernel/kernel.h" -#include "device/kernel_info.h" -#include "pre_activate/common/optimizer.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/ascend/buffer_fusion/ub_pattern_fusion.h" -#include "pre_activate/ascend/buffer_fusion/eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv_single_in_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv_double_in_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" -#include "pre_activate/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" +#include "backend/kernel_compiler/kernel.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h" +#include "backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" +#include "backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc b/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc index e4ab2431b7..ba64c206af 100644 --- a/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc +++ b/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_memcpy_elimination.cc @@ -15,14 +15,14 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" -#include "mindspore/ccsrc/pre_activate/ascend/enhancer/getnext_memcpy_elimination.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" +#include "mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_memcpy_elimination.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc index 56bf0ae4e0..2be25212e8 100644 --- a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc +++ b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.cc @@ -15,16 +15,16 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/ascend_session.h" -#include "session/anf_runtime_algorithm.h" -#include "pipeline/resource.h" -#include "operator/ops.h" +#include "backend/session/ascend_session.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "pipeline/jit/resource.h" +#include "frontend/operator/ops.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/enhancer/insert_memcpy_async_for_getnext.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/enhancer/insert_memcpy_async_for_getnext.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op_test.cc b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op_test.cc index 22cf70ded3..103d0f21a4 100644 --- a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op_test.cc @@ -15,16 +15,16 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" #define private public #define protected public -#include "pre_activate/ascend/enhancer/insert_memcpy_async_for_hccl_op.h" +#include "backend/optimizer/ascend/enhancer/insert_memcpy_async_for_hccl_op.h" #undef private #undef protected namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/format_type/check_consistency_test.cc b/tests/ut/cpp/pre_activate/ascend/format_type/check_consistency_test.cc index 72ce73e20f..89d680f442 100644 --- a/tests/ut/cpp/pre_activate/ascend/format_type/check_consistency_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/format_type/check_consistency_test.cc @@ -16,18 +16,18 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" #include "common/backend_common_test.h" -#include "session/ascend_session.h" -#include "session/anf_runtime_algorithm.h" -#include "pipeline/resource.h" -#include "pipeline/action.h" -#include "operator/ops.h" +#include "backend/session/ascend_session.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "pipeline/jit/resource.h" +#include "pipeline/jit/action.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/format_type/check_consistency.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/format_type/check_consistency.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/format_type/insert_cast_test.cc b/tests/ut/cpp/pre_activate/ascend/format_type/insert_cast_test.cc index 317eace6c6..2b61a49048 100644 --- a/tests/ut/cpp/pre_activate/ascend/format_type/insert_cast_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/format_type/insert_cast_test.cc @@ -14,17 +14,17 @@ * limitations under the License. */ #include "common/backend_common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "device/kernel_info.h" -#include "pre_activate/ascend/format_type/insert_cast.h" -#include "kernel/kernel_build_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/ascend/format_type/insert_cast.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" #include "utils/context/ms_context.h" diff --git a/tests/ut/cpp/pre_activate/ascend/format_type/insert_trans_op_test.cc b/tests/ut/cpp/pre_activate/ascend/format_type/insert_trans_op_test.cc index 8c57238e0a..0a5cf3dd9e 100644 --- a/tests/ut/cpp/pre_activate/ascend/format_type/insert_trans_op_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/format_type/insert_trans_op_test.cc @@ -14,18 +14,18 @@ * limitations under the License. */ #include "common/backend_common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" #include "utils/context/ms_context.h" #define private public #define protected public -#include "pre_activate/ascend/format_type/insert_trans_op.h" +#include "backend/optimizer/ascend/format_type/insert_trans_op.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/format_type/merge_cast_to_op_test.cc b/tests/ut/cpp/pre_activate/ascend/format_type/merge_cast_to_op_test.cc index c0017c2deb..69e7fa8b27 100644 --- a/tests/ut/cpp/pre_activate/ascend/format_type/merge_cast_to_op_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/format_type/merge_cast_to_op_test.cc @@ -15,17 +15,17 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" #define private public #define protected public -#include "pre_activate/ascend/format_type/merge_cast_to_op.h" +#include "backend/optimizer/ascend/format_type/merge_cast_to_op.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/addn_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/addn_fission_test.cc index 90174636b1..8ec2b22a79 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/addn_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/addn_fission_test.cc @@ -18,7 +18,7 @@ #include "common/py_func_graph_fetcher.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fission/addn_fission.h" +#include "backend/optimizer/ascend/ir_fission/addn_fission.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_bert_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_bert_fission_test.cc index 06895cb081..f793e0371b 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_bert_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_bert_fission_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/batch_norm_bert_fission.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h" #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission_test.cc index ea4a5c0d5d..80f30c8938 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/batch_norm_grad_infer_fission.h" +#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h" #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_grad_split_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_grad_split_test.cc index dc437221f8..f0a5a857b9 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_grad_split_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_grad_split_test.cc @@ -15,17 +15,17 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fission/bn_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/bn_grad_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_split_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_split_test.cc index c5ebc28b48..9f4f31bf82 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_split_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/bn_split_test.cc @@ -15,20 +15,20 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/ascend_session.h" -#include "session/anf_runtime_algorithm.h" -#include "pipeline/resource.h" -#include "operator/ops.h" +#include "backend/session/ascend_session.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "pipeline/jit/resource.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fission/bn_split.h" +#include "backend/optimizer/ascend/ir_fission/bn_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/lars_v2_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/lars_v2_fission_test.cc index c0a0cc455e..c726142e99 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/lars_v2_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/lars_v2_fission_test.cc @@ -16,7 +16,7 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/ascend/ir_fission/lars_v2_fission.h" +#include "backend/optimizer/ascend/ir_fission/lars_v2_fission.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/layer_norm_grad_split_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/layer_norm_grad_split_test.cc index 1df87960e3..4303485d85 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/layer_norm_grad_split_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/layer_norm_grad_split_test.cc @@ -15,17 +15,17 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "operator/ops.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "kernel/kernel_build_info.h" -#include "pre_activate/common/optimizer.h" +#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/optimizer/common/optimizer.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fission/layer_norm_grad_split.h" +#include "backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/single_batch_norm_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/single_batch_norm_fission_test.cc index b0aa455a0a..9f84f22678 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/single_batch_norm_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/single_batch_norm_fission_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fission/single_batch_norm_fission.h" +#include "backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h" #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/split_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/split_fission_test.cc index ab70e83480..30de43be4e 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/split_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/split_fission_test.cc @@ -18,7 +18,7 @@ #include "common/py_func_graph_fetcher.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fission/split_fission.h" +#include "backend/optimizer/ascend/ir_fission/split_fission.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc index b09268aa66..2ab614d4c2 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/topk_split_test.cc @@ -16,13 +16,13 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "device/kernel_info.h" -#include "pre_activate/pass/convert_const_input_to_attr.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/pass/convert_const_input_to_attr.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fission/topk_split.h" +#include "backend/optimizer/ascend/ir_fission/topk_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/transdata_split_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/transdata_split_test.cc index f2b975a08e..220e45f10a 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/transdata_split_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/transdata_split_test.cc @@ -16,16 +16,16 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/oplib.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" #include "debug/anf_ir_dump.h" #include "utils/context/ms_context.h" #define private public #define protected public -#include "pre_activate/ascend/format_type/insert_trans_op.h" -#include "pre_activate/ascend/ir_fission/transdata_split.h" +#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "backend/optimizer/ascend/ir_fission/transdata_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_fusion_test.cc index c2ee7b6519..2759864037 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_fusion_test.cc @@ -15,7 +15,7 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/ascend/ir_fusion/adam_apply_one_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule_test.cc index 014e60f579..78c815bf50 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/add_input_to_output_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/add_input_to_output_test.cc index 8b44fa6dc4..5d42ff7069 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/add_input_to_output_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/add_input_to_output_test.cc @@ -19,7 +19,7 @@ #define private public #define protected public -#include "pre_activate/ascend/ir_fusion/add_input_to_output.h" +#include "backend/optimizer/ascend/ir_fusion/add_input_to_output.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer_test.cc index 466cba8e67..d9d0baf7be 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/batchnorm_to_bninfer.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad_test.cc index d1fc2783ac..1b64e5fd00 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion_test.cc index 0c8bf67391..aa56d79239 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_value_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_value_fusion_test.cc index 4160c3a8e4..ac01f9b1dd 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_value_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/clip_by_value_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/clip_by_value_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion_test.cc index 2044857841..be6bd95b02 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/confusion_mul_grad_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_softmax_grad_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_softmax_grad_test.cc index 05fa2c65df..068cc0d12e 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_softmax_grad_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/confusion_softmax_grad_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/confusion_softmax_grad_rule.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/derelu_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/derelu_fusion_test.cc index ffa5a42b4d..663ed309ee 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/derelu_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/derelu_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/derelu_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/derelu_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion_test.cc index 597b7b18ff..f7cbfdc678 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/fused_batch_norm_fusion_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/fused_batch_norm_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h" #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_rule_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_rule_test.cc index 6ea622d030..64c004ff27 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_rule_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_rule_test.cc @@ -17,7 +17,7 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule_test.cc index 36f0321511..776ce625b7 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule_test.cc @@ -16,7 +16,7 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule_test.cc index fbb1f5e913..bf21649672 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule_test.cc @@ -16,7 +16,7 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_right_rule_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_right_rule_test.cc index f1ca92c811..6a7c866ab4 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_right_rule_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_next_right_rule_test.cc @@ -15,7 +15,7 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/ascend/ir_fusion/lamb_next_right_rule.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion_test.cc index 7a2806162b..4de2de2700 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2_test.cc index 05262e72ab..5be6195da2 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2_test.cc @@ -17,7 +17,7 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" -#include "pre_activate/ascend/ir_fusion/lamb_update_with_lr_v2.h" +#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion_test.cc index 44b9b3df69..7392d05b98 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion_test.cc @@ -15,13 +15,13 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "device/kernel_info.h" +#include "runtime/device/kernel_info.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #define private public #define protected public -#include "pre_activate/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion_test.cc index c8f97be290..f67eda9776 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/matmul_biasadd_fusion_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/matmul_biasadd_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h" #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion_test.cc index 114fcf4233..50dfd66f54 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/momentum_lossscale_fusion_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "pre_activate/ascend/ir_fusion/momentum_lossscale_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h" #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_add_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_add_fusion_test.cc index 87bb21f89a..b293cdeecb 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_add_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_add_fusion_test.cc @@ -15,7 +15,7 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/ascend/ir_fusion/mul_add_fusion.h" +#include "backend/optimizer/ascend/ir_fusion/mul_add_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_addn_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_addn_fusion_test.cc index ab9718d80a..8ac106f81c 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_addn_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/mul_addn_fusion_test.cc @@ -15,7 +15,7 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "mindspore/ccsrc/pre_activate/ascend/ir_fusion/mul_addn_fusion.h" +#include "mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/reshape_transpose_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/reshape_transpose_fusion_test.cc index 59140e91a1..6792f4720a 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/reshape_transpose_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/reshape_transpose_fusion_test.cc @@ -17,8 +17,8 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/ascend/ir_fusion/reshape_transpose_fusion.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion_test.cc index 5f02f0e9c1..f6e8a1194c 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/softmax_grad_ext_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/square_sum_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/square_sum_fusion_test.cc index 2dd858a0fc..efe5433d75 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/square_sum_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/square_sum_fusion_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/ascend/ir_fusion/square_sum_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/ascend/ir_fusion/square_sum_fusion.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_reshape_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_reshape_fusion_test.cc index 3290acd42f..6ec407d2ea 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_reshape_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_reshape_fusion_test.cc @@ -17,8 +17,8 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/ascend/ir_fusion/transpose_reshape_fusion.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_transdata_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_transdata_fusion_test.cc index 98dc9e9efc..d156959c4c 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_transdata_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fusion/transpose_transdata_fusion_test.cc @@ -16,14 +16,14 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "device/kernel_info.h" -#include "session/anf_runtime_algorithm.h" -#include "kernel/oplib/oplib.h" +#include "runtime/device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/kernel_compiler/oplib/oplib.h" #include "utils/context/ms_context.h" #define private public #define protected public -#include "pre_activate/ascend/format_type/insert_trans_op.h" -#include "pre_activate/ascend/ir_fusion/transpose_transdata_fusion.h" +#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc b/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc index 7b0e2cc9db..12030433fc 100644 --- a/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc +++ b/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc @@ -20,8 +20,8 @@ #include #include "common/common_test.h" -#include "pre_activate/common/pattern_engine.h" -#include "pre_activate/common/visit.h" +#include "backend/optimizer/common/pattern_engine.h" +#include "backend/optimizer/common/visit.h" #include "utils/base_ref.h" #include "ir/anf.h" diff --git a/tests/ut/cpp/pre_activate/mem_reuse/kernel_ref_test.cc b/tests/ut/cpp/pre_activate/mem_reuse/kernel_ref_test.cc index 5b237fda58..8b6d3e061a 100644 --- a/tests/ut/cpp/pre_activate/mem_reuse/kernel_ref_test.cc +++ b/tests/ut/cpp/pre_activate/mem_reuse/kernel_ref_test.cc @@ -18,7 +18,7 @@ #include #include -#include "pre_activate/mem_reuse/kernel_refcount.h" +#include "backend/optimizer/mem_reuse/kernel_refcount.h" #include "utils/utils.h" #include "common/common_test.h" diff --git a/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_allocator_test.cc b/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_allocator_test.cc index e0966d2d12..2a6904658e 100644 --- a/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_allocator_test.cc +++ b/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_allocator_test.cc @@ -17,9 +17,9 @@ #include #include #include -#include "operator/ops.h" -#include "pre_activate/mem_reuse/mem_reuse.h" -#include "pre_activate/mem_reuse/mem_reuse_allocator.h" +#include "frontend/operator/ops.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "backend/optimizer/mem_reuse/mem_reuse_allocator.h" #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_test.cc b/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_test.cc index a36463d297..31ae923c0a 100644 --- a/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_test.cc +++ b/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_test.cc @@ -16,19 +16,19 @@ #include #include #include -#include "session/kernel_graph.h" -#include "session/session_basic.h" -#include "session/ascend_session.h" -#include "pre_activate/mem_reuse/kernel_refcount.h" -#include "pre_activate/mem_reuse/mem_reuse_allocator.h" -#include "device/kernel_info.h" -#include "kernel/tbe/tbe_kernel_mod.h" -#include "operator/ops.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/session_basic.h" +#include "backend/session/ascend_session.h" +#include "backend/optimizer/mem_reuse/kernel_refcount.h" +#include "backend/optimizer/mem_reuse/mem_reuse_allocator.h" +#include "runtime/device/kernel_info.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" +#include "frontend/operator/ops.h" #include "utils/log_adapter.h" -#include "session/anf_runtime_algorithm.h" +#include "backend/session/anf_runtime_algorithm.h" #include "common/utils.h" -#include "pipeline/resource.h" -#include "pre_activate/mem_reuse/mem_reuse.h" +#include "pipeline/jit/resource.h" +#include "backend/optimizer/mem_reuse/mem_reuse.h" #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" diff --git a/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc b/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc index 69a330614e..02e1865a82 100644 --- a/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc @@ -15,16 +15,16 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/pass/communication_op_fusion.h" -#include "pre_activate/common/optimizer.h" -#include "device/kernel_info.h" -#include "pre_activate/common/pass_manager.h" -#include "kernel/kernel_build_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/pass/communication_op_fusion.h" +#include "backend/optimizer/common/optimizer.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" #include "utils/context/ms_context.h" diff --git a/tests/ut/cpp/pre_activate/pass/common_subexpression_elimination_test.cc b/tests/ut/cpp/pre_activate/pass/common_subexpression_elimination_test.cc index 12c4d35db5..cfcc34970b 100644 --- a/tests/ut/cpp/pre_activate/pass/common_subexpression_elimination_test.cc +++ b/tests/ut/cpp/pre_activate/pass/common_subexpression_elimination_test.cc @@ -14,17 +14,17 @@ * limitations under the License. */ #include "common/backend_common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "device/kernel_info.h" -#include "pre_activate/pass/common_subexpression_elimination.h" -#include "kernel/kernel_build_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "runtime/device/kernel_info.h" +#include "backend/optimizer/pass/common_subexpression_elimination.h" +#include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" #include "utils/context/ms_context.h" diff --git a/tests/ut/cpp/pre_activate/pass/const_to_attr_strided_slice_grad_test.cc b/tests/ut/cpp/pre_activate/pass/const_to_attr_strided_slice_grad_test.cc index 8fc709433e..25e4b3c111 100644 --- a/tests/ut/cpp/pre_activate/pass/const_to_attr_strided_slice_grad_test.cc +++ b/tests/ut/cpp/pre_activate/pass/const_to_attr_strided_slice_grad_test.cc @@ -14,13 +14,13 @@ * limitations under the License. */ #include "common/backend_common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/pass/const_to_attr_strided_slice_grad.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/pass/const_to_attr_strided_slice_grad.h" #include "utils/utils.h" #include "common/utils.h" diff --git a/tests/ut/cpp/pre_activate/pass/convert_const_input_to_attr_test.cc b/tests/ut/cpp/pre_activate/pass/convert_const_input_to_attr_test.cc index fcb3b19a24..ac3272317a 100644 --- a/tests/ut/cpp/pre_activate/pass/convert_const_input_to_attr_test.cc +++ b/tests/ut/cpp/pre_activate/pass/convert_const_input_to_attr_test.cc @@ -14,13 +14,13 @@ * limitations under the License. */ #include "common/backend_common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/pass/convert_const_input_to_attr.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/pass/convert_const_input_to_attr.h" #include "utils/utils.h" #include "common/utils.h" diff --git a/tests/ut/cpp/pre_activate/pass/convert_const_input_to_tensor_input_test.cc b/tests/ut/cpp/pre_activate/pass/convert_const_input_to_tensor_input_test.cc index 1749e54d94..5b303d15a5 100644 --- a/tests/ut/cpp/pre_activate/pass/convert_const_input_to_tensor_input_test.cc +++ b/tests/ut/cpp/pre_activate/pass/convert_const_input_to_tensor_input_test.cc @@ -18,10 +18,10 @@ #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/pass/convert_const_input_to_tensor_input.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/pass/convert_const_input_to_tensor_input.h" #include "utils/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/pass/convert_tuple_input_to_dynamic_input_test.cc b/tests/ut/cpp/pre_activate/pass/convert_tuple_input_to_dynamic_input_test.cc index aded376536..2c1dfc1c6c 100644 --- a/tests/ut/cpp/pre_activate/pass/convert_tuple_input_to_dynamic_input_test.cc +++ b/tests/ut/cpp/pre_activate/pass/convert_tuple_input_to_dynamic_input_test.cc @@ -18,10 +18,10 @@ #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/pass/convert_tuple_input_to_dynamic_input.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h" #include "utils/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/pass/convert_tuple_output_to_maketuple_test.cc b/tests/ut/cpp/pre_activate/pass/convert_tuple_output_to_maketuple_test.cc index eeb01270e2..458c854218 100644 --- a/tests/ut/cpp/pre_activate/pass/convert_tuple_output_to_maketuple_test.cc +++ b/tests/ut/cpp/pre_activate/pass/convert_tuple_output_to_maketuple_test.cc @@ -18,10 +18,10 @@ #include "ir/tensor.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "session/anf_runtime_algorithm.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" -#include "pre_activate/pass/convert_tuple_output_to_maketuple.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" +#include "backend/optimizer/pass/convert_tuple_output_to_maketuple.h" #include "utils/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/pre_activate/pass/eliminate_redundant_op_test.cc b/tests/ut/cpp/pre_activate/pass/eliminate_redundant_op_test.cc index 3e43155011..07bef7a042 100644 --- a/tests/ut/cpp/pre_activate/pass/eliminate_redundant_op_test.cc +++ b/tests/ut/cpp/pre_activate/pass/eliminate_redundant_op_test.cc @@ -15,26 +15,26 @@ */ #include "common/backend_common_test.h" -#include "kernel/kernel.h" -#include "operator/ops.h" +#include "backend/kernel_compiler/kernel.h" +#include "frontend/operator/ops.h" #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -// #include "device/optimizer/pass/insert_trans_op.h" -#include "pre_activate/ascend/format_type/insert_cast.h" -#include "pre_activate/pass/eliminate_redundant_op.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/common/pass_manager.h" +// #include "runtime/device/optimizer/pass/insert_trans_op.h" +#include "backend/optimizer/ascend/format_type/insert_cast.h" +#include "backend/optimizer/pass/eliminate_redundant_op.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/common/pass_manager.h" #include "utils/utils.h" #include "utils/context/ms_context.h" -#include "session/anf_runtime_algorithm.h" -#include "device/kernel_info.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "runtime/device/kernel_info.h" #include "utils/context/ms_context.h" #define private public #define protected public -#include "pre_activate/ascend/format_type/insert_trans_op.h" +#include "backend/optimizer/ascend/format_type/insert_trans_op.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/pass/getitem_tuple_test.cc b/tests/ut/cpp/pre_activate/pass/getitem_tuple_test.cc index b172e1b351..555dd95426 100644 --- a/tests/ut/cpp/pre_activate/pass/getitem_tuple_test.cc +++ b/tests/ut/cpp/pre_activate/pass/getitem_tuple_test.cc @@ -15,14 +15,14 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "session/ascend_session.h" -#include "pipeline/resource.h" -#include "operator/ops.h" +#include "backend/session/ascend_session.h" +#include "pipeline/jit/resource.h" +#include "frontend/operator/ops.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/pass/getitem_tuple.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/pass/getitem_tuple.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/pass/optimize_dependence_test.cc b/tests/ut/cpp/pre_activate/pass/optimize_dependence_test.cc index 04461e6602..f9cfe273bc 100644 --- a/tests/ut/cpp/pre_activate/pass/optimize_dependence_test.cc +++ b/tests/ut/cpp/pre_activate/pass/optimize_dependence_test.cc @@ -15,8 +15,8 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "pre_activate/common/optimizer.h" -#include "pre_activate/pass/optimize_dependence.h" +#include "backend/optimizer/common/optimizer.h" +#include "backend/optimizer/pass/optimize_dependence.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pynative/pynative_execute_test.cc b/tests/ut/cpp/pynative/pynative_execute_test.cc index a0d1516b58..c5f25ca484 100644 --- a/tests/ut/cpp/pynative/pynative_execute_test.cc +++ b/tests/ut/cpp/pynative/pynative_execute_test.cc @@ -16,10 +16,10 @@ #include #include #include "common/common_test.h" -#include "pipeline/parse/python_adapter.h" -#include "pipeline/parse/data_converter.h" -#include "operator/ops.h" -#include "pynative/pynative_execute.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "pipeline/jit/parse/data_converter.h" +#include "frontend/operator/ops.h" +#include "pipeline/pynative/pynative_execute.h" #include "utils/context/ms_context.h" #include "utils/utils.h" diff --git a/tests/ut/cpp/session/anf_runtime_algorithm_test.cc b/tests/ut/cpp/session/anf_runtime_algorithm_test.cc index 6769775b3f..e81870fd4f 100644 --- a/tests/ut/cpp/session/anf_runtime_algorithm_test.cc +++ b/tests/ut/cpp/session/anf_runtime_algorithm_test.cc @@ -16,11 +16,11 @@ #include "common/common_test.h" #include "ir/param_value.h" -#include "operator/ops.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" -#include "mindspore/ccsrc/device/kernel_info.h" -#include "mindspore/ccsrc/device/ascend/ascend_device_address.h" +#include "frontend/operator/ops.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "mindspore/ccsrc/runtime/device/kernel_info.h" +#include "mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h" #include "utils/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/session/kernel_graph_test.cc b/tests/ut/cpp/session/kernel_graph_test.cc index 318cbc982a..fb78a150b6 100644 --- a/tests/ut/cpp/session/kernel_graph_test.cc +++ b/tests/ut/cpp/session/kernel_graph_test.cc @@ -16,10 +16,10 @@ #include "common/common_test.h" #include "ir/param_value.h" -#include "operator/ops.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" -#include "mindspore/ccsrc/device/kernel_info.h" +#include "frontend/operator/ops.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" +#include "mindspore/ccsrc/runtime/device/kernel_info.h" #include "utils/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/session/session_basic_test.cc b/tests/ut/cpp/session/session_basic_test.cc index 1a7ca68065..c438c92b52 100644 --- a/tests/ut/cpp/session/session_basic_test.cc +++ b/tests/ut/cpp/session/session_basic_test.cc @@ -15,10 +15,10 @@ */ #include "common/common_test.h" -#include "operator/ops.h" -#include "session/ascend_session.h" -#include "session/kernel_graph.h" -#include "session/anf_runtime_algorithm.h" +#include "frontend/operator/ops.h" +#include "backend/session/ascend_session.h" +#include "backend/session/kernel_graph.h" +#include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/stub/aicpu/aicpu_stub.cc b/tests/ut/cpp/stub/aicpu/aicpu_stub.cc index 78ada6de18..5516d1fdc8 100644 --- a/tests/ut/cpp/stub/aicpu/aicpu_stub.cc +++ b/tests/ut/cpp/stub/aicpu/aicpu_stub.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/kernel.h" +#include "backend/kernel_compiler/kernel.h" namespace mindspore { namespace kernel { diff --git a/tests/ut/cpp/stub/ge/ge_task_launch_stub.cc b/tests/ut/cpp/stub/ge/ge_task_launch_stub.cc index 9b48adb574..234ffdaf6b 100644 --- a/tests/ut/cpp/stub/ge/ge_task_launch_stub.cc +++ b/tests/ut/cpp/stub/ge/ge_task_launch_stub.cc @@ -15,7 +15,7 @@ */ #include #include "framework/ge_runtime/model_runner.h" -#include "device/ascend/tasksink/runtime_utils.h" +#include "runtime/device/ascend/tasksink/runtime_utils.h" namespace ge { namespace model_runner { diff --git a/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc b/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc index ba642dfe18..87ab543c7c 100755 --- a/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc +++ b/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "kernel/kernel_fusion.h" -#include "kernel/tbe/tbe_kernel_mod.h" +#include "backend/kernel_compiler/kernel_fusion.h" +#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" #include "common/utils.h" namespace mindspore { diff --git a/tests/ut/cpp/stub/parallel_strategy_checkpoint/parallel_strategy_checkpoint_stub.cc b/tests/ut/cpp/stub/parallel_strategy_checkpoint/parallel_strategy_checkpoint_stub.cc index 43d0dd4b3f..f6f2f45092 100644 --- a/tests/ut/cpp/stub/parallel_strategy_checkpoint/parallel_strategy_checkpoint_stub.cc +++ b/tests/ut/cpp/stub/parallel_strategy_checkpoint/parallel_strategy_checkpoint_stub.cc @@ -15,7 +15,7 @@ */ #include #include -#include "parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" +#include "frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/tests/ut/cpp/stub/tasksink/ascend_stream_assign_stub.cc b/tests/ut/cpp/stub/tasksink/ascend_stream_assign_stub.cc index 8c00e518c3..85470e2315 100755 --- a/tests/ut/cpp/stub/tasksink/ascend_stream_assign_stub.cc +++ b/tests/ut/cpp/stub/tasksink/ascend_stream_assign_stub.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "device/ascend/ascend_stream_assign.h" -#include "device/ascend/ascend_label_assign.h" -#include "device/kernel_adjust.h" +#include "runtime/device/ascend/ascend_stream_assign.h" +#include "runtime/device/ascend/ascend_label_assign.h" +#include "runtime/device/kernel_adjust.h" namespace mindspore { namespace device { diff --git a/tests/ut/cpp/stub/tasksink/task_sink_stub.cc b/tests/ut/cpp/stub/tasksink/task_sink_stub.cc index b4318488c0..0b12a3862c 100644 --- a/tests/ut/cpp/stub/tasksink/task_sink_stub.cc +++ b/tests/ut/cpp/stub/tasksink/task_sink_stub.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "device/ascend/tasksink/task_generator.h" +#include "runtime/device/ascend/tasksink/task_generator.h" namespace mindspore { namespace device { diff --git a/tests/ut/cpp/transform/convert_test.cc b/tests/ut/cpp/transform/convert_test.cc index f8f48920e0..6902f7d90d 100644 --- a/tests/ut/cpp/transform/convert_test.cc +++ b/tests/ut/cpp/transform/convert_test.cc @@ -20,16 +20,16 @@ #include "transform/transform_base_test.h" #include "common/py_func_graph_fetcher.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "debug/draw.h" #include "debug/anf_ir_dump.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" #include "common/common_test.h" #define private public -#include "transform/types.h" -#include "transform/convert.h" +#include "transform/graph_ir/types.h" +#include "transform/graph_ir/convert.h" #include "securec/include/securec.h" #include "utils/utils.h" using std::cout; diff --git a/tests/ut/cpp/transform/graph_builder_test.cc b/tests/ut/cpp/transform/graph_builder_test.cc index e92463e2dc..e4d72b33cb 100644 --- a/tests/ut/cpp/transform/graph_builder_test.cc +++ b/tests/ut/cpp/transform/graph_builder_test.cc @@ -25,8 +25,8 @@ #endif #define private public -#include "transform/graph_builder.h" -#include "transform/df_graph_manager.h" +#include "transform/graph_ir/graph_builder.h" +#include "transform/graph_ir/df_graph_manager.h" using UT::Common; diff --git a/tests/ut/cpp/transform/graph_manager_test.cc b/tests/ut/cpp/transform/graph_manager_test.cc index 699f81ca4c..9e55e1725b 100644 --- a/tests/ut/cpp/transform/graph_manager_test.cc +++ b/tests/ut/cpp/transform/graph_manager_test.cc @@ -25,7 +25,7 @@ #endif #define private public -#include "transform/df_graph_manager.h" +#include "transform/graph_ir/df_graph_manager.h" using UT::Common; diff --git a/tests/ut/cpp/transform/graph_runner_test.cc b/tests/ut/cpp/transform/graph_runner_test.cc index 1b87cea464..b91ec959d2 100644 --- a/tests/ut/cpp/transform/graph_runner_test.cc +++ b/tests/ut/cpp/transform/graph_runner_test.cc @@ -21,10 +21,10 @@ #include "ir/tensor_py.h" #include "transform/transform_base_test.h" #include "common/py_func_graph_fetcher.h" -#include "pipeline/static_analysis/static_analysis.h" -#include "operator/ops.h" -#include "transform/df_graph_manager.h" -#include "transform/convert.h" +#include "pipeline/jit/static_analysis/static_analysis.h" +#include "frontend/operator/ops.h" +#include "transform/graph_ir/df_graph_manager.h" +#include "transform/graph_ir/convert.h" #include "utils/utils.h" #ifdef OPEN_SOURCE @@ -34,7 +34,7 @@ #endif #define private public -#include "transform/graph_runner.h" +#include "transform/graph_ir/graph_runner.h" using mindspore::tensor::TensorPy; diff --git a/tests/ut/cpp/transform/op_adapter_test.cc b/tests/ut/cpp/transform/op_adapter_test.cc index 254452bb42..2aa6ba37e3 100644 --- a/tests/ut/cpp/transform/op_adapter_test.cc +++ b/tests/ut/cpp/transform/op_adapter_test.cc @@ -19,9 +19,9 @@ #include "common/common_test.h" -#include "transform/op_declare.h" +#include "transform/graph_ir/op_declare.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "./common.h" using std::cout; diff --git a/tests/ut/cpp/transform/transform_base_test.h b/tests/ut/cpp/transform/transform_base_test.h index 92147dfbbf..4886b25748 100644 --- a/tests/ut/cpp/transform/transform_base_test.h +++ b/tests/ut/cpp/transform/transform_base_test.h @@ -20,11 +20,11 @@ #include #include #include -#include "transform/util.h" +#include "transform/graph_ir/util.h" #include "ir/tensor.h" #include "common/common_test.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "./common.h" #include "graph/tensor.h" diff --git a/tests/ut/cpp/utils/any_test.cc b/tests/ut/cpp/utils/any_test.cc index d11831d602..8a49017d95 100644 --- a/tests/ut/cpp/utils/any_test.cc +++ b/tests/ut/cpp/utils/any_test.cc @@ -20,7 +20,7 @@ #include #include "common/common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "utils/any.h" #include "utils/misc.h" diff --git a/tests/ut/cpp/utils/callback_test.cc b/tests/ut/cpp/utils/callback_test.cc index c63f68f000..0a4ffb8190 100644 --- a/tests/ut/cpp/utils/callback_test.cc +++ b/tests/ut/cpp/utils/callback_test.cc @@ -18,9 +18,9 @@ #include "pybind11/pybind11.h" #include "utils/callbacks.h" #include "common/common_test.h" -#include "pipeline/pipeline.h" -#include "pipeline/parse/python_adapter.h" -#include "transform/df_graph_manager.h" +#include "pipeline/jit/pipeline.h" +#include "pipeline/jit/parse/python_adapter.h" +#include "transform/graph_ir/df_graph_manager.h" #include "debug/draw.h" #ifdef ENABLE_GE #include "utils/callbacks_ge.h" diff --git a/tests/ut/cpp/utils/graph_utils_test.cc b/tests/ut/cpp/utils/graph_utils_test.cc index ce5a4318d3..35fa9cdc6a 100644 --- a/tests/ut/cpp/utils/graph_utils_test.cc +++ b/tests/ut/cpp/utils/graph_utils_test.cc @@ -24,8 +24,8 @@ #include "ir/anf.h" #include "utils/graph_utils.h" -#include "pipeline/parse/parse_base.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse_base.h" +#include "pipeline/jit/parse/parse.h" namespace mindspore { diff --git a/tests/ut/cpp/utils/ir_import_test.cc b/tests/ut/cpp/utils/ir_import_test.cc index 5e7db98a38..374c36b4e8 100644 --- a/tests/ut/cpp/utils/ir_import_test.cc +++ b/tests/ut/cpp/utils/ir_import_test.cc @@ -19,10 +19,10 @@ #include "utils/log_adapter.h" #include "debug/anf_ir_utils.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "ir/manager.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" namespace mindspore { class TestIrImporter : public UT::Common { diff --git a/tests/ut/cpp/utils/symbolic_test.cc b/tests/ut/cpp/utils/symbolic_test.cc index f259b62d6b..c0abd388d5 100644 --- a/tests/ut/cpp/utils/symbolic_test.cc +++ b/tests/ut/cpp/utils/symbolic_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "common/common_test.h" -#include "pipeline/static_analysis/static_analysis.h" +#include "pipeline/jit/static_analysis/static_analysis.h" #include "utils/symbolic.h" using std::cout; diff --git a/tests/ut/cpp/utils/validator_test.cc b/tests/ut/cpp/utils/validator_test.cc index 8eef44bde5..93334d7664 100644 --- a/tests/ut/cpp/utils/validator_test.cc +++ b/tests/ut/cpp/utils/validator_test.cc @@ -18,11 +18,11 @@ #include "common/common_test.h" #include "utils/log_adapter.h" -#include "pipeline/validator.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/validator.h" +#include "pipeline/jit/parse/parse.h" #include "ir/manager.h" -#include "pipeline/static_analysis/prim.h" -#include "operator/ops.h" +#include "pipeline/jit/static_analysis/prim.h" +#include "frontend/operator/ops.h" namespace mindspore { namespace validator { diff --git a/tests/ut/cpp/vm/segment_runner_test.cc b/tests/ut/cpp/vm/segment_runner_test.cc index b9bc552d90..c83b1b3434 100644 --- a/tests/ut/cpp/vm/segment_runner_test.cc +++ b/tests/ut/cpp/vm/segment_runner_test.cc @@ -20,11 +20,11 @@ #include "ir/manager.h" #include "utils/log_adapter.h" #include "ir/func_graph_cloner.h" -#include "pipeline/parse/parse.h" +#include "pipeline/jit/parse/parse.h" #include "utils/graph_utils.h" -#include "pipeline/resource.h" +#include "pipeline/jit/resource.h" #include "debug/draw.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "vm/segment_runner.h" #include "vm/transform.h" #include "ir/tensor.h" diff --git a/tests/ut/cpp/vm/vm_test.cc b/tests/ut/cpp/vm/vm_test.cc index 04633043af..9168d408c3 100644 --- a/tests/ut/cpp/vm/vm_test.cc +++ b/tests/ut/cpp/vm/vm_test.cc @@ -15,7 +15,7 @@ */ #include "vm/vm.h" #include "common/common_test.h" -#include "operator/ops.h" +#include "frontend/operator/ops.h" #include "vm/backend.h" namespace mindspore {